Fix stage for pygamer and pybadge on CP 7.0

deshipu · deshipu · commit f508d4d0fdb5 · 2021-12-03T21:18:03.000+01:00
Backlight handling is broken in displayio, so we handle it ourselves.
The keypad now requires additional parameters.
Swapped O and X keys on pybadge.
diff --git a/pybadge/ugame.py b/pybadge/ugame.py
@@ -6,10 +6,12 @@
 import keypad
 import audioio
 import audiocore
+import digitalio
+import supervisor
 
 
-K_X = 0x01
-K_O = 0x02
+K_O = 0x01
+K_X = 0x02
 K_DOWN = 0x20
 K_LEFT = 0x80
 K_RIGHT = 0x10
@@ -48,7 +50,7 @@ class _Buttons:
     def __init__(self):
         self.keys = keypad.ShiftRegisterKeys(clock=board.BUTTON_CLOCK,
             data=board.BUTTON_OUT, latch=board.BUTTON_LATCH, key_count=8,
-            interval=0.05)
+            interval=0.05, value_when_pressed=True)
         self.last_state = 0
         self.event = keypad.Event(0, False)
         self.last_z_press = None
@@ -111,8 +113,10 @@ def mute(self, value=True):
 _fourwire = displayio.FourWire(_tft_spi, command=board.TFT_DC,
                                chip_select=board.TFT_CS, reset=board.TFT_RST)
 display = displayio.Display(_fourwire, _TFT_INIT, width=160, height=128,
-                            rotation=0, backlight_pin=board.TFT_LITE,
-                            auto_refresh=False, auto_brightness=True)
+                            rotation=0, auto_refresh=False)
+# Work around broken backlight in CP 7.0
+_backlight = digitalio.DigitalInOut(board.TFT_LITE)
+_backlight.switch_to_output(value=1)
 del _TFT_INIT
 buttons = _Buttons()
 audio = _Audio(board.SPEAKER, board.SPEAKER_ENABLE)
diff --git a/pygamer/ugame.py b/pygamer/ugame.py
@@ -7,6 +7,8 @@
 import keypad
 import audioio
 import audiocore
+import supervisor
+import digitalio
 
 
 K_X = 0x01
@@ -49,7 +51,7 @@ class _Buttons:
     def __init__(self):
         self.keys = keypad.ShiftRegisterKeys(clock=board.BUTTON_CLOCK,
             data=board.BUTTON_OUT, latch=board.BUTTON_LATCH, key_count=4,
-            interval=0.05)
+            interval=0.05, value_when_pressed=True)
         self.last_state = 0
         self.event = keypad.Event(0, False)
         self.last_z_press = None
@@ -125,8 +127,10 @@ def mute(self, value=True):
 _fourwire = displayio.FourWire(_tft_spi, command=board.TFT_DC,
                                chip_select=board.TFT_CS, reset=board.TFT_RST)
 display = displayio.Display(_fourwire, _TFT_INIT, width=160, height=128,
-                            rotation=0, backlight_pin=board.TFT_LITE,
-                            auto_refresh=False, auto_brightness=True)
+                            rotation=0, auto_refresh=False)
+# Work around broken backlight in CP 7.0
+_backlight = digitalio.DigitalInOut(board.TFT_LITE)
+_backlight.switch_to_output(value=1)
 del _TFT_INIT
 buttons = _Buttons()
 audio = _Audio(board.SPEAKER, board.SPEAKER_ENABLE)
