From f9d0a9aba06ba7ed32deb7a5b81f7e75248cdecc Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 7 Jul 2022 19:55:53 +0200 Subject: [PATCH 01/17] Tasmota github as source --- README.md | 2 +- platform.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 43d9ec728..16e2ee1cb 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Espressif Systems is a privately held fabless semiconductor company. They provid ```ini [env:stable] -platform = replace with url +platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4/platform-espressif32-2.0.4.zip board = ... ... ``` diff --git a/platform.json b/platform.json index 816653d7e..58b71cff7 100644 --- a/platform.json +++ b/platform.json @@ -37,7 +37,7 @@ "type": "framework", "optional": true, "owner": "tasmota", - "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/880/framework-arduinoespressif32.tar.gz" + "version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.4/framework-arduinoespressif32-204.tar.gz" }, "framework-espidf": { "type": "framework", From 120f7653f0ba21ce07cfa05fc25116b5d17a1f21 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:05:28 +0200 Subject: [PATCH 02/17] --dont-append-digest --- builder/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/main.py b/builder/main.py index bbfa4f49f..a666270b1 100644 --- a/builder/main.py +++ b/builder/main.py @@ -232,6 +232,7 @@ def __fetch_fs_size(target, source, env): action=env.VerboseAction(" ".join([ '"$PYTHONEXE" "$OBJCOPY"', "--chip", mcu, "elf2image", + "--dont-append-digest", "--flash_mode", "$BOARD_FLASH_MODE", "--flash_freq", "${__get_board_f_flash(__env__)}", "--flash_size", board.get("upload.flash_size", "detect"), From 499430f0f8fb294bf8f6e312fab0d560daa2904a Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:06:03 +0200 Subject: [PATCH 03/17] esptool v4.1 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 58b71cff7..022a54121 100644 --- a/platform.json +++ b/platform.json @@ -120,7 +120,7 @@ "tool-esptoolpy": { "type": "uploader", "owner": "tasmota", - "version": "https://github.com/tasmota/esptool/releases/download/v3.3.1/esptool-3.3.1.zip" + "version": "https://github.com/tasmota/esptool/releases/download/v4.1/esptool-4.1.zip" }, "tool-mbctool": { "optional": true, From 4a81b6085c107b69b28e2082919ce02175271091 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 17 Jul 2022 18:27:26 +0200 Subject: [PATCH 04/17] 2.0.5dev --- platform.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform.json b/platform.json index 022a54121..6c52c8e8f 100644 --- a/platform.json +++ b/platform.json @@ -18,7 +18,7 @@ "type": "git", "url": "https://github.com/tasmota/platform-espressif32.git" }, - "version": "2.0.4", + "version": "2.0.5dev", "frameworks": { "arduino": { "package": "framework-arduinoespressif32", @@ -37,7 +37,7 @@ "type": "framework", "optional": true, "owner": "tasmota", - "version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.4/framework-arduinoespressif32-204.tar.gz" + "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/912/framework-arduinoespressif32-442_esp41-ce8eca3a26.tar.gz" }, "framework-espidf": { "type": "framework", From 5fe82818fb31ca203b138240b910384c533e03ef Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 17 Jul 2022 18:31:05 +0200 Subject: [PATCH 05/17] platformio": ">=6.1.0 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 6c52c8e8f..fc07c6793 100644 --- a/platform.json +++ b/platform.json @@ -12,7 +12,7 @@ "RISC-V" ], "engines": { - "platformio": ">=6.0.2" + "platformio": ">=6.1.0" }, "repository": { "type": "git", From f2a78a19c8165d48b398aade5ce0458f72da0855 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 17 Jul 2022 18:46:54 +0200 Subject: [PATCH 06/17] Update espidf.py --- builder/frameworks/espidf.py | 73 +++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index a360a04e3..2e7e0cce1 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -1249,7 +1249,6 @@ def _get_installed_pip_packages(): project_flags = get_app_flags(project_config, default_config) link_args = extract_link_args(elf_config) app_includes = get_app_includes(elf_config) -project_lib_includes = get_project_lib_includes(env) # # Compile bootloader @@ -1304,32 +1303,6 @@ def _skip_prj_source_files(node): env.AddBuildMiddleware(_skip_prj_source_files) -# Project files should be compiled only when a special -# option is enabled when running 'test' command -if "__test" not in COMMAND_LINE_TARGETS or env.GetProjectOption( - "test_build_project_src" -): - project_env = env.Clone() - if project_target_name != "__idf_main": - # Manually add dependencies to CPPPATH since ESP-IDF build system doesn't generate - # this info if the folder with sources is not named 'main' - # https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html#rename-main - project_env.AppendUnique(CPPPATH=app_includes["plain_includes"]) - - # Add include dirs from PlatformIO build system to project CPPPATH so - # they're visible to PIOBUILDFILES - project_env.Append( - CPPPATH=["$PROJECT_INCLUDE_DIR", "$PROJECT_SRC_DIR"] + project_lib_includes - ) - - env.Append( - PIOBUILDFILES=compile_source_files( - target_configs.get(project_target_name), - project_env, - project_env.subst("$PROJECT_DIR"), - ) - ) - # # Generate partition table # @@ -1390,6 +1363,52 @@ def _skip_prj_source_files(node): ], ) +# +# Propagate Arduino defines to the main build environment +# + +if "arduino" in env.subst("$PIOFRAMEWORK"): + arduino_config_name = list( + filter( + lambda config_name: config_name.startswith( + "__idf_framework-arduinoespressif32" + ), + target_configs, + ) + )[0] + env.AppendUnique( + CPPDEFINES=extract_defines( + target_configs.get(arduino_config_name, {}).get("compileGroups", [])[0] + ) + ) + +# Project files should be compiled only when a special +# option is enabled when running 'test' command +if "__test" not in COMMAND_LINE_TARGETS or env.GetProjectOption( + "test_build_project_src" +): + project_env = env.Clone() + if project_target_name != "__idf_main": + # Manually add dependencies to CPPPATH since ESP-IDF build system doesn't generate + # this info if the folder with sources is not named 'main' + # https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html#rename-main + project_env.AppendUnique(CPPPATH=app_includes["plain_includes"]) + + # Add include dirs from PlatformIO build system to project CPPPATH so + # they're visible to PIOBUILDFILES + project_env.AppendUnique( + CPPPATH=["$PROJECT_INCLUDE_DIR", "$PROJECT_SRC_DIR"] + + get_project_lib_includes(env) + ) + + env.Append( + PIOBUILDFILES=compile_source_files( + target_configs.get(project_target_name), + project_env, + project_env.subst("$PROJECT_DIR"), + ) + ) + # # Generate mbedtls bundle # From c06e78baf675e21a2035167a477cecd87784b56d Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 26 Jul 2022 18:31:57 +0200 Subject: [PATCH 07/17] Add default nameOnDisk value for external CMake projects --- builder/frameworks/espidf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 2e7e0cce1..bfbc70542 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -818,6 +818,8 @@ def get_targets_by_type(target_configs, target_types, ignore_targets=None): def get_components_map(target_configs, target_types, ignore_components=None): result = {} for config in get_targets_by_type(target_configs, target_types, ignore_components): + if "nameOnDisk" not in config: + config["nameOnDisk"] = "lib%s.a" % config["name"] result[config["id"]] = {"config": config} return result From dc33007e0df5588587393d74f51a2d874ae125ce Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 28 Jul 2022 19:17:32 +0200 Subject: [PATCH 08/17] Build 918 newest wifi libs from idf44 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index fc07c6793..df4b5ebfd 100644 --- a/platform.json +++ b/platform.json @@ -37,7 +37,7 @@ "type": "framework", "optional": true, "owner": "tasmota", - "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/912/framework-arduinoespressif32-442_esp41-ce8eca3a26.tar.gz" + "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/918/framework-arduinoespressif32-442_esp41-554da8627d.tar.gz" }, "framework-espidf": { "type": "framework", From 27dfa7eaefaa5b9e767bb12a49050df3f39f9b6d Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 29 Jul 2022 14:27:38 +0200 Subject: [PATCH 09/17] Tasmota IDF 4.4.3 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index df4b5ebfd..15444875f 100644 --- a/platform.json +++ b/platform.json @@ -43,7 +43,7 @@ "type": "framework", "optional": true, "owner": "tasmota", - "version": "https://github.com/tasmota/esp-idf/releases/download/v4.4.2/esp-idf-v4.4.2.zip" + "version": "https://github.com/tasmota/esp-idf/releases/download/v4.4.3/esp-idf-v4.4.3.zip" }, "toolchain-xtensa-esp32": { "type": "toolchain", From 70c2615d4170b25bdcc7635660f58d36b9ad8c2a Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 29 Jul 2022 16:06:34 +0200 Subject: [PATCH 10/17] Tasmota release Core 2.0.4.1 --- platform.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform.json b/platform.json index 15444875f..a38d53edc 100644 --- a/platform.json +++ b/platform.json @@ -18,7 +18,7 @@ "type": "git", "url": "https://github.com/tasmota/platform-espressif32.git" }, - "version": "2.0.5dev", + "version": "2.0.4+1", "frameworks": { "arduino": { "package": "framework-arduinoespressif32", @@ -37,7 +37,7 @@ "type": "framework", "optional": true, "owner": "tasmota", - "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/918/framework-arduinoespressif32-442_esp41-554da8627d.tar.gz" + "version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.4.1/framework-arduinoespressif32.tar.gz" }, "framework-espidf": { "type": "framework", From 6683ce4215cae37e009ef75de0a0ff715bb072a7 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 31 Jul 2022 13:06:54 +0200 Subject: [PATCH 11/17] Merge firmware before flashing via OpenOCD --- builder/main.py | 63 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/builder/main.py b/builder/main.py index a666270b1..41a93dc05 100644 --- a/builder/main.py +++ b/builder/main.py @@ -162,6 +162,18 @@ def __fetch_fs_size(target, source, env): return (target, source) +def merge_binaries(source, target, env, for_signature): + return " ".join([ + '"$PYTHONEXE"', + join(platform.get_package_dir("tool-esptoolpy") or "", "esptool.py"), + "--chip", mcu, "merge_bin", + "-o", "$TARGET", + "--flash_mode", "$BOARD_FLASH_MODE", + "--flash_size", board.get("upload.flash_size", "4MB"), + "$ESP32_APP_OFFSET", "$SOURCES" + ] + ['"%s"' % itm for img in env.get("FLASH_EXTRA_IMAGES", []) for itm in img]) + + env = DefaultEnvironment() platform = env.PioPlatform() board = env.BoardConfig() @@ -171,6 +183,24 @@ def __fetch_fs_size(target, source, env): if mcu == "esp32c3": toolchain_arch = "riscv32-esp" +# Arduino core v2.0.4 contains updated bootloader images that have innacurate default +# headers. This results in bootloops if firmware is flashed via OpenOCD (e.g. debugging +# or uploading via debug tools). For this reason, before uploading or debugging we need +# to merge binaries via esptoolpy so that the image headers will be adjusted according to +# --flash-size and --flash-mode arguments. +# Note: This behavior doesn't occur if uploading is done via esptoolpy, as esptoolpy +# overrides the binary image headers before flashing. +firmware_merge_required = bool( + env.get("PIOFRAMEWORK", []) == ["arduino"] + and ( + "debug" in env.GetBuildType() + or env.subst("$UPLOAD_PROTOCOL") in board.get("debug.tools", {}) + ) +) + +if "INTEGRATION_EXTRA_DATA" not in env: + env["INTEGRATION_EXTRA_DATA"] = {} + env.Replace( __get_board_boot_mode=_get_board_boot_mode, __get_board_f_flash=_get_board_f_flash, @@ -235,7 +265,7 @@ def __fetch_fs_size(target, source, env): "--dont-append-digest", "--flash_mode", "$BOARD_FLASH_MODE", "--flash_freq", "${__get_board_f_flash(__env__)}", - "--flash_size", board.get("upload.flash_size", "detect"), + "--flash_size", board.get("upload.flash_size", "4MB"), "-o", "$TARGET", "$SOURCES" ]), "Building $TARGET"), suffix=".bin" @@ -262,6 +292,10 @@ def __fetch_fs_size(target, source, env): source_factory=env.Dir, suffix=".bin", ), + MergeBin=Builder( + generator=merge_binaries, + suffix=".bin", + ), ) ) @@ -273,6 +307,7 @@ def __fetch_fs_size(target, source, env): # target_elf = None +target_firm_merged = None if "nobuild" in COMMAND_LINE_TARGETS: target_elf = join("$BUILD_DIR", "${PROGNAME}.elf") if set(["uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS): @@ -291,6 +326,14 @@ def __fetch_fs_size(target, source, env): else: target_firm = env.ElfToBin( join("$BUILD_DIR", "${PROGNAME}"), target_elf) + if firmware_merge_required: + # Note: Default offset address must be set to 0x0 because debugging + # relies on OpenOCD that requires merged firmware + env["INTEGRATION_EXTRA_DATA"].update( + {"application_offset": "0x0", "merged_firmware": True} + ) + target_firm_merged = env.MergeBin(join( + "$BUILD_DIR", "${PROGNAME}_merged"), target_firm) env.Depends(target_firm, "checkprogsize") env.AddPlatformTarget("buildfs", target_firm, target_firm, "Build Filesystem Image") @@ -428,6 +471,10 @@ def __fetch_fs_size(target, source, env): elif upload_protocol in debug_tools: + if firmware_merge_required: + # Only merged firmware with proper headers will work when uploading is done via + # debug probes. The firmware offset address must be adjusted to 0x0 accordingly. + target_firm = target_firm_merged openocd_args = ["-d%d" % (2 if int(ARGUMENTS.get("PIOVERBOSE", 0)) else 1)] openocd_args.extend( debug_tools.get(upload_protocol).get("server").get("arguments", [])) @@ -440,11 +487,14 @@ def __fetch_fs_size(target, source, env): % ( "$FS_START" if "uploadfs" in COMMAND_LINE_TARGETS - else "$ESP32_APP_OFFSET" + else board.get( + "upload.offset_address", + "0x0" if firmware_merge_required else "$ESP32_APP_OFFSET" + ) ), ] ) - if "uploadfs" not in COMMAND_LINE_TARGETS: + if "uploadfs" not in COMMAND_LINE_TARGETS and not firmware_merge_required: for image in env.get("FLASH_EXTRA_IMAGES", []): openocd_args.extend( [ @@ -502,6 +552,13 @@ def __fetch_fs_size(target, source, env): print("Warning! '-Wl,-T' option for specifying linker scripts is deprecated. " "Please use 'board_build.ldscript' option in your 'platformio.ini' file.") +# +# A temporary workaround to propagate additional data to the debug configuration routine +# + +Import("projenv") +projenv["INTEGRATION_EXTRA_DATA"] = env.get("INTEGRATION_EXTRA_DATA") + # # Default targets # From f32d4564875615f69bc37b942ec08cd3dca12a76 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 31 Jul 2022 13:12:09 +0200 Subject: [PATCH 12/17] Merge firmware before flashing via OpenOCD --- platform.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/platform.py b/platform.py index 9b048fcf6..2219d0954 100644 --- a/platform.py +++ b/platform.py @@ -278,16 +278,23 @@ def configure_debug_session(self, debug_config): if any(ignore_conds): return - load_cmds = [ - 'monitor program_esp "{{{path}}}" {offset} verify'.format( - path=to_unix_path(item["path"]), offset=item["offset"] - ) - for item in flash_images - ] + merged_firmware = build_extra_data.get("merged_firmware", False) + load_cmds = [] + if not merged_firmware: + load_cmds.extend([ + 'monitor program_esp "{{{path}}}" {offset} verify'.format( + path=to_unix_path(item["path"]), offset=item["offset"] + ) + for item in flash_images + ]) + load_cmds.append( 'monitor program_esp "{%s.bin}" %s verify' % ( - to_unix_path(debug_config.build_data["prog_path"][:-4]), + to_unix_path( + debug_config.build_data["prog_path"][:-4] + + ("_merged" if merged_firmware else "") + ), build_extra_data.get("application_offset", "0x10000"), ) ) @@ -389,4 +396,4 @@ def configure_upstream_arduino_packages(self, url_items): print("Configuring toolchain packages from a remote source...") self.configure_arduino_toolchains( self.download_remote_package_index(url_items) - ) \ No newline at end of file + ) From d50a00657b504a8b83630ccc7394a051f72a9dd7 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 31 Jul 2022 13:13:05 +0200 Subject: [PATCH 13/17] Update arduino.py --- builder/frameworks/arduino.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py index c6fc754a6..eea32aa38 100644 --- a/builder/frameworks/arduino.py +++ b/builder/frameworks/arduino.py @@ -41,4 +41,4 @@ SConscript( join(DefaultEnvironment().PioPlatform().get_package_dir( "framework-arduinoespressif32"), "tools", "platformio-build.py")) - env["IDE_EXTRA_DATA"].update({"application_offset": env.subst("$ESP32_APP_OFFSET")}) + env["INTEGRATION_EXTRA_DATA"].update({"application_offset": env.subst("$ESP32_APP_OFFSET")}) From e9cecb2264f57b2b42ef2cc1cf2350e3fd25af06 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 31 Jul 2022 13:14:22 +0200 Subject: [PATCH 14/17] Update espidf.py --- builder/frameworks/espidf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index bfbc70542..187a4ed5c 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -1473,4 +1473,4 @@ def _skip_prj_source_files(node): ) # Propagate application offset to debug configurations -env["IDE_EXTRA_DATA"].update({"application_offset": env.subst("$ESP32_APP_OFFSET")}) +env["INTEGRATION_EXTRA_DATA"].update({"application_offset": env.subst("$ESP32_APP_OFFSET")}) From 276370dfbb2810ccdde40db1585084b3f6d4bf4f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 31 Jul 2022 13:21:58 +0200 Subject: [PATCH 15/17] update boards 1/2 --- boards/adafruit_feather_esp32s2_tft.json | 11 +--- boards/adafruit_feather_esp32s3.json | 29 ++++----- boards/adafruit_feather_esp32s3_nopsram.json | 63 +++++++++++++++++++ boards/adafruit_feather_esp32s3_tft.json | 64 ++++++++++++++++++++ boards/adafruit_funhouse_esp32s2.json | 11 +--- boards/adafruit_magtag29_esp32s2.json | 11 +--- boards/adafruit_metro_esp32s2.json | 11 +--- boards/adafruit_qtpy_esp32s2.json | 11 +--- boards/adafruit_qtpy_esp32s3_nopsram.json | 63 +++++++++++++++++++ boards/alksesp32.json | 3 +- boards/atmegazero_esp32s2.json | 11 +--- boards/briki_abc_esp32.json | 3 +- boards/briki_mbc-wb_esp32.json | 3 +- boards/cnrs_aw2eth.json | 36 +++++++++++ boards/connaxio_espoir.json | 47 ++++++++++++++ boards/dfrobot_beetle_esp32c3.json | 47 ++++++++++++++ boards/dfrobot_firebeetle2_esp32s3.json | 49 +++++++++++++++ boards/esp32-devkitlipo.json | 1 + boards/esp32-evb.json | 1 + boards/esp32-gateway.json | 1 + boards/esp32-poe-iso.json | 1 + boards/esp32-poe.json | 1 + boards/esp32-s2-franzininho.json | 2 - boards/esp32-s2-kaluga-1.json | 1 - boards/esp32-s2-saola-1.json | 2 +- boards/featheresp32-s2.json | 3 +- boards/firebeetle32.json | 12 ++-- boards/iotaap_magnolia.json | 3 +- 28 files changed, 409 insertions(+), 92 deletions(-) create mode 100644 boards/adafruit_feather_esp32s3_nopsram.json create mode 100644 boards/adafruit_feather_esp32s3_tft.json create mode 100644 boards/adafruit_qtpy_esp32s3_nopsram.json create mode 100644 boards/cnrs_aw2eth.json create mode 100644 boards/connaxio_espoir.json create mode 100644 boards/dfrobot_beetle_esp32c3.json create mode 100644 boards/dfrobot_firebeetle2_esp32s3.json diff --git a/boards/adafruit_feather_esp32s2_tft.json b/boards/adafruit_feather_esp32s2_tft.json index 6f141b03c..aee443134 100644 --- a/boards/adafruit_feather_esp32s2_tft.json +++ b/boards/adafruit_feather_esp32s2_tft.json @@ -1,7 +1,8 @@ { "build": { "arduino": { - "ldscript": "esp32s2_out.ld" + "ldscript": "esp32s2_out.ld", + "partitions": "partitions-4MB-tinyuf2.csv" }, "core": "esp32", "extra_flags": [ @@ -41,14 +42,6 @@ ], "name": "Adafruit Feather ESP32-S2 TFT", "upload": { - "arduino": { - "flash_extra_images": [ - [ - "0x2d0000", - "variants/adafruit_feather_esp32s2_tft/tinyuf2.bin" - ] - ] - }, "flash_size": "4MB", "maximum_ram_size": 327680, "maximum_size": 4194304, diff --git a/boards/adafruit_feather_esp32s3.json b/boards/adafruit_feather_esp32s3.json index 85d530afb..9c14bd3f8 100644 --- a/boards/adafruit_feather_esp32s3.json +++ b/boards/adafruit_feather_esp32s3.json @@ -1,11 +1,12 @@ { "build": { "arduino":{ - "ldscript": "esp32s3_out.ld" + "ldscript": "esp32s3_out.ld", + "partitions": "partitions.csv" }, "core": "esp32", "extra_flags": [ - "-DARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM", + "-DARDUINO_ADAFRUIT_FEATHER_ESP32S3", "-DARDUINO_USB_CDC_ON_BOOT=1", "-DARDUINO_RUNNING_CORE=1", "-DARDUINO_EVENT_RUNNING_CORE=1" @@ -16,19 +17,19 @@ "hwids": [ [ "0x239A", - "0x8113" + "0x811B" ], [ "0x239A", - "0x0113" + "0x011B" ], [ "0x239A", - "0x8114" + "0x811C" ] ], "mcu": "esp32s3", - "variant": "adafruit_feather_esp32s3_nopsram" + "variant": "adafruit_feather_esp32s3" }, "connectivity": [ "wifi" @@ -40,24 +41,16 @@ "arduino", "espidf" ], - "name": "Adafruit Feather ESP32-S3 No PSRAM", + "name": "Adafruit Feather ESP32-S3 2MB PSRAM", "upload": { - "arduino": { - "flash_extra_images": [ - [ - "0x410000", - "variants/adafruit_feather_esp32s3_nopsram/tinyuf2.bin" - ] - ] - }, - "flash_size": "8MB", + "flash_size": "4MB", "maximum_ram_size": 327680, - "maximum_size": 8388608, + "maximum_size": 4194304, "use_1200bps_touch": true, "wait_for_upload_port": true, "require_upload_port": true, "speed": 460800 }, - "url": "https://www.adafruit.com/product/5323", + "url": "https://www.adafruit.com/product/5477", "vendor": "Adafruit" } diff --git a/boards/adafruit_feather_esp32s3_nopsram.json b/boards/adafruit_feather_esp32s3_nopsram.json new file mode 100644 index 000000000..29541e559 --- /dev/null +++ b/boards/adafruit_feather_esp32s3_nopsram.json @@ -0,0 +1,63 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM", + "-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": [ + [ + "0x239A", + "0x811B" + ], + [ + "0x239A", + "0x011B" + ], + [ + "0x239A", + "0x811C" + ] + ], + "mcu": "esp32s3", + "variant": "adafruit_feather_esp32s3_nopsram" + }, + "connectivity": [ + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Adafruit Feather ESP32-S3 No PSRAM", + "upload": { + "arduino": { + "flash_extra_images": [ + [ + "0x2d0000", + "variants/adafruit_feather_esp32s3_nopsram/tinyuf2.bin" + ] + ] + }, + "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://www.adafruit.com/product/5323", + "vendor": "Adafruit" +} diff --git a/boards/adafruit_feather_esp32s3_tft.json b/boards/adafruit_feather_esp32s3_tft.json new file mode 100644 index 000000000..4e38ae0d1 --- /dev/null +++ b/boards/adafruit_feather_esp32s3_tft.json @@ -0,0 +1,64 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "partitions": "partitions.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT", + "-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": [ + [ + "0x239A", + "0x811D" + ], + [ + "0x239A", + "0x011D" + ], + [ + "0x239A", + "0x811E" + ] + ], + "mcu": "esp32s3", + "variant": "adafruit_feather_esp32s3_tft" + }, + "connectivity": [ + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Adafruit Feather ESP32-S3 TFT", + "upload": { + "arduino": { + "flash_extra_images": [ + [ + "0x2d0000", + "variants/adafruit_feather_esp32s3_tft/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/5483", + "vendor": "Adafruit" +} diff --git a/boards/adafruit_funhouse_esp32s2.json b/boards/adafruit_funhouse_esp32s2.json index 974761247..eb5ee1d52 100644 --- a/boards/adafruit_funhouse_esp32s2.json +++ b/boards/adafruit_funhouse_esp32s2.json @@ -1,7 +1,8 @@ { "build": { "arduino":{ - "ldscript": "esp32s2_out.ld" + "ldscript": "esp32s2_out.ld", + "partitions": "partitions-4MB-tinyuf2.csv" }, "core": "esp32", "extra_flags": [ @@ -41,14 +42,6 @@ ], "name": "Adafruit FunHouse", "upload": { - "arduino": { - "flash_extra_images": [ - [ - "0x2d0000", - "variants/adafruit_funhouse_esp32s2/tinyuf2.bin" - ] - ] - }, "flash_size": "4MB", "maximum_ram_size": 327680, "maximum_size": 4194304, diff --git a/boards/adafruit_magtag29_esp32s2.json b/boards/adafruit_magtag29_esp32s2.json index 5e2dd717f..fc51f6101 100644 --- a/boards/adafruit_magtag29_esp32s2.json +++ b/boards/adafruit_magtag29_esp32s2.json @@ -1,7 +1,8 @@ { "build": { "arduino":{ - "ldscript": "esp32s2_out.ld" + "ldscript": "esp32s2_out.ld", + "partitions": "partitions-4MB-tinyuf2.csv" }, "core": "esp32", "extra_flags": [ @@ -41,14 +42,6 @@ ], "name": "Adafruit MagTag 2.9", "upload": { - "arduino": { - "flash_extra_images": [ - [ - "0x2d0000", - "variants/adafruit_magtag29_esp32s2/tinyuf2.bin" - ] - ] - }, "flash_size": "4MB", "maximum_ram_size": 327680, "maximum_size": 4194304, diff --git a/boards/adafruit_metro_esp32s2.json b/boards/adafruit_metro_esp32s2.json index af8df2279..7f75dfbe4 100644 --- a/boards/adafruit_metro_esp32s2.json +++ b/boards/adafruit_metro_esp32s2.json @@ -1,7 +1,8 @@ { "build": { "arduino":{ - "ldscript": "esp32s2_out.ld" + "ldscript": "esp32s2_out.ld", + "partitions": "partitions-4MB-tinyuf2.csv" }, "core": "esp32", "extra_flags": [ @@ -41,14 +42,6 @@ ], "name": "Adafruit Metro ESP32-S2", "upload": { - "arduino": { - "flash_extra_images": [ - [ - "0x2d0000", - "variants/adafruit_metro_esp32s2/tinyuf2.bin" - ] - ] - }, "flash_size": "4MB", "maximum_ram_size": 327680, "maximum_size": 4194304, diff --git a/boards/adafruit_qtpy_esp32s2.json b/boards/adafruit_qtpy_esp32s2.json index 30f51dcec..51beac63e 100644 --- a/boards/adafruit_qtpy_esp32s2.json +++ b/boards/adafruit_qtpy_esp32s2.json @@ -1,7 +1,8 @@ { "build": { "arduino": { - "ldscript": "esp32s2_out.ld" + "ldscript": "esp32s2_out.ld", + "partitions": "partitions-4MB-tinyuf2.csv" }, "core": "esp32", "extra_flags": [ @@ -41,14 +42,6 @@ ], "name": "Adafruit QT Py ESP32-S2", "upload": { - "arduino": { - "flash_extra_images": [ - [ - "0x2d0000", - "variants/adafruit_qtpy_esp32s2/tinyuf2.bin" - ] - ] - }, "flash_size": "4MB", "maximum_ram_size": 327680, "maximum_size": 4194304, diff --git a/boards/adafruit_qtpy_esp32s3_nopsram.json b/boards/adafruit_qtpy_esp32s3_nopsram.json new file mode 100644 index 000000000..4412a31e4 --- /dev/null +++ b/boards/adafruit_qtpy_esp32s3_nopsram.json @@ -0,0 +1,63 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM", + "-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": [ + [ + "0x239A", + "0x8119" + ], + [ + "0x239A", + "0x0119" + ], + [ + "0x239A", + "0x811A" + ] + ], + "mcu": "esp32s3", + "variant": "adafruit_qtpy_esp32s3_nopsram" + }, + "connectivity": [ + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Adafruit QT Py ESP32-S3 No PSRAM", + "upload": { + "arduino": { + "flash_extra_images": [ + [ + "0x410000", + "variants/adafruit_qtpy_esp32s3_nopsram/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/5426", + "vendor": "Adafruit" +} diff --git a/boards/alksesp32.json b/boards/alksesp32.json index 3e2e67b9b..6a4ae15ad 100644 --- a/boards/alksesp32.json +++ b/boards/alksesp32.json @@ -21,8 +21,7 @@ "openocd_board": "esp-wroom-32.cfg" }, "frameworks": [ - "arduino", - "espidf" + "arduino" ], "name": "ALKS ESP32", "upload": { diff --git a/boards/atmegazero_esp32s2.json b/boards/atmegazero_esp32s2.json index bfc40697f..a23a6ce9d 100644 --- a/boards/atmegazero_esp32s2.json +++ b/boards/atmegazero_esp32s2.json @@ -1,7 +1,8 @@ { "build": { "arduino":{ - "ldscript": "esp32s2_out.ld" + "ldscript": "esp32s2_out.ld", + "partitions": "partitions-16MB-tinyuf2.csv" }, "core": "esp32", "extra_flags": [ @@ -32,14 +33,6 @@ ], "name": "EspinalLab ATMegaZero ESP32-S2", "upload": { - "arduino": { - "flash_extra_images": [ - [ - "0x2d0000", - "variants/atmegazero_esp32s2/tinyuf2.bin" - ] - ] - }, "flash_size": "16MB", "maximum_ram_size": 327680, "maximum_size": 16777216, diff --git a/boards/briki_abc_esp32.json b/boards/briki_abc_esp32.json index 53113bb1b..429514895 100644 --- a/boards/briki_abc_esp32.json +++ b/boards/briki_abc_esp32.json @@ -22,8 +22,7 @@ "openocd_board": "esp-wroom-32.cfg" }, "frameworks": [ - "arduino", - "espidf" + "arduino" ], "name": "Briki ABC (MBC-WB) - ESP32", "upload": { diff --git a/boards/briki_mbc-wb_esp32.json b/boards/briki_mbc-wb_esp32.json index 86af17f3f..df5c3756a 100644 --- a/boards/briki_mbc-wb_esp32.json +++ b/boards/briki_mbc-wb_esp32.json @@ -22,8 +22,7 @@ "openocd_board": "esp-wroom-32.cfg" }, "frameworks": [ - "arduino", - "espidf" + "arduino" ], "name": "Briki MBC-WB - ESP32", "upload": { diff --git a/boards/cnrs_aw2eth.json b/boards/cnrs_aw2eth.json new file mode 100644 index 000000000..3669347a4 --- /dev/null +++ b/boards/cnrs_aw2eth.json @@ -0,0 +1,36 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ESP32_PICO" + ], + "f_cpu": "240000000L", + "f_flash": "40000000L", + "flash_mode": "dio", + "mcu": "esp32", + "variant": "cnrs_aw2eth" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "CNRS AW2ETH", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://en.wikipedia.org/wiki/ESP32", + "vendor": "CNRS" +} diff --git a/boards/connaxio_espoir.json b/boards/connaxio_espoir.json new file mode 100644 index 000000000..e9e7265bf --- /dev/null +++ b/boards/connaxio_espoir.json @@ -0,0 +1,47 @@ + +{ + "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_CONNAXIO_ESPOIR", + "-DCONFIG_FREERTOS_UNICORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "dio", + "mcu": "esp32", + "variant": "connaxio_espoir", + "hwids": [ + [ + "0x10C4", + "0x8D9A" + ] + ] + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "debug": { + "openocd_board": "esp32-solo-1.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Connaxio's Espoir", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 921600 + }, + "url": "https://www.connaxio.com/electronics/espoir/", + "vendor": "Connaxio" +} diff --git a/boards/dfrobot_beetle_esp32c3.json b/boards/dfrobot_beetle_esp32c3.json new file mode 100644 index 000000000..a5b884f2f --- /dev/null +++ b/boards/dfrobot_beetle_esp32c3.json @@ -0,0 +1,47 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32c3_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ESP32C3_DEV", + "-DARDUINO_USB_MODE=1" + ], + "f_cpu": "160000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x3343", + "0x8364" + ], + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32c3", + "variant": "dfrobot_beetle_esp32c3" + }, + "connectivity": [ + "wifi" + ], + "debug": { + "openocd_target": "esp32c3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "DFRobot Beetle ESP32-C3", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.dfrobot.com/product-2566.html", + "vendor": "DFRobot" +} diff --git a/boards/dfrobot_firebeetle2_esp32s3.json b/boards/dfrobot_firebeetle2_esp32s3.json new file mode 100644 index 000000000..0f87150d6 --- /dev/null +++ b/boards/dfrobot_firebeetle2_esp32s3.json @@ -0,0 +1,49 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld" + }, + "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", + "0x83CF" + ], + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "dfrobot_firebeetle2_esp32s3" + }, + "connectivity": [ + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "DFRobot Firebeetle 2 ESP32-S3", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.dfrobot.com/product-1590.html", + "vendor": "DFRobot" +} diff --git a/boards/esp32-devkitlipo.json b/boards/esp32-devkitlipo.json index 399d0846f..cbc926b17 100644 --- a/boards/esp32-devkitlipo.json +++ b/boards/esp32-devkitlipo.json @@ -8,6 +8,7 @@ "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "qio", + "hwids": [["0x1A86", "0x7523"]], "mcu": "esp32", "variant": "esp32-devkit-lipo" }, diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json index 69dde4347..c821386ae 100644 --- a/boards/esp32-evb.json +++ b/boards/esp32-evb.json @@ -8,6 +8,7 @@ "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", + "hwids": [["0x1A86", "0x7523"]], "mcu": "esp32", "variant": "esp32-evb" }, diff --git a/boards/esp32-gateway.json b/boards/esp32-gateway.json index 1a8aac8d6..33f0f2f2a 100644 --- a/boards/esp32-gateway.json +++ b/boards/esp32-gateway.json @@ -8,6 +8,7 @@ "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", + "hwids": [["0x1A86", "0x7523"]], "mcu": "esp32", "variant": "esp32-gateway" }, diff --git a/boards/esp32-poe-iso.json b/boards/esp32-poe-iso.json index 82898b1f7..4412f9466 100644 --- a/boards/esp32-poe-iso.json +++ b/boards/esp32-poe-iso.json @@ -8,6 +8,7 @@ "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", + "hwids": [["0x1A86", "0x7523"]], "mcu": "esp32", "variant": "esp32-poe-iso" }, diff --git a/boards/esp32-poe.json b/boards/esp32-poe.json index 60c992e53..0cf9bd46e 100644 --- a/boards/esp32-poe.json +++ b/boards/esp32-poe.json @@ -8,6 +8,7 @@ "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", + "hwids": [["0x1A86", "0x7523"]], "mcu": "esp32", "variant": "esp32-poe" }, diff --git a/boards/esp32-s2-franzininho.json b/boards/esp32-s2-franzininho.json index d20d12a45..206456339 100644 --- a/boards/esp32-s2-franzininho.json +++ b/boards/esp32-s2-franzininho.json @@ -4,7 +4,6 @@ "ld": "esp32s2_out.ld" }, "core": "esp32", - "extra_flags": "-DBOARD_HAS_PSRAM", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "dio", @@ -18,7 +17,6 @@ "openocd_target": "esp32s2.cfg" }, "frameworks": [ - "arduino", "espidf" ], "name": "Franzininho WiFi Board", diff --git a/boards/esp32-s2-kaluga-1.json b/boards/esp32-s2-kaluga-1.json index b48abac37..1f1653351 100644 --- a/boards/esp32-s2-kaluga-1.json +++ b/boards/esp32-s2-kaluga-1.json @@ -4,7 +4,6 @@ "ldscript": "esp32s2_out.ld" }, "core": "esp32", - "extra_flags": "-DBOARD_HAS_PSRAM", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", diff --git a/boards/esp32-s2-saola-1.json b/boards/esp32-s2-saola-1.json index 58927bb91..f264131f9 100644 --- a/boards/esp32-s2-saola-1.json +++ b/boards/esp32-s2-saola-1.json @@ -4,7 +4,7 @@ "ldscript": "esp32s2_out.ld" }, "core": "esp32", - "extra_flags": "-DBOARD_HAS_PSRAM", + "extra_flags": "-DARDUINO_ESP32S2_DEV", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", diff --git a/boards/featheresp32-s2.json b/boards/featheresp32-s2.json index bf6f0cbc2..f645bf629 100644 --- a/boards/featheresp32-s2.json +++ b/boards/featheresp32-s2.json @@ -1,7 +1,8 @@ { "build": { "arduino":{ - "ldscript": "esp32s2_out.ld" + "ldscript": "esp32s2_out.ld", + "partitions": "partitions-4MB-tinyuf2.csv" }, "core": "esp32", "extra_flags": [ diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json index d580c39e9..3463fa131 100644 --- a/boards/firebeetle32.json +++ b/boards/firebeetle32.json @@ -13,9 +13,7 @@ }, "connectivity": [ "wifi", - "bluetooth", - "ethernet", - "can" + "bluetooth" ], "debug": { "openocd_board": "esp-wroom-32.cfg" @@ -26,12 +24,12 @@ ], "name": "FireBeetle-ESP32", "upload": { - "flash_size": "4MB", - "maximum_ram_size": 327680, - "maximum_size": 4194304, + "flash_size": "16MB", + "maximum_ram_size": 532480, + "maximum_size": 16777216, "require_upload_port": true, "speed": 460800 }, - "url": "https://dfrobotblog.wordpress.com", + "url": "https://wiki.dfrobot.com/FireBeetle_ESP32_IOT_Microcontroller(V3.0)__Supports_Wi-Fi_&_Bluetooth__SKU__DFR0478", "vendor": "DFRobot" } diff --git a/boards/iotaap_magnolia.json b/boards/iotaap_magnolia.json index fffc85354..47c1ebad6 100644 --- a/boards/iotaap_magnolia.json +++ b/boards/iotaap_magnolia.json @@ -21,8 +21,7 @@ "openocd_board": "esp-wroom-32.cfg" }, "frameworks": [ - "arduino", - "espidf" + "arduino" ], "name": "IoTaaP Magnolia", "upload": { From 4059ae98b8f6347cf1d18e6a71945f97f6c9a274 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 31 Jul 2022 13:23:22 +0200 Subject: [PATCH 16/17] Update Boards 2/2 --- boards/m5stack-coreink.json | 2 +- boards/seeed_xiao_esp32c3.json | 44 +++++++++++++++++++++++++ boards/sparkfun_esp32s2_thing_plus.json | 2 +- boards/wemos_d1_mini32.json | 2 +- boards/wemos_d1_uno32.json | 37 +++++++++++++++++++++ 5 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 boards/seeed_xiao_esp32c3.json create mode 100644 boards/wemos_d1_uno32.json diff --git a/boards/m5stack-coreink.json b/boards/m5stack-coreink.json index f5aee0d7b..e7b3cbb1c 100644 --- a/boards/m5stack-coreink.json +++ b/boards/m5stack-coreink.json @@ -21,7 +21,7 @@ "arduino", "espidf" ], - "name": "M5Stick-Core Ink", + "name": "M5Stack-Core Ink", "upload": { "flash_size": "4MB", "maximum_ram_size": 327680, diff --git a/boards/seeed_xiao_esp32c3.json b/boards/seeed_xiao_esp32c3.json new file mode 100644 index 000000000..4d8ded042 --- /dev/null +++ b/boards/seeed_xiao_esp32c3.json @@ -0,0 +1,44 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32c3_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_XIAO_ESP32C3", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1" + ], + "f_cpu": "160000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x2886", + "0x0047" + ] + ], + "mcu": "esp32c3", + "variant": "XIAO_ESP32C3" + }, + "connectivity": [ + "wifi" + ], + "debug": { + "openocd_target": "esp32c3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Seeed Studio XIAO ESP32C3", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://wiki.seeedstudio.com/XIAO_ESP32C3_Getting_Started/", + "vendor": "Seeed Studio" +} diff --git a/boards/sparkfun_esp32s2_thing_plus.json b/boards/sparkfun_esp32s2_thing_plus.json index 763c409c8..f8697e73a 100644 --- a/boards/sparkfun_esp32s2_thing_plus.json +++ b/boards/sparkfun_esp32s2_thing_plus.json @@ -39,4 +39,4 @@ }, "url": "https://www.sparkfun.com/products/17743", "vendor": "SparkFun" -} \ No newline at end of file +} diff --git a/boards/wemos_d1_mini32.json b/boards/wemos_d1_mini32.json index 4770623ac..90b1d6b95 100644 --- a/boards/wemos_d1_mini32.json +++ b/boards/wemos_d1_mini32.json @@ -24,7 +24,7 @@ "arduino", "espidf" ], - "name": "WeMos D1 MINI ESP32", + "name": "WEMOS D1 MINI ESP32", "upload": { "flash_size": "4MB", "maximum_ram_size": 327680, diff --git a/boards/wemos_d1_uno32.json b/boards/wemos_d1_uno32.json new file mode 100644 index 000000000..2a38aa423 --- /dev/null +++ b/boards/wemos_d1_uno32.json @@ -0,0 +1,37 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32_out.ld" + }, + "core": "esp32", + "extra_flags": "-DARDUINO_D1_UNO32", + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "dio", + "mcu": "esp32", + "variant": "d1_uno32" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "debug": { + "openocd_board": "esp-wroom-32.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "WEMOS D1 R32", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.wemos.cc", + "vendor": "WEMOS" +} From a395f652b38011a2bf59d8c085f62500e8e037d9 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 31 Jul 2022 13:29:57 +0200 Subject: [PATCH 17/17] v2.0.4.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 16e2ee1cb..f4a06b969 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Espressif Systems is a privately held fabless semiconductor company. They provid ```ini [env:stable] -platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4/platform-espressif32-2.0.4.zip +platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4.1/platform-espressif32-2.0.4.1.zip board = ... ... ```