new upgrade the firmware in uiflow2.0[idf 5.0.4 & mpy1.22.0]

pandiannano · pandiannano · commit 99d9f15fba5f · 2024-01-22T11:25:50.000+08:00
diff --git a/m5stack/Makefile b/m5stack/Makefile
@@ -122,7 +122,7 @@ define pack_fw
 		$(BUILD)/uiflow-Sx-$(GIT_VERSION).uf2
 endef
 
-.PHONY: all target build deploy flash flash_all clean erase nvs fs pack pack_all littlefs mpy-cross submodules FORCE
+.PHONY: all target menu build deploy flash flash_all clean erase nvs fs pack pack_all littlefs mpy-cross submodules FORCE
 
 all: nvs fs pack
 	@echo ""
@@ -134,11 +134,15 @@ $(BUILD)/bootloader/bootloader.bin $(BUILD)/partition_table/partition-table.bin
 target:
 	idf.py $(IDFPY_FLAGS) set-target $(CHIP)
 
+# config the menu
+menu:
+	idf.py $(IDFPY_FLAGS) menuconfig
+
 size: 
 	idf.py $(IDFPY_FLAGS) size
 
 # Build the MicroPython firmware.
-build: nvs
+build: target nvs
 	idf.py $(IDFPY_FLAGS) build
 
 # Deploy the MicroPython.
diff --git a/m5stack/boards/M5STACK_Core2/mpconfigboard.cmake b/m5stack/boards/M5STACK_Core2/mpconfigboard.cmake
@@ -5,6 +5,7 @@ set(SDKCONFIG_DEFAULTS
     ./boards/sdkconfig.240mhz
     ./boards/sdkconfig.disable_iram
     ./boards/M5STACK_Core2/sdkconfig.board
+    ./boards/sdkconfig.spiram
 )
 
 # If not enable LVGL, ignore this...
diff --git a/m5stack/boards/M5STACK_CoreS3/sdkconfig.board b/m5stack/boards/M5STACK_CoreS3/sdkconfig.board
@@ -7,31 +7,3 @@ CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_SPIRAM_MEMTEST=
 
-#
-# Camera configuration
-#
-# CONFIG_OV7670_SUPPORT is not set
-# CONFIG_OV7725_SUPPORT is not set
-# CONFIG_NT99141_SUPPORT is not set
-CONFIG_OV2640_SUPPORT=y
-# CONFIG_OV3660_SUPPORT is not set
-# CONFIG_OV5640_SUPPORT is not set
-# CONFIG_GC2145_SUPPORT is not set
-# CONFIG_GC032A_SUPPORT is not set
-CONFIG_GC0308_SUPPORT=y
-# CONFIG_BF3005_SUPPORT is not set
-# CONFIG_BF20A6_SUPPORT is not set
-# CONFIG_SC101IOT_SUPPORT is not set
-# CONFIG_SC030IOT_SUPPORT is not set
-# CONFIG_SC031GS_SUPPORT is not set
-# CONFIG_SCCB_HARDWARE_I2C_PORT0 is not set
-CONFIG_SCCB_HARDWARE_I2C_PORT1=y
-CONFIG_SCCB_CLK_FREQ=100000
-CONFIG_CAMERA_TASK_STACK_SIZE=2048
-# CONFIG_CAMERA_CORE0=y
-CONFIG_CAMERA_CORE1=y
-# CONFIG_CAMERA_NO_AFFINITY is not set
-CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX=32768
-# CONFIG_CAMERA_CONVERTER_ENABLED is not set
-# end of Camera configuration
-# end of Component config
diff --git a/m5stack/boards/M5STACK_Fire/mpconfigboard.cmake b/m5stack/boards/M5STACK_Fire/mpconfigboard.cmake
@@ -5,6 +5,7 @@ set(SDKCONFIG_DEFAULTS
     ./boards/sdkconfig.240mhz
     ./boards/sdkconfig.disable_iram
     ./boards/M5STACK_Fire/sdkconfig.board
+    ./boards/sdkconfig.spiram
 )
 
 # If not enable LVGL, ignore this...
diff --git a/m5stack/boards/M5STACK_S3_8MB/sdkconfig.board b/m5stack/boards/M5STACK_S3_8MB/sdkconfig.board
@@ -5,5 +5,4 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
-CONFIG_SPIRAM_MEMTEST=
-CONFIG_FREERTOS_UNICORE=y
+CONFIG_SPIRAM_MEMTEST=
diff --git a/m5stack/boards/M5STACK_StickC_PLUS2/mpconfigboard.cmake b/m5stack/boards/M5STACK_StickC_PLUS2/mpconfigboard.cmake
@@ -5,6 +5,7 @@ set(SDKCONFIG_DEFAULTS
     ./boards/sdkconfig.240mhz
     ./boards/sdkconfig.disable_iram
     ./boards/M5STACK_StickC_PLUS2/sdkconfig.board
+    ./boards/sdkconfig.spiram
 )
 
 # If not enable LVGL, ignore this...
diff --git a/m5stack/boards/sdkconfig.base b/m5stack/boards/sdkconfig.base
@@ -18,10 +18,10 @@ CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
 
 # Change default log level to "ERROR" (instead of "INFO")
 CONFIG_LOG_DEFAULT_LEVEL_VERBOSE=n
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y
+CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
 CONFIG_LOG_DEFAULT_LEVEL_INFO=n
 CONFIG_LOG_DEFAULT_LEVEL_NONE=n
-CONFIG_LOG_DEFAULT_LEVEL_ERROR=n
+CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
 CONFIG_LOG_DEFAULT_LEVEL=1
 
 # ESP32-specific
diff --git a/m5stack/boards/sdkconfig.spiram b/m5stack/boards/sdkconfig.spiram
@@ -3,4 +3,10 @@
 CONFIG_ESP32_SPIRAM_SUPPORT=y
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-CONFIG_SPIRAM_USE_MEMMAP=y
+#CONFIG_SPIRAM_USE_MEMMAP=y
+
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
+CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
+CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
diff --git a/m5stack/boards/sdkconfig.spiram_sx b/m5stack/boards/sdkconfig.spiram_sx
@@ -3,9 +3,11 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y
 CONFIG_ESP32S3_SPIRAM_SUPPORT=y
 CONFIG_SPIRAM_MODE_QUAD=y
 CONFIG_SPIRAM_TYPE_AUTO=y
+CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
 CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SPIRAM_SPEED=80
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
diff --git a/m5stack/components/M5Unified/mpy_m5unified.cpp b/m5stack/components/M5Unified/mpy_m5unified.cpp
@@ -54,6 +54,7 @@ mp_obj_t m5_begin(void) {
 
     // initial
     M5.begin(cfg);
+    M5.In_I2C.release();
 
     M5.Display.clear();
     // default display
diff --git a/m5stack/main.c b/m5stack/main.c
@@ -119,23 +119,14 @@ void mp_task(void *pvParameter) {
     mp_task_heap = NULL;
     #elif CONFIG_ESP32_SPIRAM_SUPPORT
     // Try to use the entire external SPIRAM directly for the heap
-    mp_task_heap = (void *)SOC_EXTRAM_DATA_LOW;
-    switch (esp_spiram_get_chip_size()) {
-        case ESP_SPIRAM_SIZE_16MBITS:
-            mp_task_heap_size = 2 * 1024 * 1024;
-            break;
-        case ESP_SPIRAM_SIZE_32MBITS:
-        case ESP_SPIRAM_SIZE_64MBITS:
-            mp_task_heap_size = 4 * 1024 * 1024;
-            break;
-        default:
-            // No SPIRAM, fallback to normal allocation
-            mp_task_heap = NULL;
-            break;
+    size_t esp_spiram_size = esp_psram_get_size();
+    if (esp_spiram_size > 0) {
+        mp_task_heap = (void *)SOC_EXTRAM_DATA_LOW;
+        mp_task_heap_size = esp_spiram_size;
     }
     #elif CONFIG_ESP32S2_SPIRAM_SUPPORT || CONFIG_ESP32S3_SPIRAM_SUPPORT
     // Try to use the entire external SPIRAM directly for the heap
-    size_t esp_spiram_size = esp_spiram_get_size();
+    size_t esp_spiram_size = esp_psram_get_size();
     if (esp_spiram_size > 0) {
         mp_task_heap = (void *)SOC_EXTRAM_DATA_HIGH - esp_spiram_size;
         mp_task_heap_size = esp_spiram_size;

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ set(SDKCONFIG_DEFAULTS`
`5`	`5`	`./boards/sdkconfig.240mhz`
`6`	`6`	`./boards/sdkconfig.disable_iram`
`7`	`7`	`./boards/M5STACK_Core2/sdkconfig.board`
	`8`	`+ ./boards/sdkconfig.spiram`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`# If not enable LVGL, ignore this...`