feature/startup/fire: Add CardKb input function

Signed-off-by: lbuque <[email protected]>

Author: lbuque

m5stack/modules/startup/fire/app.py

@@ -29,6 +29,10 @@ def next(self):
     def current(self):
         return self._apps[self._id]
 
+    def prev(self):
+        self._id = (self._id - 1) % len(self._apps)
+        return self._apps[self._id]
+
 
 class AppBase:
     def __init__(self) -> None:

m5stack/modules/startup/fire/apps/app_list.py

@@ -26,12 +26,31 @@ def __init__(self, x, y, w, h, color, fill_c, parent=M5.Lcd) -> None:
         self._parent = parent
         self.set_pos(self._x, self._y)
 
+    def set_x(self, x):
+        self._x = x
+        self._parent.fillRect(self._x, self._y, self._w, self._h, self._fill_c)
+        self._parent.drawRect(self._x, self._y, self._w, self._h, self._color)
+
+    def get_y(self):
+        return self._y
+
+    def set_y(self, y):
+        self._y = y
+        self._parent.fillRect(self._x, self._y, self._w, self._h, self._fill_c)
+        self._parent.drawRect(self._x, self._y, self._w, self._h, self._color)
+
     def set_pos(self, x, y):
         self._x = x
         self._y = y
         self._parent.fillRect(self._x, self._y, self._w, self._h, self._fill_c)
         self._parent.drawRect(self._x, self._y, self._w, self._h, self._color)
 
+    def set_color(self, color, fill_c):
+        self._color = color
+        self._fill_c = fill_c
+        self._parent.fillRect(self._x, self._y, self._w, self._h, self._fill_c)
+        self._parent.drawRect(self._x, self._y, self._w, self._h, self._color)
+
 
 class FileList:
     def __init__(self, dir, suffix=".py") -> None:

m5stack/modules/startup/fire/apps/settings.py

@@ -1,6 +1,5 @@
 from ..app import AppBase, generator, AppSelector
 import M5
-from M5 import Widgets
 from widgets.image import Image
 from widgets.label import Label
 import esp32
@@ -19,28 +18,37 @@
     SETTING_SELECTED_IMG,
     BAR1_IMG,
 )
+from unit import KeyCode
+from .app_list import Rectangle
 
 
 class WiFiSetting(AppBase):
     def __init__(self, icos: dict, data=None) -> None:
+        self._wifi = data
         self._lcd = icos
 
     def on_launch(self):
         self.get_data()
+        self._option = 0
+        self.focus = True
 
     def on_view(self):
-        origin_x = 4
-        origin_y = 4
+        self._origin_x = 4
+        self._origin_y = 4
 
         self._bg_img = Image(use_sprite=False, parent=self._lcd)
-        self._bg_img.set_pos(origin_x, origin_y)
+        self._bg_img.set_pos(self._origin_x, self._origin_y)
         self._bg_img.set_size(312, 108)
         self._bg_img.set_src(SETTING_WIFI_IMG)
 
+        self._rect0 = Rectangle(
+            self._origin_x + 96, self._origin_y + 7, 144, 26, 0xFEFEFE, 0xFEFEFE, self._lcd
+        )
+
         self._ssid_label = Label(
             "ssid",
-            origin_x + 98,
-            origin_y + 12,
+            self._origin_x + 98,
+            self._origin_y + 12,
             w=144,
             font_align=Label.LEFT_ALIGNED,
             fg_color=0x000000,
@@ -51,24 +59,27 @@ def on_view(self):
         self._ssid_label.setLongMode(Label.LONG_DOT)
         self._ssid_label.setText(self.ssid)
 
-        self._pwd_label = Label(
+        self._psk_label = Label(
             "pwd",
-            origin_x + 98,
-            origin_y + 12 + 35,
+            self._origin_x + 98,
+            self._origin_y + 12 + 35,
             w=144,
             font_align=Label.LEFT_ALIGNED,
             fg_color=0x000000,
             bg_color=0xFEFEFE,
             font=MontserratMedium16.FONT,
             parent=self._lcd,
         )
-        self._pwd_label.setLongMode(Label.LONG_DOT)
-        self._pwd_label.setText("*" * 20)
+        self._psk_label.setLongMode(Label.LONG_DOT)
+        if len(self.psk):
+            self._psk_label.setText("*" * 20)
+        else:
+            self._psk_label.setText("")
 
         self._server_label = Label(
             "server",
-            origin_x + 98,
-            origin_y + 12 + 35 + 34,
+            self._origin_x + 98,
+            self._origin_y + 12 + 35 + 34,
             w=144,
             font_align=Label.LEFT_ALIGNED,
             fg_color=0x000000,
@@ -79,6 +90,14 @@ def on_view(self):
         self._server_label.setLongMode(Label.LONG_DOT)
         self._server_label.setText(self.server)
 
+        self._option_views = generator(
+            (
+                (0, self._select_ssid_option),
+                (1, self._select_psk_option),
+                (2, self._select_server_option),
+            )
+        )
+
     def on_ready(self):
         pass
 
@@ -88,6 +107,112 @@ def on_hide(self):
     def on_exit(self):
         pass
 
+    async def _kb_event_handler(self, event, fw):
+        if event.key == KeyCode.KEYCODE_ENTER:
+            event.status = True
+            self.focus = True
+            self._option, view_fn = next(self._option_views)
+            view_fn()
+            self.set_data()
+
+        if self.focus is False:
+            return
+
+        if event.key == KeyCode.KEYCODE_ESC:
+            self.ssid_tmp = self.ssid
+            self.psk_tmp = self.psk
+            self.server_tmp = self.server
+            self._select_default_option()
+            self.focus = False
+            event.status = True
+            self.set_data()
+
+        if event.key == KeyCode.KEYCODE_BACKSPACE and self._option in (0, 1, 2):
+            if self._option == 0:
+                self.ssid_tmp = self.ssid_tmp[:-1]
+                self._ssid_label.setText(self.ssid_tmp)
+            elif self._option == 1:
+                if self.psk_tmp == self.psk and len(self.psk):
+                    self.psk_tmp = ""
+                else:
+                    self.psk_tmp = self.psk_tmp[:-1]
+                self._psk_label.setText(self.psk_tmp)
+            elif self._option == 2:
+                self.server_tmp = self.server_tmp[:-1]
+                self._server_label.setText(self.server_tmp)
+            event.status = True
+        elif event.key >= 0x20 and event.key <= 126:
+            if self._option == 0:
+                self.ssid_tmp += chr(event.key)
+                self._ssid_label.setText(self.ssid_tmp)
+            elif self._option == 1:
+                if self.psk_tmp == self.psk and len(self.psk):
+                    self.psk_tmp = ""
+                else:
+                    self.psk_tmp += chr(event.key)
+                self._psk_label.setText(self.psk_tmp)
+            elif self._option == 2:
+                self.server_tmp += chr(event.key)
+                self._server_label.setText(self.server_tmp)
+            event.status = True
+
+    def _select_default_option(self):
+        self._bg_img.refresh()
+        self._ssid_label.setTextColor(0x000000, 0xFEFEFE)
+        self._psk_label.setTextColor(0x000000, 0xFEFEFE)
+        self._server_label.setTextColor(0x000000, 0xFEFEFE)
+        self._ssid_label.setText(self.ssid_tmp)
+        if len(self.psk_tmp) is 0:
+            self._psk_label.setText("")
+        else:
+            self._psk_label.setText("*" * 20)
+        self._server_label.setText(self.server_tmp)
+
+    def _select_ssid_option(self):
+        # self._bg_img.set_src(SETTING_WIFI_IMG)
+        self._rect0.set_color(0xFEFEFE, 0xFEFEFE)
+        self._rect0.set_pos(self._origin_x + 98, self._origin_y + 7)
+        self._rect0.set_color(0xDCDDDD, 0xDCDDDD)
+        self._ssid_label.setTextColor(0x000000, 0xDCDDDD)
+        self._psk_label.setTextColor(0x000000, 0xFEFEFE)
+        self._server_label.setTextColor(0x000000, 0xFEFEFE)
+        self._ssid_label.setText(self.ssid_tmp)
+        if len(self.psk_tmp) is 0:
+            self._psk_label.setText("")
+        else:
+            self._psk_label.setText("*" * 20)
+        self._server_label.setText(self.server_tmp)
+
+    def _select_psk_option(self):
+        # self._bg_img.set_src(SETTING_WIFI_IMG)
+        self._rect0.set_color(0xFEFEFE, 0xFEFEFE)
+        self._rect0.set_pos(self._origin_x + 98, self._origin_y + 7 + 36)
+        self._rect0.set_color(0xDCDDDD, 0xDCDDDD)
+        self._ssid_label.setTextColor(0x000000, 0xFEFEFE)
+        self._psk_label.setTextColor(0x000000, 0xDCDDDD)
+        self._server_label.setTextColor(0x000000, 0xFEFEFE)
+        self._ssid_label.setText(self.ssid_tmp)
+        if len(self.psk_tmp) is 0:
+            self._psk_label.setText("")
+        else:
+            self._psk_label.setText("*" * 20)
+        self._server_label.setText(self.server_tmp)
+
+    def _select_server_option(self):
+        # self._bg_img.set_src(SETTING_WIFI_IMG)
+        self._rect0.set_color(0xFEFEFE, 0xFEFEFE)
+        self._rect0.set_pos(self._origin_x + 98, self._origin_y + 7 + 36 + 36)
+        self._rect0.set_color(0xDCDDDD, 0xDCDDDD)
+        self._ssid_label.setTextColor(0x000000, 0xFEFEFE)
+        self._psk_label.setTextColor(0x000000, 0xFEFEFE)
+        self._server_label.setTextColor(0x000000, 0xDCDDDD)
+        self._ssid_label.setText(self.ssid_tmp)
+        if len(self.psk_tmp) is 0:
+            self._psk_label.setText("")
+        else:
+            self._psk_label.setText("*" * 20)
+        self._server_label.setText(self.server_tmp)
+
     def get_data(self):
         self.nvs = esp32.NVS("uiflow")
         self.ssid = self.nvs.get_str("ssid0")
@@ -107,7 +232,7 @@ def set_data(self):
         if self.psk != self.psk_tmp:
             self.psk = self.psk_tmp
             self.nvs.set_str("pswd0", self.psk)
-            print("set new ssid: ", self.ssid)
+            print("set new psk: ", self.psk)
             is_save = True
         if self.server != self.server_tmp:
             self.server = self.server_tmp
@@ -309,6 +434,10 @@ def on_hide(self):
     def on_exit(self):
         M5.Lcd.drawImage(SETTING_UNSELECTED_IMG, 5 + 62 * 0, 0)
 
+    async def _kb_event_handler(self, event, fw):
+        await self._wlan_app._kb_event_handler(event, fw)
+        self._lcd.push(self._origin_x, self._origin_y)
+
     async def _btna_event_handler(self, fw):
         pass
 

m5stack/modules/startup/fire/framework.py

@@ -1,12 +1,14 @@
 from .app import AppBase, AppSelector
-
-try:
-    import uasyncio as asyncio
-except ImportError:
-    import asyncio
-
+import uasyncio as asyncio
 import M5
 import gc
+from machine import I2C, Pin
+from unit import CardKB, KeyCode
+
+
+class KeyEvent:
+    key = 0
+    status = False
 
 
 class Framework:
@@ -46,6 +48,14 @@ async def run(self):
                     break
             self._launcher.start()
         # asyncio.create_task(self.gc_task())
+
+        self.i2c0 = I2C(0, scl=Pin(22), sda=Pin(21), freq=100000)
+        self._kb_status = False
+        if 0x5F in self.i2c0.scan():
+            self._kb = CardKB(self.i2c0)
+            self._event = KeyEvent()
+            self._kb_status = True
+
         while True:
             M5.update()
             if M5.BtnA.wasClicked():
@@ -68,6 +78,31 @@ async def run(self):
                     asyncio.create_task(app._btnc_event_handler(self))
             await asyncio.sleep_ms(100)
 
+            if self._kb_status:
+                if self._kb.is_pressed():
+                    M5.Speaker.tone(3500, 50)
+                    self._event.key = self._kb.get_key()
+                    self._event.status = False
+                    await self.handle_input(self._event)
+
+    async def handle_input(self, event: KeyEvent):
+        if event.key is KeyCode.KEYCODE_RIGHT:
+            app = self._app_selector.current()
+            app.stop()
+            app = self._app_selector.next()
+            app.start()
+            event.status = True
+        if KeyCode.KEYCODE_LEFT == event.key:
+            app = self._app_selector.current()
+            app.stop()
+            app = self._app_selector.prev()
+            app.start()
+            event.status = True
+        if event.status == False:
+            app = self._app_selector.current()
+            if hasattr(app, "_kb_event_handler"):
+                await app._kb_event_handler(event, self)
+
     async def gc_task(self):
         while True:
             gc.collect()