prefect/startup/fire: Unified management of image resources

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

Author: lbuque

m5stack/modules/startup/fire/__init__.py

@@ -7,8 +7,7 @@
 from .apps.app_list import ListApp
 from .apps.ezdata import EzDataApp
 import time
-
-BK_IMG = "/system/stack/logo.png"
+from .res import LOGO_IMG
 
 
 class Sprite:
@@ -30,7 +29,7 @@ def startup(self, ssid: str, pswd: str, timeout: int = 60) -> None:
         M5.Speaker.setVolume(80)
         M5.Speaker.tone(4000, 50)
 
-        M5.Lcd.drawImage(BK_IMG)
+        M5.Lcd.drawImage(LOGO_IMG)
         time.sleep_ms(200)
 
         sprite = M5.Lcd.newCanvas(320, 184, 16, True)

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

@@ -5,6 +5,14 @@
 import M5
 import os
 import sys
+from ..res import (
+    APPLIST_UNSELECTED_IMG,
+    APPLIST_SELECTED_IMG,
+    APPLIST_IMG,
+    BAR5_IMG,
+    APPLIST_LEFT_IMG,
+    APPLIST_RIGHT_IMG,
+)
 
 
 class Rectangle:
@@ -60,7 +68,7 @@ def __init__(self, icos: dict, data=None) -> None:
         pass
 
     def on_install(self):
-        M5.Lcd.drawImage("/system/fire/appList_unselected.png", 5 + 62 * 3, 0)
+        M5.Lcd.drawImage(APPLIST_UNSELECTED_IMG, 5 + 62 * 3, 0)
 
     def on_launch(self):
         self._files = FileList("apps")
@@ -69,14 +77,14 @@ def on_launch(self):
         self._file_pos = 0
 
     def on_view(self):
-        M5.Lcd.drawImage("/system/fire/appList_selected.png", 5 + 62 * 3, 0)
+        M5.Lcd.drawImage(APPLIST_SELECTED_IMG, 5 + 62 * 3, 0)
 
         self._bg_img = Image(use_sprite=False)
         self._bg_img.set_pos(4, 56 + 4)
         self._bg_img.set_size(312, 156)
-        self._bg_img.set_src("/system/fire/applist.png")
+        self._bg_img.set_src(APPLIST_IMG)
 
-        M5.Lcd.drawImage("/system/fire/bar5.png", 0, 220)
+        M5.Lcd.drawImage(BAR5_IMG, 0, 220)
 
         self._line_spacing = 36 + 2 + 2
         self._left_cursor_x = 4
@@ -90,7 +98,7 @@ def on_view(self):
         self._left_img = Image(use_sprite=False)
         self._left_img.set_pos(self._left_cursor_x, self._left_cursor_y)
         self._left_img.set_size(10, 36)
-        self._left_img.set_src("/system/fire/applistLeft.png")
+        self._left_img.set_src(APPLIST_LEFT_IMG)
 
         self._right_cursor_x = 320 - 4 - 60 - 10
         self._right_cursor_y = (56 + 4) + 2
@@ -103,7 +111,7 @@ def on_view(self):
         self._right_img = Image(use_sprite=False)
         self._right_img.set_pos(self._right_cursor_x, self._right_cursor_y)
         self._right_img.set_size(10, 36)
-        self._right_img.set_src("/system/fire/applistRight.png")
+        self._right_img.set_src(APPLIST_RIGHT_IMG)
 
         self._label0 = Label(
             "",
@@ -158,7 +166,7 @@ def on_view(self):
             file and label and label.setText(file)
 
     def on_exit(self):
-        M5.Lcd.drawImage("/system/fire/appList_unselected.png", 5 + 62 * 3, 0)
+        M5.Lcd.drawImage(APPLIST_UNSELECTED_IMG, 5 + 62 * 3, 0)
         del self._bg_img, self._left_img, self._right_img
         del self._label0, self._label1, self._label2, self._label3, self._labels
         del self._files

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

@@ -8,6 +8,12 @@
 import machine
 import os
 import time
+from ..res import (
+    APPRUN_UNSELECTED_IMG,
+    APPRUN_SELECTED_IMG,
+    RUN_IMG,
+    BAR4_IMG,
+)
 
 try:
     import M5Things
@@ -22,21 +28,16 @@ def __init__(self, icos: dict, data=None) -> None:
         super().__init__()
 
     def on_install(self):
-        M5.Lcd.drawImage("/system/fire/appRun_unselected.png", 5 + 62 * 2, 0)
+        M5.Lcd.drawImage(APPRUN_UNSELECTED_IMG, 5 + 62 * 2, 0)
 
     def on_launch(self):
         self._mtime_text, self._account_text, self._ver_text = self._get_file_info("main.py")
 
     def on_view(self):
-        # M5.Lcd.clear()
-        # M5.Lcd.drawImage("/system/fire/setting_unselected.png", 5 + 62 * 0, 0)
-        # M5.Lcd.drawImage("/system/fire/develop_unselected.png", 5 + 62 * 1, 0)
-        M5.Lcd.drawImage("/system/fire/appRun_selected.png", 5 + 62 * 2, 0)
-        # M5.Lcd.drawImage("/system/fire/appList_unselected.png", 5 + 62 * 3, 0)
-        # M5.Lcd.drawImage("/system/fire/ezdata_unselected.png", 5 + 62 * 4, 0)
+        M5.Lcd.drawImage(APPRUN_SELECTED_IMG, 5 + 62 * 2, 0)
 
-        M5.Lcd.drawImage("/system/fire/run.png", 4, 56 + 4)
-        M5.Lcd.drawImage("/system/fire/bar4.png", 0, 220)
+        M5.Lcd.drawImage(RUN_IMG, 4, 56 + 4)
+        M5.Lcd.drawImage(BAR4_IMG, 0, 220)
 
         self._name_label = Label(
             "name",
@@ -89,20 +90,17 @@ def on_hide(self):
         pass
 
     def on_exit(self):
-        M5.Lcd.drawImage("/system/fire/appRun_unselected.png", 5 + 62 * 2, 0)
+        M5.Lcd.drawImage(APPRUN_UNSELECTED_IMG, 5 + 62 * 2, 0)
         del self._name_label, self._mtime_label, self._account_label, self._ver_label
 
     async def _btna_event_handler(self, fw):
-        # print("_btna_event_handler")
         pass
 
     async def _btnb_event_handler(self, fw):
-        # print("_btnb_event_handler")
         execfile("main.py")
         sys.exit(0)
 
     async def _btnc_event_handler(self, fw):
-        # print("_btnc_event_handler")
         nvs = esp32.NVS("uiflow")
         nvs.set_u8("boot_option", 2)
         nvs.commit()

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

@@ -15,7 +15,28 @@
 
 from common.font import MontserratMedium10
 from common.font import MontserratMedium18
-
+from ..res import (
+    WIFI_EMPTY_IMG,
+    WIFI_GOOD_IMG,
+    WIFI_MID_IMG,
+    WIFI_WORSE_IMG,
+    WIFI_DISCONNECTED_IMG,
+    SERVER_EMPTY_IMG,
+    SERVER_GREEN_IMG,
+    SERVER_ERROR_IMG,
+    DEVELOP_UNSELECTED_IMG,
+    DEVELOP_SELECTED_IMG,
+    DEVELOP_PRIVATE_IMG,
+    DEVELOP_PUBLIC_IMG,
+    BAR2_IMG,
+    BAR3_IMG,
+    BATTERY_RED_CHARGE_IMG,
+    BATTERY_RED_IMG,
+    BATTERY_GREEN_CHARGE_IMG,
+    BATTERY_GREEN_IMG,
+    BATTERY_BLACK_CHARGE_IMG,
+    BATTERY_BLACK_IMG,
+)
 import os
 import binascii
 import machine
@@ -44,17 +65,17 @@ class CloudStatus:
 
 
 _NETWORK_STATUS_ICOS = {
-    NetworkStatus.INIT: "/system/fire/WiFi/wifi_empty.png",
-    NetworkStatus.RSSI_GOOD: "/system/fire/WiFi/wifi_good.png",
-    NetworkStatus.RSSI_MID: "/system/fire/WiFi/wifi_mid.png",
-    NetworkStatus.RSSI_WORSE: "/system/fire/WiFi/wifi_worse.png",
-    NetworkStatus.DISCONNECTED: "/system/fire/WiFi/wifi_disconnected.png",
+    NetworkStatus.INIT: WIFI_EMPTY_IMG,
+    NetworkStatus.RSSI_GOOD: WIFI_GOOD_IMG,
+    NetworkStatus.RSSI_MID: WIFI_MID_IMG,
+    NetworkStatus.RSSI_WORSE: WIFI_WORSE_IMG,
+    NetworkStatus.DISCONNECTED: WIFI_DISCONNECTED_IMG,
 }
 
 _CLOUD_STATUS_ICOS = {
-    CloudStatus.INIT: "/system/fire/Server/server_empty.png",
-    CloudStatus.CONNECTED: "/system/fire/Server/Server_Green.png",
-    CloudStatus.DISCONNECTED: "/system/fire/Server/server_error.png",
+    CloudStatus.INIT: SERVER_EMPTY_IMG,
+    CloudStatus.CONNECTED: SERVER_GREEN_IMG,
+    CloudStatus.DISCONNECTED: SERVER_ERROR_IMG,
 }
 
 
@@ -65,7 +86,7 @@ def __init__(self, icos: dict, data=None) -> None:
         super().__init__()
 
     def on_install(self):
-        M5.Lcd.drawImage("/system/fire/develop_unselected.png", 5 + 62 * 1, 0)
+        M5.Lcd.drawImage(DEVELOP_UNSELECTED_IMG, 5 + 62 * 1, 0)
 
     def on_launch(self):
         self._mac_text = self._get_mac()
@@ -83,7 +104,7 @@ def on_launch(self):
         self._avatar_src = self._get_avatar()
 
     def on_view(self):
-        M5.Lcd.drawImage("/system/fire/develop_selected.png", 5 + 62 * 1, 0)
+        M5.Lcd.drawImage(DEVELOP_SELECTED_IMG, 5 + 62 * 1, 0)
         self._origin_x = 0
         self._origin_y = 56
         self._lcd.clear()
@@ -230,21 +251,18 @@ async def on_run(self):
             await asyncio.sleep_ms(1500)
 
     def on_exit(self):
-        M5.Lcd.drawImage("/system/fire/develop_unselected.png", 5 + 62 * 1, 0)
+        M5.Lcd.drawImage(DEVELOP_UNSELECTED_IMG, 5 + 62 * 1, 0)
         del self._bg_img, self._mac_label, self._account_label, self._avatar_img
         del self._bar_img, self._network_img, self._cloud_img, self._battery_img
         del self._battery_label
 
     async def _btna_event_handler(self, fw):
-        # print("_btna_event_handler")
         pass
 
     async def _btnb_event_handler(self, fw):
-        # print("_btnb_event_handler")
         pass
 
     async def _btnc_event_handler(self, fw):
-        # print("_btnc_event_handler")
         pass
 
     async def _dl_avatar(self, dst):

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

@@ -1,5 +1,6 @@
 from ..app import AppBase
 import M5
+from ..res import EZDATA_UNSELECTED_IMG, EZDATA_SELECTED_IMG
 
 
 class EzDataApp(AppBase):
@@ -8,10 +9,10 @@ def __init__(self, icos) -> None:
         super().__init__()
 
     def on_install(self):
-        M5.Lcd.drawImage("/system/fire/ezdata_unselected.png", 5 + 62 * 4, 0)
+        M5.Lcd.drawImage(EZDATA_UNSELECTED_IMG, 5 + 62 * 4, 0)
 
     def on_view(self):
-        M5.Lcd.drawImage("/system/fire/ezdata_selected.png", 5 + 62 * 4, 0)
+        M5.Lcd.drawImage(EZDATA_SELECTED_IMG, 5 + 62 * 4, 0)
 
         self._origin_x = 0
         self._origin_y = 56
@@ -25,7 +26,7 @@ def on_hide(self):
         pass
 
     def on_exit(self):
-        M5.Lcd.drawImage("/system/fire/ezdata_unselected.png", 5 + 62 * 4, 0)
+        M5.Lcd.drawImage(EZDATA_UNSELECTED_IMG, 5 + 62 * 4, 0)
         self._lcd.clear()
         self._lcd.push(self._origin_x, self._origin_y)