diff --git a/CLUE_Egg_Drop/clue_egg_drop.py b/CLUE_Egg_Drop/clue_egg_drop.py index 47de1773b..58c71c7cb 100644 --- a/CLUE_Egg_Drop/clue_egg_drop.py +++ b/CLUE_Egg_Drop/clue_egg_drop.py @@ -19,14 +19,14 @@ begg_file = open("broken_egg.bmp", "rb") begg_bmp = displayio.OnDiskBitmap(begg_file) begg_sprite = displayio.TileGrid(begg_bmp, - pixel_shader=displayio.ColorConverter()) + pixel_shader=getattr(begg_bmp, 'pixel_shader', displayio.ColorConverter())) splash.append(begg_sprite) # draw the good egg on top gegg_file = open("good_egg.bmp", "rb") gegg_bmp = displayio.OnDiskBitmap(gegg_file) gegg_sprite = displayio.TileGrid(gegg_bmp, - pixel_shader=displayio.ColorConverter()) + pixel_shader=getattr(gegg_bmp, 'pixel_shader', displayio.ColorConverter())) splash.append(gegg_sprite) # Draw a label diff --git a/CLUE_Hand_Wash_Timer/clue_hand_wash_timer.py b/CLUE_Hand_Wash_Timer/clue_hand_wash_timer.py index a62ac2e76..30d807c11 100644 --- a/CLUE_Hand_Wash_Timer/clue_hand_wash_timer.py +++ b/CLUE_Hand_Wash_Timer/clue_hand_wash_timer.py @@ -18,13 +18,13 @@ # draw the background image wash_on_file = open("wash_on.bmp", "rb") wash_on_bmp = displayio.OnDiskBitmap(wash_on_file) -wash_on_sprite = displayio.TileGrid(wash_on_bmp, pixel_shader=displayio.ColorConverter()) +wash_on_sprite = displayio.TileGrid(wash_on_bmp, pixel_shader=getattr(wash_on_bmp, 'pixel_shader', displayio.ColorConverter())) clue_display.append(wash_on_sprite) # draw the foreground image wash_off_file = open("wash_off.bmp", "rb") wash_off_bmp = displayio.OnDiskBitmap(wash_off_file) -wash_off_sprite = displayio.TileGrid(wash_off_bmp, pixel_shader=displayio.ColorConverter()) +wash_off_sprite = displayio.TileGrid(wash_off_bmp, pixel_shader=getattr(wash_off_bmp, 'pixel_shader', displayio.ColorConverter())) clue_display.append(wash_off_sprite) diff --git a/CPB_AMS_Gizmo_BLE/cpb_ams_gizmo_ble.py b/CPB_AMS_Gizmo_BLE/cpb_ams_gizmo_ble.py index d8d9c180e..90620f1a6 100755 --- a/CPB_AMS_Gizmo_BLE/cpb_ams_gizmo_ble.py +++ b/CPB_AMS_Gizmo_BLE/cpb_ams_gizmo_ble.py @@ -30,7 +30,7 @@ def wrap_in_tilegrid(open_file): odb = displayio.OnDiskBitmap(open_file) - return displayio.TileGrid(odb, pixel_shader=displayio.ColorConverter()) + return displayio.TileGrid(odb, pixel_shader=getattr(odb, 'pixel_shader', displayio.ColorConverter())) def make_background(width, height, color): color_bitmap = displayio.Bitmap(width, height, 1) diff --git a/CPB_ANCS/code.py b/CPB_ANCS/code.py index 056bba239..8fd477d08 100644 --- a/CPB_ANCS/code.py +++ b/CPB_ANCS/code.py @@ -90,7 +90,7 @@ def check_timeout(self): def wrap_in_tilegrid(open_file): odb = displayio.OnDiskBitmap(open_file) - return displayio.TileGrid(odb, pixel_shader=displayio.ColorConverter()) + return displayio.TileGrid(odb, pixel_shader=getattr(odb, 'pixel_shader', displayio.ColorConverter())) display = tft_gizmo.TFT_Gizmo() group = displayio.Group(max_size=3) diff --git a/CircuitPython_JEplayer_mp3/code.py b/CircuitPython_JEplayer_mp3/code.py index 2332b2614..587486976 100644 --- a/CircuitPython_JEplayer_mp3/code.py +++ b/CircuitPython_JEplayer_mp3/code.py @@ -129,7 +129,7 @@ def set_bitmap(self, candidates): bitmap = displayio.OnDiskBitmap(bitmap_file) self._bitmap_filename = i # Create a TileGrid to hold the bitmap - self.tile_grid = displayio.TileGrid(bitmap, pixel_shader=displayio.ColorConverter()) + self.tile_grid = displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())) # Add the TileGrid to the Group if len(self.group) == 0: diff --git a/CircuitPython_Pyloton/pyloton.py b/CircuitPython_Pyloton/pyloton.py index ad18e0495..ab9381508 100644 --- a/CircuitPython_Pyloton/pyloton.py +++ b/CircuitPython_Pyloton/pyloton.py @@ -156,7 +156,7 @@ def show_splash(self): return with open('blinka-pyloton.bmp', 'rb') as bitmap_file: bitmap1 = displayio.OnDiskBitmap(bitmap_file) - tile_grid = displayio.TileGrid(bitmap1, pixel_shader=displayio.ColorConverter()) + tile_grid = displayio.TileGrid(bitmap1, pixel_shader=getattr(bitmap1, 'pixel_shader', displayio.ColorConverter())) self.loading_group.append(tile_grid) self.display.show(self.loading_group) status_heading = label.Label(font=self.arial16, x=80, y=175, diff --git a/CircuitPython_RGBMatrix/fruit.py b/CircuitPython_RGBMatrix/fruit.py index 214af6b99..712bf2152 100644 --- a/CircuitPython_RGBMatrix/fruit.py +++ b/CircuitPython_RGBMatrix/fruit.py @@ -35,7 +35,7 @@ def shuffled(seq): class Wheel(displayio.TileGrid): def __init__(self): # Portions of up to 3 tiles are visible. - super().__init__(bitmap=bitmap, pixel_shader=displayio.ColorConverter(), + super().__init__(bitmap=bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter()), width=1, height=3, tile_width=20, tile_height=24) self.order = shuffled(range(20)) self.state = STOPPED diff --git a/CircuitPython_RGBMatrix/tiled.py b/CircuitPython_RGBMatrix/tiled.py index 7f5fdc11b..c8a725be0 100755 --- a/CircuitPython_RGBMatrix/tiled.py +++ b/CircuitPython_RGBMatrix/tiled.py @@ -44,7 +44,7 @@ GROUP = displayio.Group() GROUP.append(displayio.TileGrid( BITMAP, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(BITMAP, 'pixel_shader', displayio.ColorConverter()), width=1, height=1, tile_width=BITMAP.width, diff --git a/CircuitPython_displayio/displayio_ondiskbitmap.py b/CircuitPython_displayio/displayio_ondiskbitmap.py index b8da95161..83403c7a7 100644 --- a/CircuitPython_displayio/displayio_ondiskbitmap.py +++ b/CircuitPython_displayio/displayio_ondiskbitmap.py @@ -10,7 +10,7 @@ bitmap = displayio.OnDiskBitmap(bitmap_file) # Create a TileGrid to hold the bitmap - tile_grid = displayio.TileGrid(bitmap, pixel_shader=displayio.ColorConverter()) + tile_grid = displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())) # Create a Group to hold the TileGrid group = displayio.Group() diff --git a/CircuitPython_sdcardio_sdioio/show_bitmaps.py b/CircuitPython_sdcardio_sdioio/show_bitmaps.py index 830e9e0eb..b652e5a4c 100644 --- a/CircuitPython_sdcardio_sdioio/show_bitmaps.py +++ b/CircuitPython_sdcardio_sdioio/show_bitmaps.py @@ -19,7 +19,7 @@ bitmap_file = open(filename, "rb") bitmap = displayio.OnDiskBitmap(bitmap_file) tile_grid = displayio.TileGrid(bitmap, - pixel_shader=displayio.ColorConverter()) + pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())) group = displayio.Group() group.append(tile_grid) display.show(group) diff --git a/Clue_Step_Counter/clue_step_counter.py b/Clue_Step_Counter/clue_step_counter.py index 3a9b1314e..d8b01f85d 100644 --- a/Clue_Step_Counter/clue_step_counter.py +++ b/Clue_Step_Counter/clue_step_counter.py @@ -62,7 +62,7 @@ # loading bitmap background clue_bg = displayio.OnDiskBitmap(open(clue_bgBMP, "rb")) -clue_tilegrid = displayio.TileGrid(clue_bg, pixel_shader=displayio.ColorConverter()) +clue_tilegrid = displayio.TileGrid(clue_bg, pixel_shader=getattr(clue_bg, 'pixel_shader', displayio.ColorConverter())) clueGroup.append(clue_tilegrid) # creating the ProgressBar object diff --git a/EInk_CircuitPython_Quickstart/213_tricolor_eink_fw_badge.py b/EInk_CircuitPython_Quickstart/213_tricolor_eink_fw_badge.py index 5cd934a66..9f3dd67f3 100644 --- a/EInk_CircuitPython_Quickstart/213_tricolor_eink_fw_badge.py +++ b/EInk_CircuitPython_Quickstart/213_tricolor_eink_fw_badge.py @@ -73,7 +73,7 @@ pic = displayio.OnDiskBitmap(f) # Create a Tilegrid with the bitmap and put in the displayio group -t = displayio.TileGrid(pic, pixel_shader=displayio.ColorConverter()) +t = displayio.TileGrid(pic, pixel_shader=getattr(pic, 'pixel_shader', displayio.ColorConverter())) g.append(t) # Draw simple text using the built-in font into a displayio group diff --git a/EInk_CircuitPython_Quickstart/27_tricolor_eink_shield_badge.py b/EInk_CircuitPython_Quickstart/27_tricolor_eink_shield_badge.py index 0d59d7bfe..d62158104 100644 --- a/EInk_CircuitPython_Quickstart/27_tricolor_eink_shield_badge.py +++ b/EInk_CircuitPython_Quickstart/27_tricolor_eink_shield_badge.py @@ -69,7 +69,7 @@ pic = displayio.OnDiskBitmap(f) # Create a Tilegrid with the bitmap and put in the displayio group -t = displayio.TileGrid(pic, pixel_shader=displayio.ColorConverter()) +t = displayio.TileGrid(pic, pixel_shader=getattr(pic, 'pixel_shader', displayio.ColorConverter())) g.append(t) # Draw simple text using the built-in font into a displayio group diff --git a/Hallowing_Jump_Sound/jump-sound.py b/Hallowing_Jump_Sound/jump-sound.py index 3184c34af..1c274ae3c 100755 --- a/Hallowing_Jump_Sound/jump-sound.py +++ b/Hallowing_Jump_Sound/jump-sound.py @@ -86,7 +86,7 @@ def play_wav(wav): BITMAP = displayio.OnDiskBitmap(open(IMAGEFILE, 'rb')) SCREEN.append( displayio.TileGrid(BITMAP, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(BITMAP, 'pixel_shader', displayio.ColorConverter()), x=0, y=0)) board.DISPLAY.brightness = 1.0 except (ImportError, NameError, AttributeError) as err: diff --git a/Hallowing_Jump_Sound/stomp-and-roar.py b/Hallowing_Jump_Sound/stomp-and-roar.py index 7a8182ea2..1c6720862 100755 --- a/Hallowing_Jump_Sound/stomp-and-roar.py +++ b/Hallowing_Jump_Sound/stomp-and-roar.py @@ -83,7 +83,7 @@ def load_wav(name): BITMAP = displayio.OnDiskBitmap(open(IMAGEFILE, 'rb')) SCREEN.append( displayio.TileGrid(BITMAP, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(BITMAP, 'pixel_shader', displayio.ColorConverter()), x=0, y=0)) board.DISPLAY.brightness = 1.0 # Turn on display backlight except (ImportError, NameError, AttributeError) as err: diff --git a/Kitty_Paw_Keypad/code.py b/Kitty_Paw_Keypad/code.py index 459419b0d..acb2944f5 100644 --- a/Kitty_Paw_Keypad/code.py +++ b/Kitty_Paw_Keypad/code.py @@ -56,7 +56,7 @@ bitmap = displayio.OnDiskBitmap(open("/parrot-240-sheet.bmp", "rb")) # Create a TileGrid to hold the bitmap -parrot0_grid = displayio.TileGrid(bitmap, pixel_shader=displayio.ColorConverter(), +parrot0_grid = displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter()), width=1, height=1, tile_height=240, tile_width=240, default_tile=0, diff --git a/MagTag_Christmas_Countdown/code.py b/MagTag_Christmas_Countdown/code.py index 7f661fbc6..d30c624a5 100644 --- a/MagTag_Christmas_Countdown/code.py +++ b/MagTag_Christmas_Countdown/code.py @@ -22,7 +22,7 @@ # import tree bitmap tree = displayio.OnDiskBitmap(open("/atree.bmp", "rb")) -tree_grid = displayio.TileGrid(tree, pixel_shader=displayio.ColorConverter()) +tree_grid = displayio.TileGrid(tree, pixel_shader=getattr(tree, 'pixel_shader', displayio.ColorConverter())) # add bitmap to its group tree_group.append(tree_grid) diff --git a/MagTag_Dishwasher_Status/wake_on_button.py b/MagTag_Dishwasher_Status/wake_on_button.py index a29a45e4f..60ca8e8d6 100755 --- a/MagTag_Dishwasher_Status/wake_on_button.py +++ b/MagTag_Dishwasher_Status/wake_on_button.py @@ -20,7 +20,7 @@ # show bitmap with open(bmp_file, "rb") as fp: bitmap = displayio.OnDiskBitmap(fp) - tile_grid = displayio.TileGrid(bitmap, pixel_shader=displayio.ColorConverter()) + tile_grid = displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())) group = displayio.Group(max_size=1) group.append(tile_grid) epd.show(group) diff --git a/MagTag_Dishwasher_Status/wake_on_flip.py b/MagTag_Dishwasher_Status/wake_on_flip.py index b59bd4827..ecabb6725 100755 --- a/MagTag_Dishwasher_Status/wake_on_flip.py +++ b/MagTag_Dishwasher_Status/wake_on_flip.py @@ -46,7 +46,7 @@ epd.rotation = rotation with open(bmp_file, "rb") as fp: bitmap = displayio.OnDiskBitmap(fp) - tile_grid = displayio.TileGrid(bitmap, pixel_shader=displayio.ColorConverter()) + tile_grid = displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())) group = displayio.Group(max_size=1) group.append(tile_grid) epd.show(group) diff --git a/Magic_Nine_Ball/magic_nine_ball.py b/Magic_Nine_Ball/magic_nine_ball.py index 253fa316d..61dc42cdb 100644 --- a/Magic_Nine_Ball/magic_nine_ball.py +++ b/Magic_Nine_Ball/magic_nine_ball.py @@ -33,7 +33,7 @@ print("Image unsupported {}".format(images[i])) del images[i] continue - face = displayio.TileGrid(odb, pixel_shader=displayio.ColorConverter()) + face = displayio.TileGrid(odb, pixel_shader=getattr(odb, 'pixel_shader', displayio.ColorConverter())) splash.append(face) # Wait for the image to load. diff --git a/Matrix_Portal_Moon_Clock/code.py b/Matrix_Portal_Moon_Clock/code.py index 214caee30..47aa71878 100755 --- a/Matrix_Portal_Moon_Clock/code.py +++ b/Matrix_Portal_Moon_Clock/code.py @@ -198,7 +198,7 @@ def __init__(self, datetime, hours_ahead, utc_offset): FILENAME = 'moon/splash-' + str(DISPLAY.rotation) + '.bmp' BITMAP = displayio.OnDiskBitmap(open(FILENAME, 'rb')) TILE_GRID = displayio.TileGrid(BITMAP, - pixel_shader=displayio.ColorConverter(),) + pixel_shader=getattr(BITMAP, 'pixel_shader', displayio.ColorConverter()),) GROUP.append(TILE_GRID) except: GROUP.append(adafruit_display_text.label.Label(SMALL_FONT, color=0xFF0000, @@ -365,7 +365,7 @@ def __init__(self, datetime, hours_ahead, utc_offset): FILENAME = 'moon/moon' + '{0:0>2}'.format(FRAME) + '.bmp' BITMAP = displayio.OnDiskBitmap(open(FILENAME, 'rb')) TILE_GRID = displayio.TileGrid(BITMAP, - pixel_shader=displayio.ColorConverter(),) + pixel_shader=getattr(BITMAP, 'pixel_shader', displayio.ColorConverter()),) TILE_GRID.x = 0 TILE_GRID.y = MOON_Y GROUP[0] = TILE_GRID diff --git a/Matrix_Portal_Tip_Jar/code.py b/Matrix_Portal_Tip_Jar/code.py index b4ae76dd8..09b6b57b9 100644 --- a/Matrix_Portal_Tip_Jar/code.py +++ b/Matrix_Portal_Tip_Jar/code.py @@ -77,7 +77,7 @@ def load_image(): sprite = displayio.TileGrid( bitmap, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter()), width=1, height=1, tile_width=bitmap.width, diff --git a/Matrix_Sprite_Animation_Player/matrix_sprite_animation_player.py b/Matrix_Sprite_Animation_Player/matrix_sprite_animation_player.py index b340971e2..4406ab861 100644 --- a/Matrix_Sprite_Animation_Player/matrix_sprite_animation_player.py +++ b/Matrix_Sprite_Animation_Player/matrix_sprite_animation_player.py @@ -68,7 +68,7 @@ def load_image(): sprite = displayio.TileGrid( bitmap, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter()), width=1, height=1, tile_width=bitmap.width, diff --git a/Pathfinder/pathfinder_auto.py b/Pathfinder/pathfinder_auto.py index ab4e8fc0c..1c6205031 100755 --- a/Pathfinder/pathfinder_auto.py +++ b/Pathfinder/pathfinder_auto.py @@ -74,7 +74,7 @@ # Setup the file as the bitmap data source bitmap = displayio.OnDiskBitmap(bitmap_file) # Create a TileGrid to hold the bitmap - tile_grid = displayio.TileGrid(bitmap, pixel_shader=displayio.ColorConverter()) + tile_grid = displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())) # Create a Group to hold the TileGrid group = displayio.Group() # Add the TileGrid to the Group @@ -101,7 +101,7 @@ time.sleep(1) with open(emote_img[i], "rb") as bitmap_file: bitmap = displayio.OnDiskBitmap(bitmap_file) - tile_grid = displayio.TileGrid(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) diff --git a/Pathfinder/pathfinder_touch.py b/Pathfinder/pathfinder_touch.py index e9133680e..d480d5894 100755 --- a/Pathfinder/pathfinder_touch.py +++ b/Pathfinder/pathfinder_touch.py @@ -72,7 +72,7 @@ # Setup the file as the bitmap data source bitmap = displayio.OnDiskBitmap(bitmap_file) # Create a TileGrid to hold the bitmap - tile_grid = displayio.TileGrid(bitmap, pixel_shader=displayio.ColorConverter()) + tile_grid = displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())) # Create a Group to hold the TileGrid group = displayio.Group() # Add the TileGrid to the Group @@ -94,7 +94,7 @@ with open(emote_img[i], "rb") as bitmap_file: bitmap = displayio.OnDiskBitmap(bitmap_file) tile_grid = displayio.TileGrid( - bitmap, pixel_shader=displayio.ColorConverter() + bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter()) ) group = displayio.Group() group.append(tile_grid) diff --git a/PyGamer_Improved_Thermal_Camera/code.py b/PyGamer_Improved_Thermal_Camera/code.py index c6738bbbf..1b18621c3 100644 --- a/PyGamer_Improved_Thermal_Camera/code.py +++ b/PyGamer_Improved_Thermal_Camera/code.py @@ -65,7 +65,7 @@ with open("/thermal_cam_splash.bmp", "rb") as bitmap_file: bitmap = displayio.OnDiskBitmap(bitmap_file) splash = displayio.Group(scale=display.width // 160) - splash.append(displayio.TileGrid(bitmap, pixel_shader=displayio.ColorConverter())) + splash.append(displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter()))) display.show(splash) time.sleep(0.1) # Give the splash graphic some time to display diff --git a/PyGamer_Thermal_Camera/code.py b/PyGamer_Thermal_Camera/code.py index 6bbb0e8e3..d701fc266 100644 --- a/PyGamer_Thermal_Camera/code.py +++ b/PyGamer_Thermal_Camera/code.py @@ -34,7 +34,7 @@ bitmap = displayio.OnDiskBitmap(bitmap_file) splash = displayio.Group() splash.append(displayio.TileGrid(bitmap, - pixel_shader=displayio.ColorConverter())) + pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter()))) board.DISPLAY.show(splash) time.sleep(0.1) # Allow the splash to display panel.play_tone(440, 0.1) # A4 diff --git a/PyPortal_AWS_IOT_Planter/aws_gfx_helper.py b/PyPortal_AWS_IOT_Planter/aws_gfx_helper.py index a5cd526fa..6592b50c3 100755 --- a/PyPortal_AWS_IOT_Planter/aws_gfx_helper.py +++ b/PyPortal_AWS_IOT_Planter/aws_gfx_helper.py @@ -136,10 +136,10 @@ def set_icon(self, filename): icon = displayio.OnDiskBitmap(self._icon_file) try: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter()) + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter())) except TypeError: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), position=(0,0)) self._icon_group.append(self._icon_sprite) diff --git a/PyPortal_Alarm_Clock/code.py b/PyPortal_Alarm_Clock/code.py index 7dd616367..4fce4098f 100644 --- a/PyPortal_Alarm_Clock/code.py +++ b/PyPortal_Alarm_Clock/code.py @@ -265,11 +265,11 @@ def tick(self, now): icon = displayio.OnDiskBitmap(self.icon_file) try: icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), x=0, y=0) except TypeError: icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), position=(0, 0)) @@ -339,11 +339,11 @@ def enter(self): icon = displayio.OnDiskBitmap(self.snooze_file) try: icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), x=0, y=0) except TypeError: icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), position=(0, 0)) self.snooze_icon.append(icon_sprite) pyportal.splash.append(self.snooze_icon) diff --git a/PyPortal_Azure_Plant_Monitor/azure_gfx_helper.py b/PyPortal_Azure_Plant_Monitor/azure_gfx_helper.py index 214308cd4..2ed11b303 100755 --- a/PyPortal_Azure_Plant_Monitor/azure_gfx_helper.py +++ b/PyPortal_Azure_Plant_Monitor/azure_gfx_helper.py @@ -133,10 +133,10 @@ def set_icon(self, filename): icon = displayio.OnDiskBitmap(self._icon_file) try: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter()) + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter())) except TypeError: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), position=(0,0)) self._icon_group.append(self._icon_sprite) diff --git a/PyPortal_Electioncal_US/electioncal_graphics.py b/PyPortal_Electioncal_US/electioncal_graphics.py index 30bd63bc4..d369bcc9c 100644 --- a/PyPortal_Electioncal_US/electioncal_graphics.py +++ b/PyPortal_Electioncal_US/electioncal_graphics.py @@ -143,9 +143,9 @@ def set_icon(self, filename): icon = displayio.OnDiskBitmap(self._icon_file) try: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter()) + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter())) except TypeError: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), position=(0,0)) self._icon_group.append(self._icon_sprite) \ No newline at end of file diff --git a/PyPortal_GCP_IOT_Planter/gcp_gfx_helper.py b/PyPortal_GCP_IOT_Planter/gcp_gfx_helper.py index b507c9abd..f84c74b4e 100755 --- a/PyPortal_GCP_IOT_Planter/gcp_gfx_helper.py +++ b/PyPortal_GCP_IOT_Planter/gcp_gfx_helper.py @@ -137,10 +137,10 @@ def set_icon(self, filename): icon = displayio.OnDiskBitmap(self._icon_file) try: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter()) + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter())) except TypeError: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), position=(0,0)) self._icon_group.append(self._icon_sprite) diff --git a/PyPortal_OpenWeather/openweather_graphics.py b/PyPortal_OpenWeather/openweather_graphics.py index 3c01480cf..51cf26a50 100644 --- a/PyPortal_OpenWeather/openweather_graphics.py +++ b/PyPortal_OpenWeather/openweather_graphics.py @@ -131,9 +131,9 @@ def set_icon(self, filename): icon = displayio.OnDiskBitmap(self._icon_file) try: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter()) + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter())) except TypeError: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), position=(0,0)) self._icon_group.append(self._icon_sprite) diff --git a/PyPortal_Smart_Thermometer/thermometer_helper.py b/PyPortal_Smart_Thermometer/thermometer_helper.py index f886aea42..3d44cfd1a 100644 --- a/PyPortal_Smart_Thermometer/thermometer_helper.py +++ b/PyPortal_Smart_Thermometer/thermometer_helper.py @@ -134,10 +134,10 @@ def set_icon(self, filename): icon = displayio.OnDiskBitmap(self._icon_file) try: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter()) + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter())) except TypeError: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), position=(0,0)) self._icon_group.append(self._icon_sprite) diff --git a/PyPortal_Titano_Weather_Station/code.py b/PyPortal_Titano_Weather_Station/code.py index 66fb35cd1..87b33de3c 100644 --- a/PyPortal_Titano_Weather_Station/code.py +++ b/PyPortal_Titano_Weather_Station/code.py @@ -47,19 +47,19 @@ # sleep alarm sleep_bitmap = displayio.OnDiskBitmap(open("/sleepBMP.bmp", "rb")) -sleep_tilegrid = displayio.TileGrid(sleep_bitmap, pixel_shader=displayio.ColorConverter()) +sleep_tilegrid = displayio.TileGrid(sleep_bitmap, pixel_shader=getattr(sleep_bitmap, 'pixel_shader', displayio.ColorConverter())) group_bed = displayio.Group() group_bed.append(sleep_tilegrid) # trash alarm trash_bitmap = displayio.OnDiskBitmap(open("/trashBMP.bmp", "rb")) -trash_tilegrid = displayio.TileGrid(trash_bitmap, pixel_shader=displayio.ColorConverter()) +trash_tilegrid = displayio.TileGrid(trash_bitmap, pixel_shader=getattr(trash_bitmap, 'pixel_shader', displayio.ColorConverter())) group_trash = displayio.Group() group_trash.append(trash_tilegrid) # meal alarm eat_bitmap = displayio.OnDiskBitmap(open("/eatBMP.bmp", "rb")) -eat_tilegrid = displayio.TileGrid(eat_bitmap, pixel_shader=displayio.ColorConverter()) +eat_tilegrid = displayio.TileGrid(eat_bitmap, pixel_shader=getattr(eat_bitmap, 'pixel_shader', displayio.ColorConverter())) group_eat = displayio.Group() group_eat.append(eat_tilegrid) diff --git a/PyPortal_Titano_Weather_Station/openweather_graphics.py b/PyPortal_Titano_Weather_Station/openweather_graphics.py index 624e204ef..6a989b658 100644 --- a/PyPortal_Titano_Weather_Station/openweather_graphics.py +++ b/PyPortal_Titano_Weather_Station/openweather_graphics.py @@ -176,9 +176,9 @@ def set_icon(self, filename): icon = displayio.OnDiskBitmap(self._icon_file) try: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter()) + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter())) except TypeError: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), position=(0,0)) self._icon_group.append(self._icon_sprite) diff --git a/PyPortal_User_Interface/code.py b/PyPortal_User_Interface/code.py index 4272b8ff8..dad3fe770 100644 --- a/PyPortal_User_Interface/code.py +++ b/PyPortal_User_Interface/code.py @@ -125,9 +125,9 @@ def set_image(group, filename): image_file = open(filename, "rb") image = displayio.OnDiskBitmap(image_file) try: - image_sprite = displayio.TileGrid(image, pixel_shader=displayio.ColorConverter()) + image_sprite = displayio.TileGrid(image, pixel_shader=getattr(image, 'pixel_shader', displayio.ColorConverter())) except TypeError: - image_sprite = displayio.TileGrid(image, pixel_shader=displayio.ColorConverter(), + image_sprite = displayio.TileGrid(image, pixel_shader=getattr(image, 'pixel_shader', displayio.ColorConverter()), position=(0, 0)) group.append(image_sprite) diff --git a/RBG_Matrix/code.py b/RBG_Matrix/code.py index b24f0753f..60f999f30 100644 --- a/RBG_Matrix/code.py +++ b/RBG_Matrix/code.py @@ -50,7 +50,7 @@ # Setup the file as the bitmap data source bitmap = displayio.OnDiskBitmap(bitmap_file) # Create a TileGrid to hold the bitmap -tile_grid = displayio.TileGrid(bitmap, pixel_shader=displayio.ColorConverter()) +tile_grid = displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())) print(dir(tile_grid)) while True: diff --git a/Tilemap_Game_With_CircuitPython/code.py b/Tilemap_Game_With_CircuitPython/code.py index 2e4dd207d..1d90bea0e 100644 --- a/Tilemap_Game_With_CircuitPython/code.py +++ b/Tilemap_Game_With_CircuitPython/code.py @@ -444,7 +444,7 @@ def show_splash(new_text, color, vertical_offset=18): odb = displayio.OnDiskBitmap(game_message_background) - bg_grid = displayio.TileGrid(odb, pixel_shader=displayio.ColorConverter()) + bg_grid = displayio.TileGrid(odb, pixel_shader=getattr(odb, 'pixel_shader', displayio.ColorConverter())) splash.append(bg_grid) diff --git a/Vertical_Garden_Barometer/code.py b/Vertical_Garden_Barometer/code.py index e8748500c..16275ad15 100755 --- a/Vertical_Garden_Barometer/code.py +++ b/Vertical_Garden_Barometer/code.py @@ -59,13 +59,13 @@ # draw the rising image rising_file = open("rising.bmp", "rb") rising_bmp = displayio.OnDiskBitmap(rising_file) -rising_sprite = displayio.TileGrid(rising_bmp, pixel_shader=displayio.ColorConverter()) +rising_sprite = displayio.TileGrid(rising_bmp, pixel_shader=getattr(rising_bmp, 'pixel_shader', displayio.ColorConverter())) clue_display.append(rising_sprite) # draw the sinking image sinking_file = open("sinking.bmp", "rb") sinking_bmp = displayio.OnDiskBitmap(sinking_file) -sinking_sprite = displayio.TileGrid(sinking_bmp, pixel_shader=displayio.ColorConverter()) +sinking_sprite = displayio.TileGrid(sinking_bmp, pixel_shader=getattr(sinking_bmp, 'pixel_shader', displayio.ColorConverter())) clue_display.append(sinking_sprite) # Create text diff --git a/Voice2Json_Edge_Detection/demo.py b/Voice2Json_Edge_Detection/demo.py index 3867c434b..3dbf7ef65 100644 --- a/Voice2Json_Edge_Detection/demo.py +++ b/Voice2Json_Edge_Detection/demo.py @@ -54,7 +54,7 @@ def load_image(path): if len(splash): splash.pop() bitmap = displayio.OnDiskBitmap(open(path, "rb")) - sprite = displayio.TileGrid(bitmap, pixel_shader=displayio.ColorConverter()) + sprite = displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())) splash.append(sprite) def change_light_color(lightname, color): diff --git a/Weather_Display_Matrix/openweather_graphics.py b/Weather_Display_Matrix/openweather_graphics.py index 4bb8c90fd..6a8236b85 100644 --- a/Weather_Display_Matrix/openweather_graphics.py +++ b/Weather_Display_Matrix/openweather_graphics.py @@ -46,7 +46,7 @@ def __init__( background = displayio.OnDiskBitmap(open("loading.bmp", "rb")) bg_sprite = displayio.TileGrid( background, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(background, 'pixel_shader', displayio.ColorConverter()), ) splash.append(bg_sprite) display.show(splash) @@ -67,7 +67,7 @@ def __init__( icons = displayio.OnDiskBitmap(open(icon_spritesheet, "rb")) self._icon_sprite = displayio.TileGrid( icons, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icons, 'pixel_shader', displayio.ColorConverter()), width=1, height=1, tile_width=icon_width, diff --git a/azure_gfx_helper.py b/azure_gfx_helper.py index 9e8c58b17..c4765d6ff 100755 --- a/azure_gfx_helper.py +++ b/azure_gfx_helper.py @@ -107,10 +107,10 @@ def set_icon(self, filename): icon = displayio.OnDiskBitmap(self._icon_file) try: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter()) + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter())) except TypeError: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), position=(0,0)) self._icon_group.append(self._icon_sprite) diff --git a/pyportal_weather_station/weatherstation_helper.py b/pyportal_weather_station/weatherstation_helper.py index c86a336f7..1a81d5845 100755 --- a/pyportal_weather_station/weatherstation_helper.py +++ b/pyportal_weather_station/weatherstation_helper.py @@ -151,10 +151,10 @@ def set_icon(self, filename): icon = displayio.OnDiskBitmap(self._icon_file) try: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter()) + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter())) except TypeError: self._icon_sprite = displayio.TileGrid(icon, - pixel_shader=displayio.ColorConverter(), + pixel_shader=getattr(icon, 'pixel_shader', displayio.ColorConverter()), position=(0,0)) self._icon_group.append(self._icon_sprite)