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

Author: pandiannano

.github/workflows/nightly-build.yml

@@ -76,4 +76,9 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: M5STACK_Capsule_firmware
-        path: ./m5stack/build-M5STACK_Capsule/uiflow-*.bin
+        path: ./m5stack/build-M5STACK_Capsule/uiflow-*.bin
+    - name: Deliver Dial firmware
+      uses: actions/upload-artifact@v3
+      with:
+        name: M5STACK_Dial_firmware
+        path: ./m5stack/build-M5STACK_Dial/uiflow-*.bin

m5stack/Makefile

@@ -21,7 +21,8 @@ boards := \
 	M5STACK_Fire:fire                \
 	M5STACK_Basic:basic              \
 	M5STACK_Basic_4MB:basic          \
-	M5STACK_Capsule:capsule
+	M5STACK_Capsule:capsule          \
+	M5STACK_Dial:dial
 
 define find_board
 $(if $(filter $(1):%,$(boards)),$(word 2,$(subst :, ,$(filter $(1):%,$(boards)))),none)
@@ -40,7 +41,8 @@ BOARD_TYPE_DEF := \
 	stickcplus  \
 	fire        \
 	basic       \
-	capsule
+	capsule     \
+	dial
 
 # 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"

m5stack/boards/M5STACK_Dial/board.json

@@ -0,0 +1,18 @@
+{
+    "deploy": [
+        "../deploy_s3.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "WiFi"
+    ],
+    "images": [
+        "generic_s3.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "M5Dial",
+    "thumbnail": "",
+    "url": "https://docs.m5stack.com/en/core/M5Dial",
+    "vendor": "M5Stack"
+}

m5stack/boards/M5STACK_Dial/manifest.py

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

m5stack/boards/M5STACK_Dial/mpconfigboard.cmake

@@ -0,0 +1,18 @@
+set(IDF_TARGET esp32s3)
+
+set(SDKCONFIG_DEFAULTS
+    ./boards/M5STACK_S3_8MB/sdkconfig.board
+    ./boards/sdkconfig.base
+    ./boards/sdkconfig.240mhz
+    ./boards/sdkconfig.disable_iram
+    ./boards/sdkconfig.ble
+    ./boards/sdkconfig.usb
+    ./boards/sdkconfig.flash_8mb
+)
+
+# 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_Dial/mpconfigboard.h

@@ -0,0 +1,13 @@
+#define MICROPY_HW_BOARD_NAME               "M5STACK"
+#define MICROPY_HW_MCU_NAME                 "M5DIAL"
+
+#define MICROPY_PY_MACHINE_DAC              (0)
+
+// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
+#define MICROPY_HW_ENABLE_UART_REPL         (1)
+
+#define MICROPY_HW_I2C0_SCL                 (9)
+#define MICROPY_HW_I2C0_SDA                 (8)
+
+// If not enable LVGL, ignore this...
+#include "./../mpconfiglvgl.h"

m5stack/boards/M5STACK_Dial/sdkconfig.board

@@ -0,0 +1,9 @@
+CONFIG_FLASHMODE_DIO=y  # QIO mode has some problem when mount fs
+CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
+CONFIG_ESPTOOLPY_FLASHMODE="dio"
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_SPIRAM_MEMTEST=
+CONFIG_FREERTOS_UNICORE=y