feature: Add Fire board

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

Author: lbuque

m5stack/Makefile

@@ -11,7 +11,7 @@ BOARD ?= M5STACK_8MB
 
 
 # Board type list
-BOARD_TYPE_DEF := none atoms3 stamps3 cores3 atoms3u core2 stickcplus2 stickcplus
+BOARD_TYPE_DEF := none atoms3 stamps3 cores3 atoms3u core2 stickcplus2 stickcplus fire
 
 # Select the board type to build, default is None
 # This value affects which folder in the "./fs/system/" directory is pack into "fs-system.bin"

m5stack/fs/system/common/img/avatar.jpg

@@ -61,7 +61,7 @@ def startup(boot_opt, timeout: int = 60) -> None:
 
         pin4 = Pin(4, Pin.OUT)
         pin4.value(1)
-    if board_id == M5.BOARD.M5AtomS3U:
+    if board_id in (M5.BOARD.M5AtomS3U, M5.BOARD.M5AtomS3Lite, M5.BOARD.M5StampS3):
         # M5AtomS3U may fail to enter the AUTODETECT process, which will cause
         # m5things to fail to obtain the board id.
         nvs = esp32.NVS("M5GFX")
@@ -93,7 +93,7 @@ def startup(boot_opt, timeout: int = 60) -> None:
 
             cores3 = CoreS3_Startup()
             cores3.startup(ssid, pswd, timeout)
-        elif board_id in (M5.BOARD.M5StackCore2, M5.BOARD.M5Tough, M5.BOARD.M5Stack):
+        elif board_id in (M5.BOARD.M5StackCore2, M5.BOARD.M5Tough):
             from .core2 import Core2_Startup
 
             core2 = Core2_Startup()
@@ -113,6 +113,11 @@ def startup(boot_opt, timeout: int = 60) -> None:
 
             stickcplus2 = StickCPlus_Startup()
             stickcplus2.startup(ssid, pswd, timeout)
+        elif board_id == M5.BOARD.M5Stack:
+            from .fire import Fire_Startup
+
+            fire = Fire_Startup()
+            fire.startup(ssid, pswd, timeout)
 
     # Only connect to network, not show any menu
     elif boot_opt is BOOT_OPT_NETWORK:

m5stack/fs/system/fire/Battery/battery_Black.png

@@ -541,7 +541,7 @@ def umount(self) -> None:
 
 _boot_options = (
     (
-        0,
+        2,
         ImageDesc(
             src="/system/core2/Setting/bootNo.png",
             x=4 + 60 + 3,
@@ -937,10 +937,7 @@ def mount(self):
         self._mac_label.setText(data[0])
         self._account_label.setText(str(data[1]))
 
-        if self.avatar == "/system/common/img/avatar.jpg":
-            M5.Lcd.drawJpg(self.avatar, 130, 180, 60, 60)
-        else:
-            M5.Lcd.drawJpg(self.avatar, 130, 180, 56, 56, 0, 0, 0.28, 0.28)
+        M5.Lcd.drawJpg(self.avatar, 130, 180, 56, 56, 0, 0, 0.28, 0.28)
 
     def load_data(self):
         mac = binascii.hexlify(machine.unique_id()).upper()
@@ -958,7 +955,6 @@ def load_data(self):
             if len(infos[4]) is 0:
                 self.avatar = "/system/common/img/avatar.jpg"
             else:
-                # FIXME: avatar.jpg path is not right
                 self.avatar = "/system/common/" + str(infos[4]).split("/")[-1]
 
             try:
@@ -1073,7 +1069,7 @@ def _handle_run_once(self):
 
     def _handle_run_always(self):
         nvs = esp32.NVS("uiflow")
-        nvs.set_u8("boot_option", 0)
+        nvs.set_u8("boot_option", 2)
         nvs.commit()
         machine.reset()
 
@@ -1383,7 +1379,7 @@ def _btn_once_event_handler(self, event):
     def _btn_always_event_handler(self, event):
         DEBUG and print("run always")
         nvs = esp32.NVS("uiflow")
-        nvs.set_u8("boot_option", 0)
+        nvs.set_u8("boot_option", 2)
         nvs.commit()
         with open("apps/" + self._files[self._file_pos], "rb") as f_src, open(
             "main.py", "wb"

m5stack/fs/system/fire/Battery/battery_Black_Charge.png

@@ -1031,10 +1031,7 @@ def mount(self):
         self._account_label.setText(str(data[1]))
 
         try:
-            if self.avatar == "/system/common/img/avatar.jpg":
-                M5.Lcd.drawJpg(self.avatar, 130, 180, 60, 60)
-            else:
-                M5.Lcd.drawJpg(self.avatar, 130, 180, 56, 56, 0, 0, 0.28, 0.28)
+            M5.Lcd.drawJpg(self.avatar, 130, 180, 56, 56, 0, 0, 0.28, 0.28)
         except OSError:
             pass
 
@@ -1054,7 +1051,6 @@ def load_data(self):
             if len(infos[4]) is 0:
                 self.avatar = "/system/common/img/avatar.jpg"
             else:
-                # FIXME: avatar.jpg path is not right
                 self.avatar = "/system/common/" + str(infos[4]).split("/")[-1]
 
             try:

m5stack/fs/system/fire/Battery/battery_Gray.png

@@ -0,0 +1,49 @@
+from startup import Startup
+import M5
+from .framework import Framework
+from .apps.settings import SettingsApp
+from .apps.dev import DevApp
+from .apps.app_run import RunApp
+from .apps.app_list import ListApp
+from .apps.ezdata import EzDataApp
+import time
+
+BK_IMG = "/system/stack/logo.png"
+
+
+class Sprite:
+    def __init__(self, x, y, w, h, bpp, psram, parent=M5.Lcd) -> None:
+        self._sprite = parent.newCanvas(w, h, bpp, psram)
+        self._x = x
+        self._y = y
+
+    def refresh(self):
+        self._sprite.push(self._x, self._y)
+
+
+class Fire_Startup:
+    def __init__(self) -> None:
+        self._wlan = Startup()
+
+    def startup(self, ssid: str, pswd: str, timeout: int = 60) -> None:
+        self._wlan.connect_network(ssid, pswd)
+        M5.Speaker.setVolume(80)
+        M5.Speaker.tone(4000, 50)
+
+        M5.Lcd.drawImage(BK_IMG)
+        time.sleep_ms(200)
+
+        sprite = M5.Lcd.newCanvas(320, 184, 16, True)
+
+        fw = Framework()
+        settings_app = SettingsApp(sprite, data=self._wlan)
+        dev_app = DevApp(sprite, data=self._wlan)
+        run_app = RunApp(None)
+        list_app = ListApp(sprite)
+        fw.install_launcher(dev_app)
+        fw.install(settings_app)
+        fw.install(dev_app)
+        fw.install(run_app)
+        fw.install(list_app)
+        fw.install(EzDataApp(sprite))
+        fw.start()

m5stack/fs/system/fire/Battery/battery_Green.png

@@ -0,0 +1,79 @@
+try:
+    import uasyncio as asyncio
+except ImportError:
+    import asyncio
+
+def generator(d):
+    try:
+        len(d)
+    except TypeError:
+        cache = []
+        for i in d:
+            yield i
+            cache.append(i)
+        d = cache
+    while d:
+        yield from d
+
+class AppSelector():
+    def __init__(self, apps) -> None:
+        self._apps = apps
+        self._id = 0
+
+    def next(self):
+        self._id = (self._id + 1) % len(self._apps)
+        return self._apps[self._id]
+
+    def current(self):
+        return self._apps[self._id]
+
+class AppBase:
+    def __init__(self) -> None:
+        self._task = None
+
+    def on_install(self):
+        pass
+
+    def on_launch(self):
+        pass
+
+    def on_view(self):
+        pass
+
+    def on_ready(self):
+        self._task = asyncio.create_task(self.on_run())
+
+    async def on_run(self):
+        while True:
+            await asyncio.sleep_ms(500)
+
+    def on_hide(self):
+        self._task.cancel()
+
+    def on_exit(self):
+        pass
+
+    def on_uninstall(self):
+        pass
+
+    def install(self):
+        self.on_install()
+
+    def start(self):
+        self.on_launch()
+        self.on_view()
+        self.on_ready()
+
+    def pause(self):
+        self.on_hide()
+
+    def resume(self):
+        self.on_ready()
+
+    def stop(self):
+        self.on_hide()
+        self.on_exit()
+
+    def uninstall(self):
+        self.on_uninstall()
+