Merge remote-tracking branch 'origin/develop' into develop-pandian

Author: pandiannano

.github/workflows/nightly-build.yml

@@ -9,7 +9,7 @@ permissions:
   contents: read
 
 jobs:
-  build_atoms3:
+  build:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/[email protected]
@@ -61,4 +61,19 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: M5STACK_Fire_firmware
-        path: ./m5stack/build-M5STACK_Fire/uiflow-*.bin
+        path: ./m5stack/build-M5STACK_Fire/uiflow-*.bin
+    - name: Deliver Basic firmware
+      uses: actions/upload-artifact@v3
+      with:
+        name: M5STACK_Basic_firmware
+        path: ./m5stack/build-M5STACK_Basic/uiflow-*.bin
+    - name: Deliver Basic(4MB Flash) firmware
+      uses: actions/upload-artifact@v3
+      with:
+        name: M5STACK_Basic_4MB_Flash_firmware
+        path: ./m5stack/build-M5STACK_Basic_4MB/uiflow-*.bin
+    - name: Deliver Capsule firmware
+      uses: actions/upload-artifact@v3
+      with:
+        name: M5STACK_Capsule_firmware
+        path: ./m5stack/build-M5STACK_Capsule/uiflow-*.bin

README.md

@@ -10,22 +10,37 @@
 BOARD ?= M5STACK_8MB
 
 boards := \
-	M5STACK_AtomS3:atoms3 \
-	M5STACK_AtomS3_Lite:atoms3-lite \
-	M5STACK_StampS3:stamps3 \
-	M5STACK_CoreS3:cores3 \
-	M5STACK_AtomS3U:atoms3u \
-	M5STACK_Core2:core2 \
+	M5STACK_AtomS3:atoms3            \
+	M5STACK_AtomS3_Lite:atoms3-lite  \
+	M5STACK_StampS3:stamps3          \
+	M5STACK_CoreS3:cores3            \
+	M5STACK_AtomS3U:atoms3u          \
+	M5STACK_Core2:core2              \
 	M5STACK_StickC_PLUS2:stickcplus2 \
-	M5STACK_StickC_PLUS:stickcplus \
-	M5STACK_Fire:fire
+	M5STACK_StickC_PLUS:stickcplus   \
+	M5STACK_Fire:fire                \
+	M5STACK_Basic:basic              \
+	M5STACK_Basic_4MB:basic          \
+	M5STACK_Capsule:capsule
 
 define find_board
-$(if $(filter $(1):%,$(boards)),$(word 2,$(subst :, ,$(filter $(1):%,$(boards)))),$(error Mapping not found for $(1)))
+$(if $(filter $(1):%,$(boards)),$(word 2,$(subst :, ,$(filter $(1):%,$(boards)))),none)
 endef
 
 # Board type list
-BOARD_TYPE_DEF := none atoms3 atoms3-lite stamps3 cores3 atoms3u core2 stickcplus2 stickcplus fire
+BOARD_TYPE_DEF := \
+	none        \
+	atoms3      \
+	atoms3-lite \
+	stamps3     \
+	cores3      \
+	atoms3u     \
+	core2       \
+	stickcplus2 \
+	stickcplus  \
+	fire        \
+	basic       \
+	capsule
 
 # 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"
@@ -37,6 +52,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
@@ -145,7 +167,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/Makefile

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

m5stack/boards/M5STACK_AtomS3/manifest.py

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

m5stack/boards/M5STACK_AtomS3U/manifest.py

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

m5stack/boards/M5STACK_AtomS3_Lite/manifest.py

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

m5stack/boards/M5STACK_Basic/manifest.py

@@ -0,0 +1,15 @@
+set(SDKCONFIG_DEFAULTS
+    ./boards/sdkconfig.base
+    ./boards/sdkconfig.flash_16mb
+    ./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()

m5stack/boards/M5STACK_Basic/mpconfigboard.cmake

@@ -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/mpconfigboard.h

@@ -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