From 713cc1a67ec53a18b1344487694f3c382240628d Mon Sep 17 00:00:00 2001
From: James Carr <lesamouraipourpre@gmail.com>
Date: Thu, 29 Jul 2021 09:18:56 +0100
Subject: [PATCH] Remove max_size usage with displayio.Group Update
 OnDiskBitmap filename string usage for CP7

---
 MagTag_Dishwasher_Status/wake_on_button.py | 19 ++++++++++++++++--
 MagTag_Dishwasher_Status/wake_on_flip.py   | 23 +++++++++++++++++++---
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/MagTag_Dishwasher_Status/wake_on_button.py b/MagTag_Dishwasher_Status/wake_on_button.py
index 60ca8e8d6..d9af4d17f 100755
--- a/MagTag_Dishwasher_Status/wake_on_button.py
+++ b/MagTag_Dishwasher_Status/wake_on_button.py
@@ -18,10 +18,14 @@
 bmp_file = "clean.bmp" if alarm.sleep_memory[0] else "dirty.bmp"
 
 # show bitmap
+
+# CircuitPython 6 & 7 compatible
 with open(bmp_file, "rb") as fp:
     bitmap = displayio.OnDiskBitmap(fp)
-    tile_grid = displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter()))
-    group = displayio.Group(max_size=1)
+    tile_grid = displayio.TileGrid(
+        bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())
+    )
+    group = displayio.Group()
     group.append(tile_grid)
     epd.show(group)
     time.sleep(epd.time_to_refresh + 0.01)
@@ -29,5 +33,16 @@
     while epd.busy:
         pass
 
+# # CircuitPython 7+ compatible
+# bitmap = displayio.OnDiskBitmap(bmp_file)
+# tile_grid = displayio.TileGrid(bitmap, pixel_shader=bitmap.pixel_shader)
+# group = displayio.Group()
+# group.append(tile_grid)
+# epd.show(group)
+# time.sleep(epd.time_to_refresh + 0.01)
+# epd.refresh()
+# while epd.busy:
+#     pass
+
 # go to sleep
 alarm.exit_and_deep_sleep_until_alarms(*pin_alarms)
diff --git a/MagTag_Dishwasher_Status/wake_on_flip.py b/MagTag_Dishwasher_Status/wake_on_flip.py
index ecabb6725..7ca89d9ea 100755
--- a/MagTag_Dishwasher_Status/wake_on_flip.py
+++ b/MagTag_Dishwasher_Status/wake_on_flip.py
@@ -42,12 +42,17 @@
     rotation = 90
     irq_config = 0b01001000
 
-# show bitmap
 epd.rotation = rotation
+
+# show bitmap
+
+# CircuitPython 6 & 7 compatible
 with open(bmp_file, "rb") as fp:
     bitmap = displayio.OnDiskBitmap(fp)
-    tile_grid = displayio.TileGrid(bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter()))
-    group = displayio.Group(max_size=1)
+    tile_grid = displayio.TileGrid(
+        bitmap, pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())
+    )
+    group = displayio.Group()
     group.append(tile_grid)
     epd.show(group)
     time.sleep(epd.time_to_refresh + 0.01)
@@ -55,6 +60,18 @@
     while epd.busy:
         pass
 
+# # CircuitPython 7+ compatible
+# bitmap = displayio.OnDiskBitmap(bmp_file)
+# tile_grid = displayio.TileGrid(bitmap, pixel_shader=bitmap.pixel_shader)
+# group = displayio.Group()
+# group.append(tile_grid)
+# epd.show(group)
+# time.sleep(epd.time_to_refresh + 0.01)
+# epd.refresh()
+# while epd.busy:
+#     pass
+
+
 # config accelo irq
 lis._write_register_byte(0x30, irq_config)