feature: Support Basic(4MB flash) board

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

Author: lbuque

m5stack/Makefile

@@ -19,7 +19,8 @@ boards := \
 	M5STACK_StickC_PLUS2:stickcplus2 \
 	M5STACK_StickC_PLUS:stickcplus   \
 	M5STACK_Fire:fire                \
-	M5STACK_Basic:basic
+	M5STACK_Basic:basic              \
+	M5STACK_Basic_4MB:basic
 
 define find_board
 $(if $(filter $(1):%,$(boards)),$(word 2,$(subst :, ,$(filter $(1):%,$(boards)))),none)
@@ -49,6 +50,13 @@ else
     $(error Board type $(BOARD_TYPE) does not exist in list [$(BOARD_TYPE_DEF)])
 endif
 
+TINY_BOARD_TYPE_DEF = M5STACK_StickC_PLUS M5STACK_Basic_4MB
+ifneq ($(filter $(BOARD),$(TINY_BOARD_TYPE_DEF)),)
+TINY_FLAG ?= 1
+else
+TINY_FLAG ?= 0
+endif
+
 # esp32c3's bootloader is different with esp32
 ifeq (C3, $(findstring C3,${BOARD}))
 	CHIP ?= esp32c3
@@ -157,7 +165,7 @@ nvs:
 	@$(PYTHON) ./../tools/nvs_partition_gen.py generate partition_nvs.csv $(BUILD)/nvs.bin 0x6000
 
 # Build the system and user filesystem firmware.
-ifeq ($(BOARD_TYPE),stickcplus)
+ifeq ($(TINY_FLAG),1)
 fs: build
 	@if [ ! -d $(BUILD)/base-files ]; then \
 		mkdir -p $(BUILD)/base-files; \

m5stack/boards/M5STACK_Basic_4MB/manifest.py

@@ -0,0 +1 @@
+include("$(MPY_DIR)/../m5stack/modules/startup/manifest_basic.py")

m5stack/boards/M5STACK_Basic_4MB/mpconfigboard.cmake

@@ -0,0 +1,17 @@
+set(SDKCONFIG_DEFAULTS
+    ./boards/sdkconfig.base
+    ./boards/sdkconfig.flash_4mb
+    ./boards/sdkconfig.ble
+    ./boards/sdkconfig.240mhz
+    ./boards/sdkconfig.disable_iram
+    ./boards/M5STACK_Basic/sdkconfig.board
+)
+
+# If not enable LVGL, ignore this...
+set(LV_CFLAGS -DLV_COLOR_DEPTH=16 -DLV_COLOR_16_SWAP=0)
+
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${CMAKE_SOURCE_DIR}/boards/manifest.py)
+endif()
+
+set(TINY_FLAG 1)

m5stack/boards/M5STACK_Basic_4MB/mpconfigboard.h

@@ -0,0 +1,5 @@
+#define MICROPY_HW_BOARD_NAME "M5STACK"
+#define MICROPY_HW_MCU_NAME "ESP32"
+
+// If not enable LVGL, ignore this...
+#include "./../mpconfiglvgl.h"

m5stack/boards/M5STACK_Basic_4MB/sdkconfig.board

@@ -0,0 +1,8 @@
+# SSL
+CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=n
+CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=y
+
+# Flash
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_FLASHFREQ="80m"
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y

m5stack/boards/M5STACK_StickC_PLUS/mpconfigboard.cmake

@@ -13,3 +13,5 @@ set(LV_CFLAGS -DLV_COLOR_DEPTH=16 -DLV_COLOR_16_SWAP=0)
 if(NOT MICROPY_FROZEN_MANIFEST)
     set(MICROPY_FROZEN_MANIFEST ${CMAKE_SOURCE_DIR}/boards/manifest.py)
 endif()
+
+set(TINY_FLAG 1)

m5stack/cmodules/m5unified/m5unified.cmake

@@ -20,7 +20,7 @@ target_include_directories(usermod_M5UNIFIED INTERFACE
     ${CMAKE_CURRENT_LIST_DIR}
 )
 
-if (BOARD_TYPE STREQUAL "stickcplus")
+if (TINY_FLAG)
     target_compile_definitions(usermod_M5UNIFIED INTERFACE TINY_FONT=1)
 endif()
 

m5stack/modules/startup/__init__.py

@@ -18,7 +18,7 @@ def __init__(self) -> None:
         self.wlan.active(True)
 
     def connect_network(self, ssid: str, pswd: str) -> bool:
-        if (len(ssid) > 0) or (len(pswd) > 0):
+        if len(ssid) > 0:
             self.wlan.connect(ssid, pswd)
             return True
         else:
@@ -132,6 +132,11 @@ def startup(boot_opt, timeout: int = 60) -> None:
 
                 basic = Basic_Startup()
                 basic.startup(ssid, pswd, timeout)
+        elif board_id == M5.BOARD.M5Stack:
+            from .capsule import Capsule_Startup
+
+            capsule = Capsule_Startup()
+            capsule.startup(ssid, pswd, timeout)
 
     # Only connect to network, not show any menu
     elif boot_opt is BOOT_OPT_NETWORK:

m5stack/modules/startup/basic/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/basic/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:
@@ -170,7 +189,8 @@ def on_exit(self):
         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
+        del self._rect0
+        del self._files, self._max_file_num, self._cursor_pos, self._file_pos
 
     async def _btna_event_handler(self, fw):
         pass