Skip to content

Pathfinder: Update for CP7 #1754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 11, 2021
Merged

Pathfinder: Update for CP7 #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee95ffb
Update OnDiskBitmap code to take a filename string with CP7.
lesamouraipourpre Aug 6, 2021
1ddb829
Invert the if
lesamouraipourpre Aug 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions Pathfinder/pathfinder_auto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,19 +95,34 @@
sound_mode = 1
else:
sound_mode = 0

i = (i + 1) % 11
pixel.fill(colors[i])
pixel.show()
time.sleep(1)

# CircuitPython 6 & 7 compatible
with open(emote_img[i], "rb") as bitmap_file:
bitmap = displayio.OnDiskBitmap(bitmap_file)
tile_grid = displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter()))
tile_grid = displayio.TileGrid(
bitmap,
pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())
)
group = displayio.Group()
group.append(tile_grid)
display.show(group)
if sound_mode is not 0:
# play a sound file
pyportal.play_file(vo_sound[i])
else:
pyportal.play_file("/vo/pathfnd_silent.wav")

# # CircuitPython 7+ compatible
# bitmap = displayio.OnDiskBitmap(emote_img[i])
# tile_grid = displayio.TileGrid(bitmap, pixel_shader=bitmap.pixel_shader)
# group = displayio.Group()
# group.append(tile_grid)
# display.show(group)

if sound_mode is not 0:
# play a sound file
pyportal.play_file(vo_sound[i])
else:
pyportal.play_file("/vo/pathfnd_silent.wav")

time.sleep(slide_speed)
50 changes: 32 additions & 18 deletions Pathfinder/pathfinder_touch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,21 +86,35 @@
pyportal.play_file("/vo/pathfnd_silent.wav") # hack to deal w no mute method

while True:
if pyportal.touchscreen.touch_point:
i = (i + 1) % 11
pixel.fill(colors[i])
pixel.show()
time.sleep(1)
with open(emote_img[i], "rb") as bitmap_file:
bitmap = displayio.OnDiskBitmap(bitmap_file)
tile_grid = displayio.TileGrid(
bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())
)
group = displayio.Group()
group.append(tile_grid)
display.show(group)
if sound_mode is not 0:
# play a sound file
pyportal.play_file(vo_sound[i])
else:
pyportal.play_file("/vo/pathfnd_silent.wav")
if not pyportal.touchscreen.touch_point:
time.sleep(0.01)
continue

i = (i + 1) % 11
pixel.fill(colors[i])
pixel.show()
time.sleep(1)

# CircuitPython 6 & 7 compatible
with open(emote_img[i], "rb") as bitmap_file:
bitmap = displayio.OnDiskBitmap(bitmap_file)
tile_grid = displayio.TileGrid(
bitmap,
pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())
)
group = displayio.Group()
group.append(tile_grid)
display.show(group)

# # CircuitPython 7+ compatible
# bitmap = displayio.OnDiskBitmap(emote_img[i])
# tile_grid = displayio.TileGrid(bitmap, pixel_shader=bitmap.pixel_shader)
# group = displayio.Group()
# group.append(tile_grid)
# display.show(group)

if sound_mode is not 0:
# play a sound file
pyportal.play_file(vo_sound[i])
else:
pyportal.play_file("/vo/pathfnd_silent.wav")