fix/board: Device id recognition error problem

lbuque · lbuque · commit 477b9ccc1b57 · 2024-01-24T18:06:44.000+08:00
Signed-off-by: lbuque &lt;1102390310@qq.com&gt;
diff --git a/m5stack/Makefile b/m5stack/Makefile
@@ -8,7 +8,7 @@
 # M5STACK_S3_xxx -> ESP32 S3
 -include .workenv
 
-BOARD ?= M5STACK_8MB
+BOARD ?= M5STACK_AtomS3
 
 boards := \
 	M5STACK_AtomS3:atoms3            \
@@ -17,6 +17,7 @@ boards := \
 	M5STACK_CoreS3:cores3            \
 	M5STACK_AtomS3U:atoms3u          \
 	M5STACK_Core2:core2              \
+	M5STACK_Tough:tough              \
 	M5STACK_StickC_PLUS2:stickcplus2 \
 	M5STACK_StickC_PLUS:stickcplus   \
 	M5STACK_Fire:fire                \
@@ -38,6 +39,7 @@ BOARD_TYPE_DEF := \
 	cores3      \
 	atoms3u     \
 	core2       \
+	tough       \
 	stickcplus2 \
 	stickcplus  \
 	fire        \
diff --git a/m5stack/boards/M5STACK_AtomS3/mpconfigboard.cmake b/m5stack/boards/M5STACK_AtomS3/mpconfigboard.cmake
@@ -1,5 +1,8 @@
 set(IDF_TARGET esp32s3)
 
+# atoms3 https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L13
+set(BOARD_ID 11)
+
 set(SDKCONFIG_DEFAULTS
     ./boards/M5STACK_S3_8MB/sdkconfig.board
     ./boards/sdkconfig.base
diff --git a/m5stack/boards/M5STACK_AtomS3U/mpconfigboard.cmake b/m5stack/boards/M5STACK_AtomS3U/mpconfigboard.cmake
@@ -1,5 +1,8 @@
 set(IDF_TARGET esp32s3)
 
+# atoms3u https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L26
+set(BOARD_ID 138)
+
 set(SDKCONFIG_DEFAULTS
     ./boards/M5STACK_S3_8MB/sdkconfig.board
     ./boards/sdkconfig.base
diff --git a/m5stack/boards/M5STACK_AtomS3_Lite/mpconfigboard.cmake b/m5stack/boards/M5STACK_AtomS3_Lite/mpconfigboard.cmake
@@ -1,5 +1,8 @@
 set(IDF_TARGET esp32s3)
 
+# atoms3-lite https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L25
+set(BOARD_ID 137)
+
 set(SDKCONFIG_DEFAULTS
     ./boards/M5STACK_S3_8MB/sdkconfig.board
     ./boards/sdkconfig.base
diff --git a/m5stack/boards/M5STACK_Basic/mpconfigboard.cmake b/m5stack/boards/M5STACK_Basic/mpconfigboard.cmake
@@ -1,3 +1,6 @@
+# basic https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L3
+set(BOARD_ID 1)
+
 set(SDKCONFIG_DEFAULTS
     ./boards/sdkconfig.base
     ./boards/sdkconfig.flash_16mb
diff --git a/m5stack/boards/M5STACK_Basic_4MB/mpconfigboard.cmake b/m5stack/boards/M5STACK_Basic_4MB/mpconfigboard.cmake
@@ -1,3 +1,6 @@
+# basic https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L3
+set(BOARD_ID 1)
+
 set(SDKCONFIG_DEFAULTS
     ./boards/sdkconfig.base
     ./boards/sdkconfig.flash_4mb
diff --git a/m5stack/boards/M5STACK_Capsule/mpconfigboard.cmake b/m5stack/boards/M5STACK_Capsule/mpconfigboard.cmake
@@ -1,5 +1,8 @@
 set(IDF_TARGET esp32s3)
 
+# capsule https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L27
+set(BOARD_ID 139)
+
 set(SDKCONFIG_DEFAULTS
     ./boards/M5STACK_S3_8MB/sdkconfig.board
     ./boards/sdkconfig.base
diff --git a/m5stack/boards/M5STACK_Core2/mpconfigboard.cmake b/m5stack/boards/M5STACK_Core2/mpconfigboard.cmake
@@ -1,3 +1,6 @@
+# core2 https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L4
+set(BOARD_ID 2)
+
 set(SDKCONFIG_DEFAULTS
     ./boards/sdkconfig.base
     ./boards/sdkconfig.flash_16mb
diff --git a/m5stack/boards/M5STACK_CoreS3/mpconfigboard.cmake b/m5stack/boards/M5STACK_CoreS3/mpconfigboard.cmake
@@ -1,4 +1,8 @@
 set(IDF_TARGET esp32s3)
+
+# https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L12
+set(BOARD_ID 10)
+
 # Enable camera module
 set(M5_CAMERA_MODULE_ENABLE TRUE)
 
diff --git a/m5stack/boards/M5STACK_Dial/mpconfigboard.cmake b/m5stack/boards/M5STACK_Dial/mpconfigboard.cmake
@@ -1,5 +1,8 @@
 set(IDF_TARGET esp32s3)
 
+# dial https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L14
+set(BOARD_ID 12)
+
 set(SDKCONFIG_DEFAULTS
     ./boards/M5STACK_S3_8MB/sdkconfig.board
     ./boards/sdkconfig.base
diff --git a/m5stack/boards/M5STACK_Fire/mpconfigboard.cmake b/m5stack/boards/M5STACK_Fire/mpconfigboard.cmake
@@ -1,3 +1,7 @@
+# NOTE: fire和basic共用一个bid
+# basic https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L3
+set(BOARD_ID 1)
+
 set(SDKCONFIG_DEFAULTS
     ./boards/sdkconfig.base
     ./boards/sdkconfig.flash_16mb
diff --git a/m5stack/boards/M5STACK_StampS3/mpconfigboard.cmake b/m5stack/boards/M5STACK_StampS3/mpconfigboard.cmake
@@ -1,5 +1,8 @@
 set(IDF_TARGET esp32s3)
 
+# stamps3 https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L24
+set(BOARD_ID 136)
+
 set(SDKCONFIG_DEFAULTS
     ./boards/M5STACK_S3_8MB/sdkconfig.board
     ./boards/sdkconfig.base
diff --git a/m5stack/boards/M5STACK_StickC_PLUS/mpconfigboard.cmake b/m5stack/boards/M5STACK_StickC_PLUS/mpconfigboard.cmake
@@ -1,3 +1,6 @@
+# stickc-plus https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L6
+set(BOARD_ID 4)
+
 set(SDKCONFIG_DEFAULTS
     ./boards/sdkconfig.base
     ./boards/sdkconfig.flash_4mb
diff --git a/m5stack/boards/M5STACK_StickC_PLUS2/mpconfigboard.cmake b/m5stack/boards/M5STACK_StickC_PLUS2/mpconfigboard.cmake
@@ -1,3 +1,6 @@
+# stickc-plus2 https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L7
+set(BOARD_ID 5)
+
 set(SDKCONFIG_DEFAULTS
     ./boards/sdkconfig.base
     ./boards/sdkconfig.flash_8mb
diff --git a/m5stack/boards/M5STACK_Tough/manifest.py b/m5stack/boards/M5STACK_Tough/manifest.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/../m5stack/modules/startup/manifest_core2.py")
diff --git a/m5stack/boards/M5STACK_Tough/mpconfigboard.cmake b/m5stack/boards/M5STACK_Tough/mpconfigboard.cmake
@@ -0,0 +1,19 @@
+# tough https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L10
+set(BOARD_ID 8)
+
+set(SDKCONFIG_DEFAULTS
+    ./boards/sdkconfig.base
+    ./boards/sdkconfig.flash_16mb
+    ./boards/sdkconfig.ble
+    ./boards/sdkconfig.240mhz
+    ./boards/sdkconfig.disable_iram
+    ./boards/M5STACK_Tough/sdkconfig.board
+    ./boards/sdkconfig.spiram
+)
+
+# 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()
diff --git a/m5stack/boards/M5STACK_Tough/mpconfigboard.h b/m5stack/boards/M5STACK_Tough/mpconfigboard.h
@@ -0,0 +1,5 @@
+#define MICROPY_HW_BOARD_NAME "M5STACK"
+#define MICROPY_HW_MCU_NAME "ESP32(SPIRAM)"
+
+// If not enable LVGL, ignore this...
+#include "./../mpconfiglvgl.h"
diff --git a/m5stack/boards/M5STACK_Tough/sdkconfig.board b/m5stack/boards/M5STACK_Tough/sdkconfig.board
@@ -0,0 +1,20 @@
+# 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
+
+# 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
diff --git a/m5stack/components/M5Unified/CMakeLists.txt b/m5stack/components/M5Unified/CMakeLists.txt
@@ -30,3 +30,4 @@ endif()
 
 register_component()
 target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
+target_compile_definitions(${COMPONENT_LIB} PRIVATE BOARD_ID=${BOARD_ID})
diff --git a/m5stack/components/M5Unified/mpy_m5unified.cpp b/m5stack/components/M5Unified/mpy_m5unified.cpp
@@ -78,7 +78,7 @@ mp_obj_t m5_end(void) {
 }
 
 mp_obj_t m5_getBoard(void) {
-    return mp_obj_new_int(M5.getBoard());
+    return mp_obj_new_int(BOARD_ID);
 }
 /********************************Configuration*********************************/
 
