updates lily-go board

Author: kdschlosser

display_configs/LilyGo-TDeck/LilyGo-TDeck.toml

@@ -41,20 +41,26 @@ reg_bits = 8
 
 [ST7789.display]
 data_bus = "display_bus"
-display_width = 320
-display_height = 240
+display_width = 240
+display_height = 320
 backlight_pin = 42
 backlight_on_state = "st7789.STATE_PWM"
 color_space = "lv.COLOR_FORMAT.RGB565"
 color_byte_order = "st7789.BYTE_ORDER_BGR"
 rgb565_byte_swap = true
 
+[display._ORIENTATION_TABLE]
+value = [0, 160, 192, 96]
+
 [display.set_power]
 params = [true]
 
 [display.init]
 params = []
 
+display.set_rotation]
+params = [3]
+
 [gt911.touch]
 device = "touch_device"
 
@@ -66,6 +72,7 @@ up_pin = 3
 down_pin = 2
 left_pin = 15
 right_pin = 1
+press_pin = 0
 
 [power.Button.pwr_button]
 pin = 10

display_configs/LilyGo-TDeck/keyboard_s3.py

@@ -8,6 +8,9 @@
 _LILYGO_KB_BRIGHTNESS_CMD = const(0x01)
 _LILYGO_KB_ALT_B_BRIGHTNESS_CMD = const(0x02)
 
+group = lv.group_create()
+group.set_default()
+
 
 class Keyboard(keypad_framework.KeypadDriver):
     def __init__(self, device, debug=False):  # NOQA
@@ -16,8 +19,14 @@ def __init__(self, device, debug=False):  # NOQA
         self._brightness = 0
         self._brightness_default = 127
 
+        self._buffer = bytearray(1)
+        self._mv = memoryview(self._buffer)
+
         super().__init__()
 
+        self.set_group(group)
+        self.enable(1)
+
     def set_default_brioghtness(self, value):
         value = lcd_utils.remap(float(value), 0.0, 100.0, 30.0, 255.0)
         value = int(round(value))
@@ -72,7 +81,10 @@ def _get_key(self):
         # lv.KEY.PREV = 0x0B
         # lv.KEY.HOME = 0x02
         # lv.KEY.END = 0x03
-        key = bytearray(self._device.read_mem(0x00, num_bytes=1))[0]
+
+        self._device.read(buf=self._mv)
+        key = self._buffer[0]
+
         if key == 0x00:  # no key
             return None
         elif key == 0x08:  # backspace
@@ -89,9 +101,10 @@ def _get_key(self):
             # key else convert to hex
             if 127 > k >= 32:
                 k = chr(k)
+                print('RAW KEY:', k)
             else:
                 k = hex(k)
-            print('RAW KEY:', hex(k))
+                print('RAW KEY:', hex(k))
 
         return self.PRESSED, key
 

display_configs/LilyGo-TDeck/trackball.py

@@ -3,34 +3,45 @@
 import keypad_framework
 import machine
 from micropython import const  # NOQA
+import keyboard_s3
 
-_UP = 0x01
-_DOWN = 0x02
-_LEFT = 0x04
-_RIGHT = 0x08
+_UP = const(0x01)
+_DOWN = const(0x02)
+_LEFT = const(0x04)
+_RIGHT = const(0x08)
+_PRESS = const(0x10)
+
+
+group = keyboard_s3.group
 
 
 class TrackBall(keypad_framework.KeypadDriver):
 
-    def __init__(self, up_pin, down_pin, left_pin, right_pin):  # NOQA
+    def __init__(self, up_pin=3, down_pin=15, left_pin=1, right_pin=2, press_pin=0):  # NOQA
 
         self._up_pin = machine.Pin(up_pin, machine.Pin.IN)
         self._down_pin = machine.Pin(down_pin, machine.Pin.IN)
         self._left_pin = machine.Pin(left_pin, machine.Pin.IN)
         self._right_pin = machine.Pin(right_pin, machine.Pin.IN)
+        self._press_pin = machine.Pin(press_pin, machine.Pin.IN)
         self._key = 0x00
 
+        self._key_state = self.RELEASED
+
         super().__init__()
 
+        self.set_group(g)
+        self.enable(1)
+
         self._indev_drv.set_mode(lv.INDEV_MODE.EVENT)  # NOQA
         self.__timer = lv.timer_create(self.__callback, 33, None)  # NOQA
         self.__timer.set_repeat_count(-1)  # NOQA
 
     def __callback(self, _):
         self.read()
-        last_state = self._current_state
+        last_state = self._key_state
 
-        while self._current_state == self.PRESSED:
+        while self._key_state == self.PRESSED:
             # this might be too fast so I may have to put a stall in here.
             lv.refr_now(self._disp_drv)
             self.read()
@@ -49,22 +60,39 @@ def _get_key(self):
                 key |= _LEFT
             if self._right_pin.value():
                 key |= _RIGHT
+            if self._press_pin.value():
+                key |= _PRESS
+
+        elif self._current_state == self.PRESSED:
+            return self.RELEASED, self._last_key
+
+        if key == 0x00:
+            self._key = key
+            self._key_state = self.RELEASED
+            return self.RELEASED, self._last_key
+        else:
+            self._key_state = self.PRESSED
 
         if key & _UP:
             key &= ~_UP
             self._key = key
-            return lv.KEY.UP
+            return self.PRESSED, lv.KEY.UP
         elif key & _DOWN:
             key &= ~_DOWN
             self._key = key
-            return lv.KEY.DOWN
+            return self.PRESSED, lv.KEY.DOWN
         elif key & _LEFT:
             key &= ~_LEFT
             self._key = key
-            return lv.KEY.LEFT
+            return self.PRESSED, lv.KEY.LEFT
         elif key & _RIGHT:
             key &= ~_RIGHT
             self._key = key
-            return lv.KEY.RIGHT
+            return self.PRESSED, lv.KEY.RIGHT
+        elif key & _PRESS:
+            key &= ~_PRESS
+            self._key = key
+            return self.PRESSED, lv.KEY.ENTER
         else:
             self._key = 0x00
+            return None