From 4af2332a1529670b33b2541e8b794772479cd418 Mon Sep 17 00:00:00 2001 From: valeros Date: Tue, 5 Sep 2023 12:33:22 +0300 Subject: [PATCH 01/22] Add a warning if an IDF component doesn't register any source files Issue #1180 --- builder/frameworks/espidf.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 41739557b..e35e92a57 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -618,7 +618,11 @@ def _fix_component_relative_include(config, build_flags, source_index): def prepare_build_envs(config, default_env, debug_allowed=True): build_envs = [] - target_compile_groups = config.get("compileGroups") + target_compile_groups = config.get("compileGroups", []) + if not target_compile_groups: + print("Warning! The `%s` component doesn't register any source files. " + "Check if sources are set in component's CMakeLists.txt!" % config["name"] + ) is_build_type_debug = "debug" in env.GetBuildType() and debug_allowed for cg in target_compile_groups: From a9b9d094688a4ffeeca1da28d3e77e74df6d4430 Mon Sep 17 00:00:00 2001 From: valeros Date: Wed, 6 Sep 2023 12:38:25 +0300 Subject: [PATCH 02/22] Add default debug option for ESP32-S2-Kaluga-1 Kit Resolves #1185, resolves #1130 Resolves platformio/platformio-docs#318 --- platform.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platform.py b/platform.py index dfdb7c785..834384a7b 100644 --- a/platform.py +++ b/platform.py @@ -199,6 +199,10 @@ def _add_dynamic_options(self, board): "tumpa", ] + # A special case for the Kaluga board that has a separate interface config + if board.id == "esp32-s2-kaluga-1": + supported_debug_tools.append("ftdi") + if board.get("build.mcu", "") in ("esp32c3", "esp32c6", "esp32s3"): supported_debug_tools.append("esp-builtin") From d5559ab463dfd7b4afb66335a682a2c675d0a917 Mon Sep 17 00:00:00 2001 From: Manoel Brunnen Date: Thu, 21 Sep 2023 13:46:09 +0200 Subject: [PATCH 03/22] Add ESP32-S3-DevKitM-1 board (#1191) --- boards/esp32-s3-devkitm-1.json | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 boards/esp32-s3-devkitm-1.json diff --git a/boards/esp32-s3-devkitm-1.json b/boards/esp32-s3-devkitm-1.json new file mode 100644 index 000000000..a7a1d5e88 --- /dev/null +++ b/boards/esp32-s3-devkitm-1.json @@ -0,0 +1,50 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld", + "partitions": "default_8MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ESP32S3_DEV", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "esp32s3" + }, + "connectivity": [ + "wifi" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Espressif ESP32-S3-DevKitM-1", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/user-guide-devkitm-1.html", + "vendor": "Espressif" +} From 63b3549ed6271b774e42f8287d826523b3993d6f Mon Sep 17 00:00:00 2001 From: Fio Date: Thu, 21 Sep 2023 16:04:14 +0200 Subject: [PATCH 04/22] Add missing Bluetooth connectivity for lolin_s3 (#1198) --- boards/lolin_s3.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boards/lolin_s3.json b/boards/lolin_s3.json index 30f360e0c..9daea1796 100644 --- a/boards/lolin_s3.json +++ b/boards/lolin_s3.json @@ -25,7 +25,8 @@ "variant": "lolin_s3" }, "connectivity": [ - "wifi" + "wifi", + "bluetooth" ], "debug": { "openocd_target": "esp32s3.cfg" From f6ec3926f9f660ee9abada8540ffe1e205da4bbf Mon Sep 17 00:00:00 2001 From: valeros Date: Thu, 21 Sep 2023 17:06:16 +0300 Subject: [PATCH 05/22] Add missing Bluetooth connectivity for all S3-based boards --- boards/adafruit_feather_esp32s3.json | 1 + boards/adafruit_feather_esp32s3_nopsram.json | 1 + boards/adafruit_feather_esp32s3_reversetft.json | 1 + boards/adafruit_feather_esp32s3_tft.json | 1 + boards/adafruit_matrixportal_esp32s3.json | 1 + boards/adafruit_qtpy_esp32s3_nopsram.json | 1 + boards/arduino_nano_esp32.json | 1 + boards/bee_motion_s3.json | 1 + boards/bee_s3.json | 1 + boards/bpi_leaf_s3.json | 1 + boards/cytron_maker_feather_aiot_s3.json | 1 + boards/dfrobot_firebeetle2_esp32s3.json | 1 + boards/dfrobot_romeo_esp32s3.json | 1 + boards/edgebox-esp-100.json | 1 + boards/esp32-s3-devkitc-1.json | 1 + boards/lilygo-t-display-s3.json | 1 + boards/lolin_s3_mini.json | 1 + boards/m5stack-atoms3.json | 1 + boards/m5stack-cores3.json | 1 + boards/m5stack-stamps3.json | 1 + boards/nebulas3.json | 1 + boards/redpill_esp32s3.json | 1 + boards/seeed_xiao_esp32s3.json | 1 + boards/tamc_termod_s3.json | 1 + boards/um_feathers3.json | 1 + boards/um_pros3.json | 1 + boards/um_tinys3.json | 1 + boards/unphone8.json | 1 + boards/unphone9.json | 1 + boards/wifiduino32s3.json | 1 + 30 files changed, 30 insertions(+) diff --git a/boards/adafruit_feather_esp32s3.json b/boards/adafruit_feather_esp32s3.json index 5796b0559..f668544b9 100644 --- a/boards/adafruit_feather_esp32s3.json +++ b/boards/adafruit_feather_esp32s3.json @@ -33,6 +33,7 @@ "variant": "adafruit_feather_esp32s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/adafruit_feather_esp32s3_nopsram.json b/boards/adafruit_feather_esp32s3_nopsram.json index 79ee24d1d..b38d0f808 100644 --- a/boards/adafruit_feather_esp32s3_nopsram.json +++ b/boards/adafruit_feather_esp32s3_nopsram.json @@ -33,6 +33,7 @@ "variant": "adafruit_feather_esp32s3_nopsram" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/adafruit_feather_esp32s3_reversetft.json b/boards/adafruit_feather_esp32s3_reversetft.json index fc3b8bc36..de9a8e53f 100644 --- a/boards/adafruit_feather_esp32s3_reversetft.json +++ b/boards/adafruit_feather_esp32s3_reversetft.json @@ -33,6 +33,7 @@ "variant": "adafruit_feather_esp32s3_reversetft" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/adafruit_feather_esp32s3_tft.json b/boards/adafruit_feather_esp32s3_tft.json index dbf7612bd..0b1d9433f 100644 --- a/boards/adafruit_feather_esp32s3_tft.json +++ b/boards/adafruit_feather_esp32s3_tft.json @@ -32,6 +32,7 @@ "variant": "adafruit_feather_esp32s3_tft" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/adafruit_matrixportal_esp32s3.json b/boards/adafruit_matrixportal_esp32s3.json index 3446cd217..df10505ad 100644 --- a/boards/adafruit_matrixportal_esp32s3.json +++ b/boards/adafruit_matrixportal_esp32s3.json @@ -33,6 +33,7 @@ "variant": "adafruit_matrixportal_esp32s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/adafruit_qtpy_esp32s3_nopsram.json b/boards/adafruit_qtpy_esp32s3_nopsram.json index 15589da92..989ca7837 100644 --- a/boards/adafruit_qtpy_esp32s3_nopsram.json +++ b/boards/adafruit_qtpy_esp32s3_nopsram.json @@ -32,6 +32,7 @@ "variant": "adafruit_qtpy_esp32s3_nopsram" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/arduino_nano_esp32.json b/boards/arduino_nano_esp32.json index c6da4e227..e1bf757d5 100644 --- a/boards/arduino_nano_esp32.json +++ b/boards/arduino_nano_esp32.json @@ -30,6 +30,7 @@ "variant": "arduino_nano_nora" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/bee_motion_s3.json b/boards/bee_motion_s3.json index c1cae0fd0..505986103 100644 --- a/boards/bee_motion_s3.json +++ b/boards/bee_motion_s3.json @@ -23,6 +23,7 @@ "variant": "Bee_Motion_S3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/bee_s3.json b/boards/bee_s3.json index 16e47ee79..98e966369 100644 --- a/boards/bee_s3.json +++ b/boards/bee_s3.json @@ -23,6 +23,7 @@ "variant": "Bee_S3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/bpi_leaf_s3.json b/boards/bpi_leaf_s3.json index c1d8a154c..62cc90ee9 100644 --- a/boards/bpi_leaf_s3.json +++ b/boards/bpi_leaf_s3.json @@ -24,6 +24,7 @@ "variant": "bpi_leaf_s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/cytron_maker_feather_aiot_s3.json b/boards/cytron_maker_feather_aiot_s3.json index 4b7a2704c..839a54be3 100644 --- a/boards/cytron_maker_feather_aiot_s3.json +++ b/boards/cytron_maker_feather_aiot_s3.json @@ -26,6 +26,7 @@ "variant": "cytron_maker_feather_aiot_s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/dfrobot_firebeetle2_esp32s3.json b/boards/dfrobot_firebeetle2_esp32s3.json index 0f87150d6..c1997db4e 100644 --- a/boards/dfrobot_firebeetle2_esp32s3.json +++ b/boards/dfrobot_firebeetle2_esp32s3.json @@ -27,6 +27,7 @@ "variant": "dfrobot_firebeetle2_esp32s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/dfrobot_romeo_esp32s3.json b/boards/dfrobot_romeo_esp32s3.json index 63a7cb472..55e69db5c 100644 --- a/boards/dfrobot_romeo_esp32s3.json +++ b/boards/dfrobot_romeo_esp32s3.json @@ -25,6 +25,7 @@ "variant": "dfrobot_romeo_esp32s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/edgebox-esp-100.json b/boards/edgebox-esp-100.json index 22aee2f8b..d00074d0c 100644 --- a/boards/edgebox-esp-100.json +++ b/boards/edgebox-esp-100.json @@ -18,6 +18,7 @@ "variant": "Edgebox-ESP-100" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/esp32-s3-devkitc-1.json b/boards/esp32-s3-devkitc-1.json index a2f8b22f5..b9c184c4b 100644 --- a/boards/esp32-s3-devkitc-1.json +++ b/boards/esp32-s3-devkitc-1.json @@ -24,6 +24,7 @@ "variant": "esp32s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/lilygo-t-display-s3.json b/boards/lilygo-t-display-s3.json index 7230d3bd2..f7647271c 100644 --- a/boards/lilygo-t-display-s3.json +++ b/boards/lilygo-t-display-s3.json @@ -26,6 +26,7 @@ "variant": "lilygo_t_display_s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/lolin_s3_mini.json b/boards/lolin_s3_mini.json index ad3794bcb..7f55f0bde 100644 --- a/boards/lolin_s3_mini.json +++ b/boards/lolin_s3_mini.json @@ -23,6 +23,7 @@ "variant": "lolin_s3_mini" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/m5stack-atoms3.json b/boards/m5stack-atoms3.json index f5e87d3ab..c80ded069 100644 --- a/boards/m5stack-atoms3.json +++ b/boards/m5stack-atoms3.json @@ -24,6 +24,7 @@ "variant": "m5stack_atoms3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/m5stack-cores3.json b/boards/m5stack-cores3.json index 72571e0b7..069097dcf 100644 --- a/boards/m5stack-cores3.json +++ b/boards/m5stack-cores3.json @@ -24,6 +24,7 @@ "variant": "m5stack_cores3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/m5stack-stamps3.json b/boards/m5stack-stamps3.json index 6c92e3b5d..31c7f25cd 100644 --- a/boards/m5stack-stamps3.json +++ b/boards/m5stack-stamps3.json @@ -24,6 +24,7 @@ "variant": "m5stack_stamp_s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/nebulas3.json b/boards/nebulas3.json index dc6236494..5dd922bea 100644 --- a/boards/nebulas3.json +++ b/boards/nebulas3.json @@ -25,6 +25,7 @@ "variant": "Nebula_S3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/redpill_esp32s3.json b/boards/redpill_esp32s3.json index 8dff2ff49..c9991e7f2 100644 --- a/boards/redpill_esp32s3.json +++ b/boards/redpill_esp32s3.json @@ -25,6 +25,7 @@ "variant": "redpill_esp32s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/seeed_xiao_esp32s3.json b/boards/seeed_xiao_esp32s3.json index cf98a6aa4..5c7171c88 100644 --- a/boards/seeed_xiao_esp32s3.json +++ b/boards/seeed_xiao_esp32s3.json @@ -31,6 +31,7 @@ "variant": "XIAO_ESP32S3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/tamc_termod_s3.json b/boards/tamc_termod_s3.json index 934c15fb1..0ddc5277e 100644 --- a/boards/tamc_termod_s3.json +++ b/boards/tamc_termod_s3.json @@ -26,6 +26,7 @@ "variant": "tamc_termod_s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/um_feathers3.json b/boards/um_feathers3.json index 4430f59b0..1a851fab5 100644 --- a/boards/um_feathers3.json +++ b/boards/um_feathers3.json @@ -26,6 +26,7 @@ "variant": "um_feathers3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/um_pros3.json b/boards/um_pros3.json index b0b379834..8edcefac3 100644 --- a/boards/um_pros3.json +++ b/boards/um_pros3.json @@ -26,6 +26,7 @@ "variant": "um_pros3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/um_tinys3.json b/boards/um_tinys3.json index 6a9e3c14c..ed7b2a028 100644 --- a/boards/um_tinys3.json +++ b/boards/um_tinys3.json @@ -26,6 +26,7 @@ "variant": "um_tinys3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/unphone8.json b/boards/unphone8.json index 3ee0955d9..8dd371a07 100644 --- a/boards/unphone8.json +++ b/boards/unphone8.json @@ -20,6 +20,7 @@ "variant": "unphone8" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/unphone9.json b/boards/unphone9.json index e269a9662..1b4e8eed4 100644 --- a/boards/unphone9.json +++ b/boards/unphone9.json @@ -26,6 +26,7 @@ "variant": "unphone9" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { diff --git a/boards/wifiduino32s3.json b/boards/wifiduino32s3.json index fa8989469..6bef2bd51 100644 --- a/boards/wifiduino32s3.json +++ b/boards/wifiduino32s3.json @@ -23,6 +23,7 @@ "variant": "wifiduino32s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { From ff6ec884d6576f5717c1687f7351f8046a24c406 Mon Sep 17 00:00:00 2001 From: valeros Date: Mon, 13 Nov 2023 13:58:24 +0200 Subject: [PATCH 06/22] Properly handle precompiled static archives located outside IDF project root Resolves #1230 --- builder/frameworks/espidf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index e35e92a57..9fff3a8fc 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -63,7 +63,7 @@ IDF_ENV_VERSION = "1.0.0" FRAMEWORK_DIR = platform.get_package_dir("framework-espidf") TOOLCHAIN_DIR = platform.get_package_dir( - "toolchain-%s" % ("riscv32-esp" if mcu in ("esp32c3","esp32c6") else ("xtensa-%s" % mcu)) + "toolchain-%s" % ("riscv32-esp" if mcu in ("esp32c3", "esp32c6") else ("xtensa-%s" % mcu)) ) @@ -373,8 +373,8 @@ def _add_archive(archive_path, link_args): elif fragment.endswith(".a"): archive_path = fragment # process static archives - if archive_path.startswith(FRAMEWORK_DIR): - # In case of precompiled archives from framework package + if os.path.isabs(archive_path): + # In case of precompiled archives _add_archive(archive_path, link_args) else: # In case of archives within project From d83933996fbe7a371c4764ce0e6c43ff291892d4 Mon Sep 17 00:00:00 2001 From: valeros Date: Tue, 5 Dec 2023 13:40:50 +0200 Subject: [PATCH 07/22] Update Arduino core to v2.0.14 Resolves #1184 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 5bf959b7b..b992f6684 100644 --- a/platform.json +++ b/platform.json @@ -79,7 +79,7 @@ "type": "framework", "optional": true, "owner": "platformio", - "version": "~3.20011.0" + "version": "~3.20014.0" }, "framework-arduino-mbcwb": { "type": "framework", From 3cf0b92d84b483d0af82f653be7c6c3a88e76f54 Mon Sep 17 00:00:00 2001 From: valeros Date: Tue, 5 Dec 2023 13:41:23 +0200 Subject: [PATCH 08/22] Update IDF package to v4.4.6 for mixed IDF/Arduino projects --- platform.json | 2 +- platform.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform.json b/platform.json index b992f6684..f38a7e6a0 100644 --- a/platform.json +++ b/platform.json @@ -92,7 +92,7 @@ "optional": true, "owner": "platformio", "version": "~3.50101.0", - "optionalVersions": ["~3.40405.0"] + "optionalVersions": ["~3.40406.0"] }, "tool-esptoolpy": { "type": "uploader", diff --git a/platform.py b/platform.py index 834384a7b..17cf2ec1d 100644 --- a/platform.py +++ b/platform.py @@ -113,7 +113,7 @@ def configure_default_packages(self, variables, targets): if "arduino" in frameworks: # Downgrade the IDF version for mixed Arduino+IDF projects - self.packages["framework-espidf"]["version"] = "~3.40405.0" + self.packages["framework-espidf"]["version"] = "~3.40406.0" else: # Use the latest toolchains available for IDF v5.0 for target in ( From 13a4062e2217f6b80924f685b56bfc514d03d77f Mon Sep 17 00:00:00 2001 From: valeros Date: Tue, 5 Dec 2023 14:54:52 +0200 Subject: [PATCH 09/22] Add new boards Resolves #1231, resolves #209 --- boards/4d_systems_esp32s3_gen4_r8n16.json | 50 +++++++++++++++++ boards/adafruit_camera_esp32s3.json | 66 ++++++++++++++++++++++ boards/adafruit_metro_esp32s3.json | 67 +++++++++++++++++++++++ boards/adafruit_qualia_s3_rgb666.json | 67 +++++++++++++++++++++++ boards/atd147_s3.json | 48 ++++++++++++++++ boards/aventen_s3_sync.json | 50 +++++++++++++++++ boards/ioxesp32.json | 37 +++++++++++++ boards/ioxesp32ps.json | 42 ++++++++++++++ boards/lilygo-t-display.json | 44 +++++++++++++++ boards/m5stack-cores3.json | 2 + boards/um_nanos3.json | 51 +++++++++++++++++ 11 files changed, 524 insertions(+) create mode 100644 boards/4d_systems_esp32s3_gen4_r8n16.json create mode 100644 boards/adafruit_camera_esp32s3.json create mode 100644 boards/adafruit_metro_esp32s3.json create mode 100644 boards/adafruit_qualia_s3_rgb666.json create mode 100644 boards/atd147_s3.json create mode 100644 boards/aventen_s3_sync.json create mode 100644 boards/ioxesp32.json create mode 100644 boards/ioxesp32ps.json create mode 100644 boards/lilygo-t-display.json create mode 100644 boards/um_nanos3.json diff --git a/boards/4d_systems_esp32s3_gen4_r8n16.json b/boards/4d_systems_esp32s3_gen4_r8n16.json new file mode 100644 index 000000000..4418be557 --- /dev/null +++ b/boards/4d_systems_esp32s3_gen4_r8n16.json @@ -0,0 +1,50 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_opi", + "partitions": "default_16MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ESP32_S3R8N16", + "-DBOARD_HAS_PSRAM", + "-DARDUINO_USB_MODE=1", + "-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", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "esp32_s3r8n16" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "4D Systems GEN4-ESP32 16MB (ESP32S3-R8N16)", + "upload": { + "flash_size": "16MB", + "maximum_ram_size": 327680, + "maximum_size": 16777216, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://4dsystems.com.au/products", + "vendor": "4D Systems" +} diff --git a/boards/adafruit_camera_esp32s3.json b/boards/adafruit_camera_esp32s3.json new file mode 100644 index 000000000..2693d8649 --- /dev/null +++ b/boards/adafruit_camera_esp32s3.json @@ -0,0 +1,66 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld", + "partitions": "partitions-4MB-1ota.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ADAFRUIT_CAMERA_ESP32S3", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1", + "-DBOARD_HAS_PSRAM" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x239A", + "0x0117" + ], + [ + "0x239A", + "0x8117" + ], + [ + "0x239A", + "0x8118" + ] + ], + "mcu": "esp32s3", + "variant": "adafruit_camera_esp32s3" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Adafruit pyCamera S3", + "upload": { + "arduino": { + "flash_extra_images": [ + [ + "0x2d0000", + "variants/adafruit_camera_esp32s3/tinyuf2.bin" + ] + ] + }, + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.adafruit.com/", + "vendor": "Adafruit" +} diff --git a/boards/adafruit_metro_esp32s3.json b/boards/adafruit_metro_esp32s3.json new file mode 100644 index 000000000..7b5b77d2f --- /dev/null +++ b/boards/adafruit_metro_esp32s3.json @@ -0,0 +1,67 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_opi", + "partitions": "partitions-16MB-tinyuf2.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_METRO_ESP32S3", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1", + "-DBOARD_HAS_PSRAM" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x239A", + "0x8145" + ], + [ + "0x239A", + "0x0145" + ], + [ + "0x239A", + "0x8146" + ] + ], + "mcu": "esp32s3", + "variant": "adafruit_metro_esp32s3" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Adafruit Metro ESP32-S3", + "upload": { + "arduino": { + "flash_extra_images": [ + [ + "0x410000", + "variants/adafruit_metro_esp32s3/tinyuf2.bin" + ] + ] + }, + "flash_size": "16MB", + "maximum_ram_size": 327680, + "maximum_size": 16777216, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.adafruit.com/product/5500", + "vendor": "Adafruit" +} diff --git a/boards/adafruit_qualia_s3_rgb666.json b/boards/adafruit_qualia_s3_rgb666.json new file mode 100644 index 000000000..e1607a913 --- /dev/null +++ b/boards/adafruit_qualia_s3_rgb666.json @@ -0,0 +1,67 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_opi", + "partitions": "partitions-16MB-tinyuf2.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_QUALIA_S3_RGB666", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1", + "-DBOARD_HAS_PSRAM" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x239A", + "0x8147" + ], + [ + "0x239A", + "0x0147" + ], + [ + "0x239A", + "0x8148" + ] + ], + "mcu": "esp32s3", + "variant": "adafruit_qualia_s3_rgb666" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Adafruit Qualia ESP32-S3 RGB666", + "upload": { + "arduino": { + "flash_extra_images": [ + [ + "0x410000", + "variants/adafruit_qualia_s3_rgb666/tinyuf2.bin" + ] + ] + }, + "flash_size": "16MB", + "maximum_ram_size": 327680, + "maximum_size": 16777216, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.adafruit.com/product/5800", + "vendor": "Adafruit" +} diff --git a/boards/atd147_s3.json b/boards/atd147_s3.json new file mode 100644 index 000000000..8fb9d0e00 --- /dev/null +++ b/boards/atd147_s3.json @@ -0,0 +1,48 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_opi", + "partitions": "default_8MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ATD143_S3", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "atd147_s3" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "ArtronShop ATD1.47-S3", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://github.com/ArtronShop", + "vendor": "ArtronShop" +} diff --git a/boards/aventen_s3_sync.json b/boards/aventen_s3_sync.json new file mode 100644 index 000000000..83cda02d4 --- /dev/null +++ b/boards/aventen_s3_sync.json @@ -0,0 +1,50 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_qspi" + }, + "core": "esp32", + "extra_flags": [ + "-DBOARD_HAS_PSRAM", + "-DARDUINO_AVENTEN_S3_SYNC", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "Aventen_S3_Sync" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Aventen S3 Sync", + "upload": { + "flash_size": "16MB", + "maximum_ram_size": 327680, + "maximum_size": 16777216, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.linkedin.com/company/aventen/", + "vendor": "Aventen" +} diff --git a/boards/ioxesp32.json b/boards/ioxesp32.json new file mode 100644 index 000000000..e1575422e --- /dev/null +++ b/boards/ioxesp32.json @@ -0,0 +1,37 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32_out.ld" + }, + "core": "esp32", + "extra_flags": "-DARDUINO_IOXESP32", + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32", + "variant": "ioxesp32" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "debug": { + "openocd_board": "esp-wroom-32.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "ArtronShop IOXESP32", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://docs.ioxesp32.com/", + "vendor": "ArtronShop" +} diff --git a/boards/ioxesp32ps.json b/boards/ioxesp32ps.json new file mode 100644 index 000000000..443f1c4c0 --- /dev/null +++ b/boards/ioxesp32ps.json @@ -0,0 +1,42 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "-mfix-esp32-psram-cache-issue", + "-mfix-esp32-psram-cache-strategy=memw", + "-DBOARD_HAS_PSRAM", + "-DARDUINO_IOXESP32PS" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32", + "variant": "ioxesp32" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "debug": { + "openocd_board": "esp-wroom-32.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "ArtronShop IOXESP32", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://docs.ioxesp32.com/", + "vendor": "ArtronShop" +} diff --git a/boards/lilygo-t-display.json b/boards/lilygo-t-display.json new file mode 100644 index 000000000..c55bdb152 --- /dev/null +++ b/boards/lilygo-t-display.json @@ -0,0 +1,44 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_LILYGO_T_DISPLAY", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "40000000L", + "flash_mode": "dio", + "hwids": [ + [ + "0x1A86", + "0x55D4" + ] + ], + "mcu": "esp32", + "variant": "lilygo_t_display" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "LilyGo T-Display", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "hhttps://www.lilygo.cc/products/lilygo%C2%AE-ttgo-t-display-1-14-inch-lcd-esp32-control-board", + "vendor": "LilyGo" +} diff --git a/boards/m5stack-cores3.json b/boards/m5stack-cores3.json index 069097dcf..96bc6864e 100644 --- a/boards/m5stack-cores3.json +++ b/boards/m5stack-cores3.json @@ -7,7 +7,9 @@ "core": "esp32", "extra_flags": [ "-DARDUINO_M5STACK_CORES3", + "-DBOARD_HAS_PSRAM", "-DARDUINO_USB_MODE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1", "-DARDUINO_RUNNING_CORE=1", "-DARDUINO_EVENT_RUNNING_CORE=1" ], diff --git a/boards/um_nanos3.json b/boards/um_nanos3.json new file mode 100644 index 000000000..921a36e3f --- /dev/null +++ b/boards/um_nanos3.json @@ -0,0 +1,51 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "partitions": "default_8MB.csv", + "memory_type": "qio_qspi" + }, + "core": "esp32", + "extra_flags": [ + "-DBOARD_HAS_PSRAM", + "-DARDUINO_NANOS3", + "-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", + "0x8179" + ] + ], + "mcu": "esp32s3", + "variant": "um_nanos3" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Unexpected Maker NanoS3", + "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/nanoS3", + "vendor": "Unexpected Maker" +} From 7293107c4d6c56ffe54947b08ac8e461b2cac4e7 Mon Sep 17 00:00:00 2001 From: Kavinda Kotuwegedara <36191520+PradeepKotu@users.noreply.github.com> Date: Wed, 6 Dec 2023 17:15:25 +0530 Subject: [PATCH 10/22] Add Lion:Bit S3 board (#1179) --- boards/lionbits3.json | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 boards/lionbits3.json diff --git a/boards/lionbits3.json b/boards/lionbits3.json new file mode 100644 index 000000000..56bc5cdb2 --- /dev/null +++ b/boards/lionbits3.json @@ -0,0 +1,51 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_LIONBITS3_DEV", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "lionbits3" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Lion:Bit S3 STEM Dev Board", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://lionbit.cc/shop/", + "vendor": "Lion:Bit" +} From bc5b51f0202afc794e1a49dfb34ebcb82b080140 Mon Sep 17 00:00:00 2001 From: valeros Date: Wed, 6 Dec 2023 14:55:33 +0200 Subject: [PATCH 11/22] Update ESP-IDF to v5.1.2 Resolve #1237 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index f38a7e6a0..cd9d8e1f6 100644 --- a/platform.json +++ b/platform.json @@ -91,7 +91,7 @@ "type": "framework", "optional": true, "owner": "platformio", - "version": "~3.50101.0", + "version": "~3.50102.0", "optionalVersions": ["~3.40406.0"] }, "tool-esptoolpy": { From 89d7ed20856b1b4c4bad682e0f72c4b176be2f2a Mon Sep 17 00:00:00 2001 From: valeros Date: Fri, 8 Dec 2023 12:50:47 +0200 Subject: [PATCH 12/22] Add optional MMU page size flag to elf2bin if it's configurable --- builder/frameworks/espidf.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 9fff3a8fc..285ede632 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -97,8 +97,8 @@ PROJECT_SRC_DIR = env.subst("$PROJECT_SRC_DIR") CMAKE_API_REPLY_PATH = os.path.join(".cmake", "api", "v1", "reply") SDKCONFIG_PATH = os.path.expandvars(board.get( - "build.esp-idf.sdkconfig_path", - os.path.join(PROJECT_DIR, "sdkconfig.%s" % env.subst("$PIOENV")), + "build.esp-idf.sdkconfig_path", + os.path.join(PROJECT_DIR, "sdkconfig.%s" % env.subst("$PIOENV")), )) @@ -1212,7 +1212,7 @@ def _create_venv(venv_dir): env.Execute( env.VerboseAction( '"$PYTHONEXE" -m venv --clear "%s"' % venv_dir, - "Creating a new virtual environment for IDF Python dependencies", + "Creating a new virtual environment for IDF Python dependencies", ) ) @@ -1586,9 +1586,24 @@ def _skip_prj_source_files(node): # To embed firmware checksum a special argument for esptool.py is required # +extra_elf2bin_flags = "--elf-sha256-offset 0xb0" +# https://github.com/espressif/esp-idf/blob/master/components/esptool_py/project_include.cmake#L58 +# For chips that support configurable MMU page size feature +# If page size is configured to values other than the default "64KB" in menuconfig, +mmu_page_size = "64KB" +if sdk_config.get("SOC_MMU_PAGE_SIZE_CONFIGURABLE", False): + if board_flash_size == "2MB": + mmu_page_size = "32KB" + elif board_flash_size == "1MB": + mmu_page_size = "16KB" + +if mmu_page_size != "64KB": + extra_elf2bin_flags += " --flash-mmu-page-size %s" % mmu_page_size + action = copy.deepcopy(env["BUILDERS"]["ElfToBin"].action) + action.cmd_list = env["BUILDERS"]["ElfToBin"].action.cmd_list.replace( - "-o", "--elf-sha256-offset 0xb0 -o" + "-o", extra_elf2bin_flags + " -o" ) env["BUILDERS"]["ElfToBin"].action = action From 275f1170dd3e28ccdd2de36bf31e5dacd24a15bb Mon Sep 17 00:00:00 2001 From: valeros Date: Fri, 8 Dec 2023 12:52:08 +0200 Subject: [PATCH 13/22] Add a warning if there is a flash size mismatch with IDF config --- builder/frameworks/espidf.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 285ede632..98c95b622 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -1582,6 +1582,22 @@ def _skip_prj_source_files(node): if sdk_config.get("MBEDTLS_CERTIFICATE_BUNDLE", False): generate_mbedtls_bundle(sdk_config) +# +# Check if flash size is set correctly in the IDF configuration file +# + +board_flash_size = board.get("upload.flash_size", "4MB") +idf_flash_size = sdk_config.get("ESPTOOLPY_FLASHSIZE", "4MB") +if board_flash_size != idf_flash_size: + print( + "Warning! Flash memory size mismatch detected. Expected %s, found %s!" + % (board_flash_size, idf_flash_size) + ) + print( + "Please select a proper value in your `sdkconfig.defaults` " + "or via the `menuconfig` target!" + ) + # # To embed firmware checksum a special argument for esptool.py is required # From fa33c2bd943f13e956b1cc924955db66f2161356 Mon Sep 17 00:00:00 2001 From: Paul Price <56952812+strid3r21@users.noreply.github.com> Date: Mon, 11 Dec 2023 06:33:58 -0500 Subject: [PATCH 14/22] Add Smart Bee Data Logger board (#1249) --- boards/bee_data_logger.json | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 boards/bee_data_logger.json diff --git a/boards/bee_data_logger.json b/boards/bee_data_logger.json new file mode 100644 index 000000000..eb9e79d0b --- /dev/null +++ b/boards/bee_data_logger.json @@ -0,0 +1,48 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_BeeDataLogger", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x815C" + ] + ], + "mcu": "esp32s3", + "variant": "Bee_Data_Logger" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Smart Bee Data Logger", + "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://github.com/strid3r21/Bee-Data-Logger", + "vendor": "Smart Bee" +} From 638487696c0458e6ae1adfc968ec2b240f5ba7ec Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 12 Dec 2023 07:02:14 -0300 Subject: [PATCH 15/22] Fix Lolin S2 USB CDC setup (#1251) This commit fixes an issue with this board pointed out in ESP32 Arduino Github. https://github.com/espressif/arduino-esp32/issues/8977#issuecomment-1850888549 --- boards/lolin_s2_mini.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boards/lolin_s2_mini.json b/boards/lolin_s2_mini.json index 59832f8cb..1282c1fa2 100644 --- a/boards/lolin_s2_mini.json +++ b/boards/lolin_s2_mini.json @@ -7,7 +7,8 @@ "extra_flags": [ "-DARDUINO_LOLIN_S2_MINI", "-DBOARD_HAS_PSRAM", - "-DARDUINO_USB_CDC_ON_BOOT=1" + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_USB_MODE=0" ], "f_cpu": "240000000L", "f_flash": "80000000L", From f5a40f5e6609ac64e43d28f4b71dd9f6c16b1c9d Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 12 Dec 2023 13:05:33 +0100 Subject: [PATCH 16/22] fix lolin_s3.json (#1252) remove not needed touch entry --- boards/lolin_s3.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/boards/lolin_s3.json b/boards/lolin_s3.json index 9daea1796..8124b938a 100644 --- a/boards/lolin_s3.json +++ b/boards/lolin_s3.json @@ -7,10 +7,12 @@ }, "core": "esp32", "extra_flags": [ - "-DBOARD_HAS_PSRAM", "-DARDUINO_LOLIN_S3", + "-DBOARD_HAS_PSRAM", "-DARDUINO_USB_MODE=1", - "-DARDUINO_USB_CDC_ON_BOOT=1" + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" ], "f_cpu": "240000000L", "f_flash": "80000000L", @@ -39,9 +41,7 @@ "upload": { "flash_size": "16MB", "maximum_ram_size": 327680, - "maximum_size": 16777216, - "use_1200bps_touch": true, - "wait_for_upload_port": true, + "maximum_size": 16777216, "require_upload_port": true, "speed": 460800 }, From c266d1fcb6c5596ab356fc8e07fe3e44169daded Mon Sep 17 00:00:00 2001 From: Dominic Pearman <134791516+djpearman@users.noreply.github.com> Date: Thu, 14 Dec 2023 11:41:56 +0100 Subject: [PATCH 17/22] Added board ESP32-PICO-DevKitM-2 (#1254) Co-authored-by: Dominic Pearman --- boards/esp32-pico-devkitm-2.json | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 boards/esp32-pico-devkitm-2.json diff --git a/boards/esp32-pico-devkitm-2.json b/boards/esp32-pico-devkitm-2.json new file mode 100644 index 000000000..821128b09 --- /dev/null +++ b/boards/esp32-pico-devkitm-2.json @@ -0,0 +1,37 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ESP32_PICO_DEVKITM_2", + "-DBOARD_HAS_PSRAM" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32", + "variant": "esp32" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Espressif ESP32-PICO-DevKitM-2", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 921600 + }, + "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/hw-reference/esp32/get-started-pico-devkitm-2.html", + "vendor": "Espressif Systems" +} From a886fdc889d6e54ea930d087d6634bcd8120a171 Mon Sep 17 00:00:00 2001 From: Maximilian Gerhardt Date: Mon, 18 Dec 2023 10:52:35 +0100 Subject: [PATCH 18/22] Add Adafruit QT Py ESP32-S3 (PSRAM version) (#1257) Resolves #1181 --- boards/adafruit_qtpy_esp32s3_n4r2.json | 66 ++++++++++++++++++++++++++ examples/arduino-blink/platformio.ini | 5 ++ 2 files changed, 71 insertions(+) create mode 100644 boards/adafruit_qtpy_esp32s3_n4r2.json diff --git a/boards/adafruit_qtpy_esp32s3_n4r2.json b/boards/adafruit_qtpy_esp32s3_n4r2.json new file mode 100644 index 000000000..ec2b7648a --- /dev/null +++ b/boards/adafruit_qtpy_esp32s3_n4r2.json @@ -0,0 +1,66 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "partitions": "partitions-4MB-tinyuf2.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1", + "-DBOARD_HAS_PSRAM" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x239A", + "0x8143" + ], + [ + "0x239A", + "0x0143" + ], + [ + "0x239A", + "0x8144" + ] + ], + "mcu": "esp32s3", + "variant": "adafruit_qtpy_esp32s3_n4r2" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Adafruit QT Py ESP32-S3 (4M Flash 2M PSRAM)", + "upload": { + "arduino": { + "flash_extra_images": [ + [ + "0x2d0000", + "variants/adafruit_qtpy_esp32s3_n4r2/tinyuf2.bin" + ] + ] + }, + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.adafruit.com/product/5700", + "vendor": "Adafruit" +} diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini index 85e0fab00..fa67ab603 100644 --- a/examples/arduino-blink/platformio.ini +++ b/examples/arduino-blink/platformio.ini @@ -44,3 +44,8 @@ monitor_speed = 115200 platform = espressif32 framework = arduino board = arduino_nano_esp32 + +[env:adafruit_qtpy_esp32s3_n4r2] +platform = espressif32 +board = adafruit_qtpy_esp32s3_n4r2 +framework = arduino From 2575a81db65ee07fce904d90861b13fb7817ea93 Mon Sep 17 00:00:00 2001 From: valeros Date: Tue, 19 Dec 2023 12:06:25 +0200 Subject: [PATCH 19/22] Add ESP32-S3-USB-OTG board Resolves #1262 --- boards/esp32s3usbotg.json | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 boards/esp32s3usbotg.json diff --git a/boards/esp32s3usbotg.json b/boards/esp32s3usbotg.json new file mode 100644 index 000000000..eaa427ae0 --- /dev/null +++ b/boards/esp32s3usbotg.json @@ -0,0 +1,50 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld", + "partitions": "default_8MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ESP32_S3_USB_OTG", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "esp32s3usbotg" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Espressif ESP32-S3-USB-OTG", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32s3/esp32-s3-usb-otg/user_guide.html", + "vendor": "Espressif" +} From 2571753fc3c16f35aa9f115f2d2f53f25438fe49 Mon Sep 17 00:00:00 2001 From: a sapuppo <96046672+a-sapuppo@users.noreply.github.com> Date: Fri, 22 Dec 2023 19:02:40 +0100 Subject: [PATCH 20/22] Add new boards Namino Rosso / Arancio (#1193) --- boards/namino_arancio.json | 46 ++++++++++++++++++++++++++++++++++++++ boards/namino_rosso.json | 46 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 boards/namino_arancio.json create mode 100644 boards/namino_rosso.json diff --git a/boards/namino_arancio.json b/boards/namino_arancio.json new file mode 100644 index 000000000..e0fcd340c --- /dev/null +++ b/boards/namino_arancio.json @@ -0,0 +1,46 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_qspi" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_NAMINO_ARANCIO", + "-DARDUINO_USB_CDC_ON_BOOT=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "namino_arancio" + }, + "connectivity": [ + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Namino Arancio", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://namino.cc/boards/namino-arancio", + "vendor": "MECT SRL" +} diff --git a/boards/namino_rosso.json b/boards/namino_rosso.json new file mode 100644 index 000000000..01545844e --- /dev/null +++ b/boards/namino_rosso.json @@ -0,0 +1,46 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_qspi" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_NAMINO_ROSSO", + "-DARDUINO_USB_CDC_ON_BOOT=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "namino_rosso" + }, + "connectivity": [ + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Namino Rosso", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://namino.cc/boards/namino-rosso", + "vendor": "MECT SRL" +} From 91c7448d5a04869a97b3e7d85ed37ae2ba490eae Mon Sep 17 00:00:00 2001 From: valeros Date: Wed, 27 Dec 2023 14:04:36 +0200 Subject: [PATCH 21/22] Fix board name for ioxesp32ps --- boards/ioxesp32ps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/ioxesp32ps.json b/boards/ioxesp32ps.json index 443f1c4c0..ad66d9b7d 100644 --- a/boards/ioxesp32ps.json +++ b/boards/ioxesp32ps.json @@ -29,7 +29,7 @@ "arduino", "espidf" ], - "name": "ArtronShop IOXESP32", + "name": "ArtronShop IOXESP32PS", "upload": { "flash_size": "4MB", "maximum_ram_size": 327680, From e2616134ef527cd3c5af02fa22e27459b6156102 Mon Sep 17 00:00:00 2001 From: valeros Date: Wed, 27 Dec 2023 14:05:29 +0200 Subject: [PATCH 22/22] Bump version to 6.5.0 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index cd9d8e1f6..55bf3e061 100644 --- a/platform.json +++ b/platform.json @@ -18,7 +18,7 @@ "type": "git", "url": "https://github.com/platformio/platform-espressif32.git" }, - "version": "6.4.0", + "version": "6.5.0", "frameworks": { "arduino": { "package": "framework-arduinoespressif32",