From a45015649adb8ebe83e0f91f6de3d53f21a10e10 Mon Sep 17 00:00:00 2001 From: Seon Rozenblum Date: Mon, 10 Mar 2025 16:17:39 +1100 Subject: [PATCH 1/2] Added missing UM boards and fixed TinyS3 product URL. Signed-off-by: Seon Rozenblum --- boards/um_bling.json | 51 ++++++++++++++++++++++++++++++++++++ boards/um_feathers3_neo.json | 51 ++++++++++++++++++++++++++++++++++++ boards/um_omgs3.json | 51 ++++++++++++++++++++++++++++++++++++ boards/um_tinyc6.json | 39 +++++++++++++++++++++++++++ boards/um_tinys3.json | 2 +- 5 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 boards/um_bling.json create mode 100644 boards/um_feathers3_neo.json create mode 100644 boards/um_omgs3.json create mode 100644 boards/um_tinyc6.json diff --git a/boards/um_bling.json b/boards/um_bling.json new file mode 100644 index 000000000..5233d827e --- /dev/null +++ b/boards/um_bling.json @@ -0,0 +1,51 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld", + "partitions": "default_8MB.csv", + "memory_type": "qio_qspi" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_BLING", + "-DBOARD_HAS_PSRAM", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0X303A", + "0x817F" + ] + ], + "mcu": "esp32s3", + "variant": "um_bling" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Unexpected Maker BLING!", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://unexpectedmaker.com/shop/bling", + "vendor": "Unexpected Maker" +} diff --git a/boards/um_feathers3_neo.json b/boards/um_feathers3_neo.json new file mode 100644 index 000000000..0b5133d35 --- /dev/null +++ b/boards/um_feathers3_neo.json @@ -0,0 +1,51 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld", + "partitions": "default_8MB.csv", + "memory_type": "qio_qspi" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_FEATHERS3NEO", + "-DBOARD_HAS_PSRAM", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0X303A", + "0x81FB" + ] + ], + "mcu": "esp32s3", + "variant": "um_feathers3neo" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Unexpected Maker FeatherS3 Neo", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://unexpectedmaker.com/shop/feathers3neo", + "vendor": "Unexpected Maker" +} diff --git a/boards/um_omgs3.json b/boards/um_omgs3.json new file mode 100644 index 000000000..90e0e8e20 --- /dev/null +++ b/boards/um_omgs3.json @@ -0,0 +1,51 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld", + "partitions": "default_8MB.csv", + "memory_type": "qio_qspi" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_OMGS3", + "-DBOARD_HAS_PSRAM", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0X303A", + "0x8224" + ] + ], + "mcu": "esp32s3", + "variant": "um_omgs3" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Unexpected Maker OMGS3", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://unexpectedmaker.com/shop/omgs3", + "vendor": "Unexpected Maker" +} diff --git a/boards/um_tinyc6.json b/boards/um_tinyc6.json new file mode 100644 index 000000000..914a8801e --- /dev/null +++ b/boards/um_tinyc6.json @@ -0,0 +1,39 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld", + "partitions": "default_8MB.csv", + "memory_type": "qio_qspi" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_TINYC6" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32c6", + "variant": "um_tinyc6" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32c6.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Unexpected Maker TinyC6", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://unexpectedmaker.com/shop/tinyc6", + "vendor": "Unexpected Maker" +} diff --git a/boards/um_tinys3.json b/boards/um_tinys3.json index ed7b2a028..f26688ebc 100644 --- a/boards/um_tinys3.json +++ b/boards/um_tinys3.json @@ -46,6 +46,6 @@ "require_upload_port": true, "speed": 460800 }, - "url": "https://unexpectedmaker.com/shop/ttinys3-esp32s3", + "url": "https://unexpectedmaker.com/shop/tinys3", "vendor": "Unexpected Maker" } From 7a4efa5f9f9e53b080f82536674c67be8c668839 Mon Sep 17 00:00:00 2001 From: Seon Rozenblum Date: Mon, 10 Mar 2025 20:54:55 +1100 Subject: [PATCH 2/2] More modifications for UM boards. Signed-off-by: Seon Rozenblum --- boards/um_bling.json | 2 +- boards/um_feathers3.json | 2 +- boards/um_feathers3_neo.json | 2 +- boards/um_nanos3.json | 2 +- boards/um_omgs3.json | 2 +- boards/um_pros3.json | 2 +- boards/um_tinyc6.json | 1 - boards/um_tinys2.json | 3 ++- boards/um_tinys3.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/boards/um_bling.json b/boards/um_bling.json index 5233d827e..aeeabadfe 100644 --- a/boards/um_bling.json +++ b/boards/um_bling.json @@ -1,7 +1,6 @@ { "build": { "arduino":{ - "ldscript": "esp32s3_out.ld", "partitions": "default_8MB.csv", "memory_type": "qio_qspi" }, @@ -10,6 +9,7 @@ "-DARDUINO_BLING", "-DBOARD_HAS_PSRAM", "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_USB_MODE=1", "-DARDUINO_RUNNING_CORE=1", "-DARDUINO_EVENT_RUNNING_CORE=1" ], diff --git a/boards/um_feathers3.json b/boards/um_feathers3.json index 1a851fab5..9c39ea916 100644 --- a/boards/um_feathers3.json +++ b/boards/um_feathers3.json @@ -1,7 +1,6 @@ { "build": { "arduino":{ - "ldscript": "esp32s3_out.ld", "partitions": "default_16MB.csv", "memory_type": "qio_qspi" }, @@ -10,6 +9,7 @@ "-DARDUINO_FEATHERS3", "-DBOARD_HAS_PSRAM", "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_USB_MODE=1", "-DARDUINO_RUNNING_CORE=1", "-DARDUINO_EVENT_RUNNING_CORE=1" ], diff --git a/boards/um_feathers3_neo.json b/boards/um_feathers3_neo.json index 0b5133d35..0849ee390 100644 --- a/boards/um_feathers3_neo.json +++ b/boards/um_feathers3_neo.json @@ -1,7 +1,6 @@ { "build": { "arduino":{ - "ldscript": "esp32s3_out.ld", "partitions": "default_8MB.csv", "memory_type": "qio_qspi" }, @@ -10,6 +9,7 @@ "-DARDUINO_FEATHERS3NEO", "-DBOARD_HAS_PSRAM", "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_USB_MODE=1", "-DARDUINO_RUNNING_CORE=1", "-DARDUINO_EVENT_RUNNING_CORE=1" ], diff --git a/boards/um_nanos3.json b/boards/um_nanos3.json index 921a36e3f..742c0ac7d 100644 --- a/boards/um_nanos3.json +++ b/boards/um_nanos3.json @@ -1,7 +1,6 @@ { "build": { "arduino": { - "ldscript": "esp32s3_out.ld", "partitions": "default_8MB.csv", "memory_type": "qio_qspi" }, @@ -10,6 +9,7 @@ "-DBOARD_HAS_PSRAM", "-DARDUINO_NANOS3", "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_USB_MODE=1", "-DARDUINO_RUNNING_CORE=1", "-DARDUINO_EVENT_RUNNING_CORE=1" ], diff --git a/boards/um_omgs3.json b/boards/um_omgs3.json index 90e0e8e20..55994d4a1 100644 --- a/boards/um_omgs3.json +++ b/boards/um_omgs3.json @@ -1,7 +1,6 @@ { "build": { "arduino":{ - "ldscript": "esp32s3_out.ld", "partitions": "default_8MB.csv", "memory_type": "qio_qspi" }, @@ -10,6 +9,7 @@ "-DARDUINO_OMGS3", "-DBOARD_HAS_PSRAM", "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_USB_MODE=1", "-DARDUINO_RUNNING_CORE=1", "-DARDUINO_EVENT_RUNNING_CORE=1" ], diff --git a/boards/um_pros3.json b/boards/um_pros3.json index 8edcefac3..484c0247b 100644 --- a/boards/um_pros3.json +++ b/boards/um_pros3.json @@ -1,7 +1,6 @@ { "build": { "arduino": { - "ldscript": "esp32s3_out.ld", "partitions": "default_16MB.csv", "memory_type": "qio_qspi" }, @@ -10,6 +9,7 @@ "-DARDUINO_PROS3", "-DBOARD_HAS_PSRAM", "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_USB_MODE=1", "-DARDUINO_RUNNING_CORE=1", "-DARDUINO_EVENT_RUNNING_CORE=1" ], diff --git a/boards/um_tinyc6.json b/boards/um_tinyc6.json index 914a8801e..f34eee9cd 100644 --- a/boards/um_tinyc6.json +++ b/boards/um_tinyc6.json @@ -1,7 +1,6 @@ { "build": { "arduino":{ - "ldscript": "esp32s3_out.ld", "partitions": "default_8MB.csv", "memory_type": "qio_qspi" }, diff --git a/boards/um_tinys2.json b/boards/um_tinys2.json index 8a57216ac..7ca5ca4b4 100644 --- a/boards/um_tinys2.json +++ b/boards/um_tinys2.json @@ -1,7 +1,8 @@ { "build": { "arduino": { - "ldscript": "esp32s2_out.ld" + "partitions": "default_4MB.csv", + "memory_type": "qio_qspi" }, "core": "esp32", "extra_flags": [ diff --git a/boards/um_tinys3.json b/boards/um_tinys3.json index f26688ebc..cac1514fe 100644 --- a/boards/um_tinys3.json +++ b/boards/um_tinys3.json @@ -1,7 +1,6 @@ { "build": { "arduino":{ - "ldscript": "esp32s3_out.ld", "partitions": "default_8MB.csv", "memory_type": "qio_qspi" }, @@ -10,6 +9,7 @@ "-DARDUINO_TINYS3", "-DBOARD_HAS_PSRAM", "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_USB_MODE=1", "-DARDUINO_RUNNING_CORE=1", "-DARDUINO_EVENT_RUNNING_CORE=1" ],