merging main into pr branch

Author: FoamyGuy

adafruit_pyoa.py

@@ -406,17 +406,17 @@ def set_background(self, filename, *, with_fade=True):
             with open(
                 self._gamedirectory + "/" + filename, "rb"
             ) as self._background_file:
-                # TODO: Once CP6 is no longer supported, pass the combined filename into OnDiskBitmap
-            background = displayio.OnDiskBitmap(self._background_file)
-            self._background_sprite = displayio.TileGrid(
-                background,
-                pixel_shader=getattr(
-                    background, "pixel_shader", displayio.ColorConverter()
-                ),
-                # TODO: Once CP6 is no longer supported, replace the above line with below
-                # pixel_shader=background.pixel_shader,
-            )
-            self._background_group.append(self._background_sprite)
+                # TODO: Once CP6 is no longer supported, pass combined filename into OnDiskBitmap
+                background = displayio.OnDiskBitmap(self._background_file)
+                self._background_sprite = displayio.TileGrid(
+                    background,
+                    pixel_shader=getattr(
+                        background, "pixel_shader", displayio.ColorConverter()
+                    ),
+                    # TODO: Once CP6 is no longer supported, replace the above line with below
+                    # pixel_shader=background.pixel_shader,
+                )
+                self._background_group.append(self._background_sprite)
         if with_fade:
             self._display.refresh(target_frames_per_second=60)
             self.backlight_fade(1.0)