fixes for pixel_shader update with OnDiskBitmap TileGrids

Author: FoamyGuy

Buckaroo_Plant_Care_Bot/buckaroo_plant_care_bot.py

@@ -20,13 +20,13 @@
 # draw the dry plant
 dry_plant_file = open("dry.bmp", "rb")
 dry_plant_bmp = displayio.OnDiskBitmap(dry_plant_file)
-dry_plant_sprite = displayio.TileGrid(dry_plant_bmp, pixel_shader=displayio.ColorConverter())
+dry_plant_sprite = displayio.TileGrid(dry_plant_bmp, pixel_shader=getattr(dry_plant_bmp, 'pixel_shader', displayio.ColorConverter()))
 clue_display.append(dry_plant_sprite)
 
 # draw the happy plant on top (so it can be moved out of the way when needed)
 happy_plant_file = open("happy.bmp", "rb")
 happy_plant_bmp = displayio.OnDiskBitmap(happy_plant_file)
-happy_plant_sprite = displayio.TileGrid(happy_plant_bmp, pixel_shader=displayio.ColorConverter())
+happy_plant_sprite = displayio.TileGrid(happy_plant_bmp, pixel_shader=getattr(happy_plant_bmp, 'pixel_shader', displayio.ColorConverter()))
 clue_display.append(happy_plant_sprite)
 
 # Create text

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

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)
 
 

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)

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)

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:

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,

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

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,

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()

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)

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

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

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

HalloWing_Cat_Toy/code.py

@@ -73,7 +73,7 @@ def play_wave(filename):
 def show_image(filename):
     image_file = open(filename, "rb")
     odb = displayio.OnDiskBitmap(image_file)
-    face = displayio.Sprite(odb, pixel_shader=displayio.ColorConverter(), position=(0, 0))
+    face = displayio.Sprite(odb, pixel_shader=getattr(odb, 'pixel_shader', displayio.ColorConverter()), position=(0, 0))
     backlight.value = False
     splash.append(face)
     try:

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:

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:

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,

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)

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)

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)

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.

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

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,

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,

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)

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)

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
 

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

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)

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)

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)

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)

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)