modules/startup: Fix image resource path error.

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

Author: lbuque

m5stack/libs/image_plus/__init__.py

@@ -14,7 +14,9 @@
 
 
 class ImagePlus(Widgets.Image):
-    def __init__(self, url, x, y, enable, period, default_img="res/img/default.jpg", parent=None):
+    def __init__(
+        self, url, x, y, enable, period, default_img="/flash/res/img/default.jpg", parent=None
+    ):
         self._url = url
         self._x = x
         self._y = y

m5stack/modules/startup/basic/res.py

@@ -11,56 +11,56 @@ def is_4mb():
 
 if is_4mb():
     _attrs = {
-        "BATTERY_BLACK_CHARGE_IMG": "res/basic/Battery/battery_Black_Charge.jpg",
-        "BATTERY_BLACK_IMG": "res/basic/Battery/battery_Black.jpg",
-        "BATTERY_GRAY_IMG": "res/basic/Battery/battery_Gray.jpg",
-        "BATTERY_GREEN_CHARGE_IMG": "res/basic/Battery/battery_Green_Charge.jpg",
-        "BATTERY_GREEN_IMG": "res/basic/Battery/battery_Green.jpg",
-        "BATTERY_RED_CHARGE_IMG": "res/basic/Battery/battery_Red_Charge.jpg",
-        "BATTERY_RED_IMG": "res/basic/Battery/battery_Red.jpg",
-        "BATTERY_YELLOW_IMG": "res/basic/Battery/battery_Yellow.jpg",
-        "SERVER_BLUE_IMG": "res/basic/Server/server_blue.jpg",
-        "SERVER_EMPTY_IMG": "res/basic/Server/server_empty.jpg",
-        "SERVER_ERROR_IMG": "res/basic/Server/server_error.jpg",
-        "SERVER_GREEN_IMG": "res/basic/Server/Server_Green.jpg",
-        "WIFI_DISCONNECTED_IMG": "res/basic/WiFi/wifi_disconnected.jpg",
-        "WIFI_EMPTY_IMG": "res/basic/WiFi/wifi_empty.jpg",
-        "WIFI_GOOD_IMG": "res/basic/WiFi/wifi_good.jpg",
-        "WIFI_MID_IMG": "res/basic/WiFi/wifi_mid.jpg",
-        "WIFI_WORSE_IMG": "res/basic/WiFi/wifi_worse.jpg",
-        "APPLIST_SELECTED_IMG": "res/basic/appList_selected.jpg",
-        "APPLIST_UNSELECTED_IMG": "res/basic/appList_unselected.jpg",
-        "APPLIST_IMG": "res/basic/applist.jpg",
-        "APPLIST_LEFT_IMG": "res/basic/applistLeft.jpg",
-        "APPLIST_RIGHT_IMG": "res/basic/applistRight.jpg",
-        "APPRUN_SELECTED_IMG": "res/basic/appRun_selected.jpg",
-        "APPRUN_UNSELECTED_IMG": "res/basic/appRun_unselected.jpg",
-        "BAR1_IMG": "res/basic/bar1.jpg",
-        "BAR2_IMG": "res/basic/bar2.jpg",
-        "BAR3_IMG": "res/basic/bar3.jpg",
-        "BAR4_IMG": "res/basic/bar4.jpg",
-        "BAR5_IMG": "res/basic/bar5.jpg",
-        "BOOT_NO_IMG": "res/basic/boot_No.jpg",
-        "BOOT_YES_IMG": "res/basic/boot_Yes.jpg",
-        "DEVELOP_SELECTED_IMG": "res/basic/develop_selected.jpg",
-        "DEVELOP_UNSELECTED_IMG": "res/basic/develop_unselected.jpg",
-        "DEVELOP_PRIVATE_IMG": "res/basic/developPrivate.jpg",
-        "DEVELOP_PUBLIC_IMG": "res/basic/developPublic.jpg",
-        "EZDATA_SELECTED_IMG": "res/basic/ezdata_selected.jpg",
-        "EZDATA_UNSELECTED_IMG": "res/basic/ezdata_unselected.jpg",
-        "LOGO_IMG": "res/basic/logo.jpg",
-        "RUN_IMG": "res/basic/run.jpg",
-        "SCREEN25_IMG": "res/basic/screen25.jpg",
-        "SCREEN50_IMG": "res/basic/screen50.jpg",
-        "SCREEN75_IMG": "res/basic/screen75.jpg",
-        "SCREEN100_IMG": "res/basic/screen100.jpg",
-        "SETTING_SELECTED_IMG": "res/basic/setting_selected.jpg",
-        "SETTING_UNSELECTED_IMG": "res/basic/setting_unselected.jpg",
-        "SETTING_SELECT_IMG": "res/basic/settingSelect.jpg",
-        "SETTING_UNSELECT_IMG": "res/basic/settingUnselect.jpg",
-        "SETTING_WIFI_IMG": "res/basic/SettingWifi.jpg",
-        "AVATAR_IMG": "res/img/avatar.jpg",
-        "USER_AVATAR_PATH": "res/img/",
+        "BATTERY_BLACK_CHARGE_IMG": "/flash/res/basic/Battery/battery_Black_Charge.jpg",
+        "BATTERY_BLACK_IMG": "/flash/res/basic/Battery/battery_Black.jpg",
+        "BATTERY_GRAY_IMG": "/flash/res/basic/Battery/battery_Gray.jpg",
+        "BATTERY_GREEN_CHARGE_IMG": "/flash/res/basic/Battery/battery_Green_Charge.jpg",
+        "BATTERY_GREEN_IMG": "/flash/res/basic/Battery/battery_Green.jpg",
+        "BATTERY_RED_CHARGE_IMG": "/flash/res/basic/Battery/battery_Red_Charge.jpg",
+        "BATTERY_RED_IMG": "/flash/res/basic/Battery/battery_Red.jpg",
+        "BATTERY_YELLOW_IMG": "/flash/res/basic/Battery/battery_Yellow.jpg",
+        "SERVER_BLUE_IMG": "/flash/res/basic/Server/server_blue.jpg",
+        "SERVER_EMPTY_IMG": "/flash/res/basic/Server/server_empty.jpg",
+        "SERVER_ERROR_IMG": "/flash/res/basic/Server/server_error.jpg",
+        "SERVER_GREEN_IMG": "/flash/res/basic/Server/Server_Green.jpg",
+        "WIFI_DISCONNECTED_IMG": "/flash/res/basic/WiFi/wifi_disconnected.jpg",
+        "WIFI_EMPTY_IMG": "/flash/res/basic/WiFi/wifi_empty.jpg",
+        "WIFI_GOOD_IMG": "/flash/res/basic/WiFi/wifi_good.jpg",
+        "WIFI_MID_IMG": "/flash/res/basic/WiFi/wifi_mid.jpg",
+        "WIFI_WORSE_IMG": "/flash/res/basic/WiFi/wifi_worse.jpg",
+        "APPLIST_SELECTED_IMG": "/flash/res/basic/appList_selected.jpg",
+        "APPLIST_UNSELECTED_IMG": "/flash/res/basic/appList_unselected.jpg",
+        "APPLIST_IMG": "/flash/res/basic/applist.jpg",
+        "APPLIST_LEFT_IMG": "/flash/res/basic/applistLeft.jpg",
+        "APPLIST_RIGHT_IMG": "/flash/res/basic/applistRight.jpg",
+        "APPRUN_SELECTED_IMG": "/flash/res/basic/appRun_selected.jpg",
+        "APPRUN_UNSELECTED_IMG": "/flash/res/basic/appRun_unselected.jpg",
+        "BAR1_IMG": "/flash/res/basic/bar1.jpg",
+        "BAR2_IMG": "/flash/res/basic/bar2.jpg",
+        "BAR3_IMG": "/flash/res/basic/bar3.jpg",
+        "BAR4_IMG": "/flash/res/basic/bar4.jpg",
+        "BAR5_IMG": "/flash/res/basic/bar5.jpg",
+        "BOOT_NO_IMG": "/flash/res/basic/boot_No.jpg",
+        "BOOT_YES_IMG": "/flash/res/basic/boot_Yes.jpg",
+        "DEVELOP_SELECTED_IMG": "/flash/res/basic/develop_selected.jpg",
+        "DEVELOP_UNSELECTED_IMG": "/flash/res/basic/develop_unselected.jpg",
+        "DEVELOP_PRIVATE_IMG": "/flash/res/basic/developPrivate.jpg",
+        "DEVELOP_PUBLIC_IMG": "/flash/res/basic/developPublic.jpg",
+        "EZDATA_SELECTED_IMG": "/flash/res/basic/ezdata_selected.jpg",
+        "EZDATA_UNSELECTED_IMG": "/flash/res/basic/ezdata_unselected.jpg",
+        "LOGO_IMG": "/flash/res/basic/logo.jpg",
+        "RUN_IMG": "/flash/res/basic/run.jpg",
+        "SCREEN25_IMG": "/flash/res/basic/screen25.jpg",
+        "SCREEN50_IMG": "/flash/res/basic/screen50.jpg",
+        "SCREEN75_IMG": "/flash/res/basic/screen75.jpg",
+        "SCREEN100_IMG": "/flash/res/basic/screen100.jpg",
+        "SETTING_SELECTED_IMG": "/flash/res/basic/setting_selected.jpg",
+        "SETTING_UNSELECTED_IMG": "/flash/res/basic/setting_unselected.jpg",
+        "SETTING_SELECT_IMG": "/flash/res/basic/settingSelect.jpg",
+        "SETTING_UNSELECT_IMG": "/flash/res/basic/settingUnselect.jpg",
+        "SETTING_WIFI_IMG": "/flash/res/basic/SettingWifi.jpg",
+        "AVATAR_IMG": "/flash/res/img/avatar.jpg",
+        "USER_AVATAR_PATH": "/flash/res/img/",
     }
 else:
     _attrs = {

m5stack/modules/startup/stickc.py

@@ -26,41 +26,41 @@
 DEBUG = True
 
 # launcher
-LAUNCHER_IMG = "res/stickc/launcher.jpeg"
+LAUNCHER_IMG = "/flash/res/stickc/launcher.jpeg"
 
 # menu
-MENU_DEV_IMG = "res/stickc/menu_dev.jpeg"
-MENU_APPRUN_IMG = "res/stickc/menu_apprun.jpeg"
-MENU_APPLIST_IMG = "res/stickc/menu_applist.jpeg"
+MENU_DEV_IMG = "/flash/res/stickc/menu_dev.jpeg"
+MENU_APPRUN_IMG = "/flash/res/stickc/menu_apprun.jpeg"
+MENU_APPLIST_IMG = "/flash/res/stickc/menu_applist.jpeg"
 
 # app.run
-APPRUN_IMG = "res/stickc/apprun.jpeg"
-RUN_ONCE_SELECT_IMG = "res/stickc/run_once_select.jpeg"
-RUN_ONCE_UNSELECT_IMG = "res/stickc/run_once_unselect.jpeg"
-RUN_ALWAYS_SELECT_IMG = "res/stickc/run_always_select.jpeg"
-RUN_ALWAYS_UNSELECT_IMG = "res/stickc/run_always_unselect.jpeg"
+APPRUN_IMG = "/flash/res/stickc/apprun.jpeg"
+RUN_ONCE_SELECT_IMG = "/flash/res/stickc/run_once_select.jpeg"
+RUN_ONCE_UNSELECT_IMG = "/flash/res/stickc/run_once_unselect.jpeg"
+RUN_ALWAYS_SELECT_IMG = "/flash/res/stickc/run_always_select.jpeg"
+RUN_ALWAYS_UNSELECT_IMG = "/flash/res/stickc/run_always_unselect.jpeg"
 
 # app.list
-APPLIST_IMG = "res/stickc/applist.jpeg"
+APPLIST_IMG = "/flash/res/stickc/applist.jpeg"
 
 # app.cloud
-CLOUD_WAIT_IMG = "res/stickc/wifi_wait.jpeg"
-CLOUD_CONNECTED_IMG = "res/stickc/wifi_connect.jpeg"
-CLOUD_DISCONNECTED_IMG = "res/stickc/wifi_disconnected.jpeg"
-CLOUD_ERROR_IMG = "res/stickc/wifi_error.jpeg"
-CLOUD_READY_IMG = "res/stickc/wifi_ready.jpeg"
+CLOUD_WAIT_IMG = "/flash/res/stickc/wifi_wait.jpeg"
+CLOUD_CONNECTED_IMG = "/flash/res/stickc/wifi_connect.jpeg"
+CLOUD_DISCONNECTED_IMG = "/flash/res/stickc/wifi_disconnected.jpeg"
+CLOUD_ERROR_IMG = "/flash/res/stickc/wifi_error.jpeg"
+CLOUD_READY_IMG = "/flash/res/stickc/wifi_ready.jpeg"
 
 # statusbar
-BAT_IMG_PATH = "res/stickc/battery/"
+BAT_IMG_PATH = "/flash/res/stickc/battery/"
 
 # develop
-AVATAR_IMG = "res/img/avatar.jpeg"
-DEVELOP_PRIVATE_IMG = "res/stickc/develop_private.jpeg"
-DEVELOP_PUBLIC_IMG = "res/stickc/develop_public.jpeg"
+AVATAR_IMG = "/flash/res/img/avatar.jpeg"
+DEVELOP_PRIVATE_IMG = "/flash/res/stickc/develop_private.jpeg"
+DEVELOP_PUBLIC_IMG = "/flash/res/stickc/develop_public.jpeg"
 
 # font
-MontserratMedium10_VLW = "res/stickc/Montserrat-Medium-10.vlw"
-MontserratMedium12_VLW = "res/stickc/Montserrat-Medium-12.vlw"
+MontserratMedium10_VLW = "/flash/res/stickc/Montserrat-Medium-10.vlw"
+MontserratMedium12_VLW = "/flash/res/stickc/Montserrat-Medium-12.vlw"
 
 
 class AppBase:
@@ -254,7 +254,7 @@ def _get_avatar():
             if len(infos[4]) == 0:
                 return AVATAR_IMG
             else:
-                return "res/img/" + str(infos[4]).split("/")[-1]
+                return "/flash/res/img/" + str(infos[4]).split("/")[-1]
         else:
             return AVATAR_IMG
 

m5stack/modules/startup/stickcplus.py

@@ -21,23 +21,23 @@
 DEBUG = True
 
 if M5.getBoard() == M5.BOARD.M5StickCPlus:
-    APPLIST_IMG = "res/stickcplus/APPLIST.jpg"
-    BK_IMG = "res/stickcplus/bk.jpg"
-    CLOUD1_IMG = "res/stickcplus/cloud1.jpg"
-    CLOUD2_IMG = "res/stickcplus/cloud2.jpg"
-    CLOUD3_IMG = "res/stickcplus/cloud3.jpg"
-    CLOUD4_IMG = "res/stickcplus/cloud4.jpg"
-    CLOUD5_IMG = "res/stickcplus/cloud5.jpg"
-    CLOUD6_IMG = "res/stickcplus/cloud6.jpg"
-    CLOUD7_IMG = "res/stickcplus/cloud7.jpg"
-    CLOUD8_IMG = "res/stickcplus/cloud8.jpg"
-    CLOUD9_IMG = "res/stickcplus/cloud9.jpg"
-    CLOUD10_IMG = "res/stickcplus/cloud10.jpg"
-    MODE1_IMG = "res/stickcplus/mode1.jpg"
-    MODE2_IMG = "res/stickcplus/mode2.jpg"
-    MODE3_IMG = "res/stickcplus/mode3.jpg"
-    MODE4_IMG = "res/stickcplus/mode4.jpg"
-    USB_IMG = "res/stickcplus/usb.jpg"
+    APPLIST_IMG = "/flash/res/stickcplus/APPLIST.jpg"
+    BK_IMG = "/flash/res/stickcplus/bk.jpg"
+    CLOUD1_IMG = "/flash/res/stickcplus/cloud1.jpg"
+    CLOUD2_IMG = "/flash/res/stickcplus/cloud2.jpg"
+    CLOUD3_IMG = "/flash/res/stickcplus/cloud3.jpg"
+    CLOUD4_IMG = "/flash/res/stickcplus/cloud4.jpg"
+    CLOUD5_IMG = "/flash/res/stickcplus/cloud5.jpg"
+    CLOUD6_IMG = "/flash/res/stickcplus/cloud6.jpg"
+    CLOUD7_IMG = "/flash/res/stickcplus/cloud7.jpg"
+    CLOUD8_IMG = "/flash/res/stickcplus/cloud8.jpg"
+    CLOUD9_IMG = "/flash/res/stickcplus/cloud9.jpg"
+    CLOUD10_IMG = "/flash/res/stickcplus/cloud10.jpg"
+    MODE1_IMG = "/flash/res/stickcplus/mode1.jpg"
+    MODE2_IMG = "/flash/res/stickcplus/mode2.jpg"
+    MODE3_IMG = "/flash/res/stickcplus/mode3.jpg"
+    MODE4_IMG = "/flash/res/stickcplus/mode4.jpg"
+    USB_IMG = "/flash/res/stickcplus/usb.jpg"
 elif M5.getBoard() == M5.BOARD.M5StickCPlus2:
     APPLIST_IMG = "/system/stickcplus2/APPLIST.png"
     BK_IMG = "/system/stickcplus2/bk.png"