Skip to content

Commit 68c7182

Browse files
committed
Merge branch 'feature/dial' into develop
2 parents 1f080ae + 3a12ab2 commit 68c7182

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2001
-3
lines changed

m5stack/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ boards := \
2121
M5STACK_Fire:fire \
2222
M5STACK_Basic:basic \
2323
M5STACK_Basic_4MB:basic \
24-
M5STACK_Capsule:capsule
24+
M5STACK_Capsule:capsule \
25+
M5STACK_Dial:dial
2526

2627
define find_board
2728
$(if $(filter $(1):%,$(boards)),$(word 2,$(subst :, ,$(filter $(1):%,$(boards)))),none)
@@ -40,7 +41,8 @@ BOARD_TYPE_DEF := \
4041
stickcplus \
4142
fire \
4243
basic \
43-
capsule
44+
capsule \
45+
dial
4446

4547
# Select the board type to build, default is None
4648
# This value affects which folder in the "./fs/system/" directory is pack into "fs-system.bin"
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"deploy": [
3+
"../deploy_s3.md"
4+
],
5+
"docs": "",
6+
"features": [
7+
"BLE",
8+
"WiFi"
9+
],
10+
"images": [
11+
"generic_s3.jpg"
12+
],
13+
"mcu": "esp32s3",
14+
"product": "M5Dial",
15+
"thumbnail": "",
16+
"url": "https://docs.m5stack.com/en/core/M5Dial",
17+
"vendor": "M5Stack"
18+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include("$(MPY_DIR)/../m5stack/modules/startup/manifest_dial.py")
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
set(IDF_TARGET esp32s3)
2+
3+
set(SDKCONFIG_DEFAULTS
4+
./boards/M5STACK_S3_8MB/sdkconfig.board
5+
./boards/sdkconfig.base
6+
./boards/sdkconfig.240mhz
7+
./boards/sdkconfig.disable_iram
8+
./boards/sdkconfig.ble
9+
./boards/sdkconfig.usb
10+
./boards/sdkconfig.flash_8mb
11+
)
12+
13+
# If not enable LVGL, ignore this...
14+
set(LV_CFLAGS -DLV_COLOR_DEPTH=16 -DLV_COLOR_16_SWAP=0)
15+
16+
if(NOT MICROPY_FROZEN_MANIFEST)
17+
set(MICROPY_FROZEN_MANIFEST ${CMAKE_SOURCE_DIR}/boards/manifest.py)
18+
endif()
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#define MICROPY_HW_BOARD_NAME "M5STACK"
2+
#define MICROPY_HW_MCU_NAME "M5DIAL"
3+
4+
#define MICROPY_PY_MACHINE_DAC (0)
5+
6+
// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
7+
#define MICROPY_HW_ENABLE_UART_REPL (1)
8+
9+
#define MICROPY_HW_I2C0_SCL (9)
10+
#define MICROPY_HW_I2C0_SDA (8)
11+
12+
// If not enable LVGL, ignore this...
13+
#include "./../mpconfiglvgl.h"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
CONFIG_FLASHMODE_DIO=y # QIO mode has some problem when mount fs
2+
CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
3+
CONFIG_ESPTOOLPY_FLASHMODE="dio"
4+
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
5+
CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
6+
CONFIG_ESPTOOLPY_AFTER_NORESET=y
7+
8+
CONFIG_SPIRAM_MEMTEST=
9+
CONFIG_FREERTOS_UNICORE=y
9.25 KB
11.5 KB
644 Bytes
620 Bytes

0 commit comments

Comments
 (0)