From ee95ffb21353c4ef3c56bd8c34660d67c8e11cda Mon Sep 17 00:00:00 2001 From: James Carr Date: Fri, 6 Aug 2021 21:59:11 +0100 Subject: [PATCH 1/2] Update OnDiskBitmap code to take a filename string with CP7. --- Pathfinder/pathfinder_auto.py | 27 ++++++++++++++----- Pathfinder/pathfinder_touch.py | 48 ++++++++++++++++++++++------------ 2 files changed, 52 insertions(+), 23 deletions(-) diff --git a/Pathfinder/pathfinder_auto.py b/Pathfinder/pathfinder_auto.py index 1c6205031..4f5f23d9c 100755 --- a/Pathfinder/pathfinder_auto.py +++ b/Pathfinder/pathfinder_auto.py @@ -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) diff --git a/Pathfinder/pathfinder_touch.py b/Pathfinder/pathfinder_touch.py index d480d5894..f434f4729 100755 --- a/Pathfinder/pathfinder_touch.py +++ b/Pathfinder/pathfinder_touch.py @@ -87,20 +87,34 @@ 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") + 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") From 1ddb8297888061544b1cc9e36622f77c05b37525 Mon Sep 17 00:00:00 2001 From: James Carr Date: Fri, 6 Aug 2021 22:02:31 +0100 Subject: [PATCH 2/2] Invert the if --- Pathfinder/pathfinder_touch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pathfinder/pathfinder_touch.py b/Pathfinder/pathfinder_touch.py index f434f4729..9605f4e1d 100755 --- a/Pathfinder/pathfinder_touch.py +++ b/Pathfinder/pathfinder_touch.py @@ -86,7 +86,7 @@ pyportal.play_file("/vo/pathfnd_silent.wav") # hack to deal w no mute method while True: - if pyportal.touchscreen.touch_point: + if not pyportal.touchscreen.touch_point: time.sleep(0.01) continue