feature: Support StickC PLUS 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
+BOARD_TYPE_DEF := none atoms3 stamps3 cores3 atoms3u core2 stickcplus2 stickcplus
 
 # 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"
@@ -66,6 +66,8 @@ endif
 
 GIT_VERSION := $(shell git describe --abbrev=7 --always)
 
+include ./include/files.mk
+
 define pack_fw
 	$(1) makeimg.py \
 		$(BUILD)/sdkconfig \
@@ -129,6 +131,20 @@ 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)
+fs: build
+	@if [ ! -d $(BUILD)/base-files ]; then \
+		mkdir -p $(BUILD)/base-files; \
+	fi
+	$(call base-files/install,$(BOARD_TYPE),$(BUILD)/base-files)
+	@$(PYTHON) \
+			./../tools/fs_packed.py \
+			./../tools/littlefs/prebuilt/littlefs2 \
+			$(BOARD_TYPE) \
+			$(BUILD)/base-files \
+			$(BUILD)/fs-user.bin \
+			$(BUILD)/partition_table/partition-table.bin
+else
 fs: build
 	@$(PYTHON)                                     \
 			./../tools/fs_packed.py                \
@@ -144,6 +160,8 @@ fs: build
 			./fs/user                              \
 			$(BUILD)/fs-user.bin                   \
 			$(BUILD)/partition_table/partition-table.bin
+endif
+
 
 
 # Pack the firmware into a single binary without user filesystem.

m5stack/boards/M5STACK_4MB/sdkconfig.board

@@ -6,15 +6,3 @@ CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_FLASHFREQ="80m"
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-
-# MicroPython on ESP32, ESP IDF configuration with SPIRAM support
-
-CONFIG_ESP32_SPIRAM_SUPPORT=y
-CONFIG_SPIRAM_CACHE_WORKAROUND=y
-CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-# CONFIG_SPIRAM_USE_MEMMAP=y
-CONFIG_SPIRAM_USE_MALLOC=y
-CONFIG_SPIRAM_SPEED_80M=y
-# CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=8192
-# CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=16384
-CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y

m5stack/cmodules/m5unified/m5unified.cmake

@@ -20,9 +20,9 @@ target_include_directories(usermod_M5UNIFIED INTERFACE
     ${CMAKE_CURRENT_LIST_DIR}
 )
 
-# if (BOARD_TYPE STREQUAL "stickcplus2")
-#     target_compile_definitions(usermod_M5UNIFIED INTERFACE TINY_FONT=1)
-# endif()
+if (BOARD_TYPE STREQUAL "stickcplus")
+    target_compile_definitions(usermod_M5UNIFIED INTERFACE TINY_FONT=1)
+endif()
 
 target_link_libraries(usermod INTERFACE usermod_M5UNIFIED)