Jason2866 · Jason2866 · Sep 20, 2022 · Jun 16, 2022 · Jun 16, 2022 · Jun 16, 2022
diff --git 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.1/platform-espressif32-2.0.4.1.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5/platform-espressif32-2.0.5.zip
 board = ...
 ...
 ```

diff --git a/boards/adafruit_feather_esp32s3.json b/boards/adafruit_feather_esp32s3.json
@@ -7,9 +7,7 @@
     "core": "esp32",
     "extra_flags": [
       "-DARDUINO_ADAFRUIT_FEATHER_ESP32S3",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/boards/adafruit_feather_esp32s3_nopsram.json b/boards/adafruit_feather_esp32s3_nopsram.json
@@ -6,9 +6,7 @@
     "core": "esp32",
     "extra_flags": [
       "-DARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/boards/adafruit_feather_esp32s3_tft.json b/boards/adafruit_feather_esp32s3_tft.json
@@ -7,9 +7,7 @@
     "core": "esp32",
     "extra_flags": [
       "-DARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/boards/adafruit_qtpy_esp32s3.json b/boards/adafruit_qtpy_esp32s3.json
@@ -6,9 +6,7 @@
     "core": "esp32",
     "extra_flags": [
       "-DARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/boards/adafruit_qtpy_esp32s3_nopsram.json b/boards/adafruit_qtpy_esp32s3_nopsram.json
@@ -6,9 +6,7 @@
     "core": "esp32",
     "extra_flags": [
       "-DARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/boards/dfrobot_firebeetle2_esp32s3.json b/boards/dfrobot_firebeetle2_esp32s3.json
@@ -6,9 +6,7 @@
     "core": "esp32",
     "extra_flags": [
       "-DARDUINO_ESP32S3_DEV",
-      "-DARDUINO_USB_MODE=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_USB_MODE=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/boards/esp32-s3-devkitc-1.json b/boards/esp32-s3-devkitc-1.json
@@ -7,9 +7,7 @@
     "core": "esp32",
     "extra_flags": [
       "-DARDUINO_ESP32S3_DEV",
-      "-DARDUINO_USB_MODE=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_USB_MODE=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/boards/esp32s3camlcd.json b/boards/esp32s3camlcd.json
@@ -7,15 +7,13 @@
     "boot": "opi",
     "core": "esp32",
     "extra_flags": [
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1",
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_ESP32S3_CAM_LCD",
       "-DARDUINO_USB_MODE=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
-    "flash_mode": "qio",
+    "flash_mode": "dout",
     "hwids": [
       [
         "0X303A",
@@ -38,7 +36,7 @@
   ],
   "name": "ESP32S3 CAM LCD",
   "upload": {
-    "flash_size": "4MB",
+    "flash_size": "16MB",
     "maximum_ram_size": 327680,
     "maximum_size": 16777216,
     "require_upload_port": true,

diff --git a/boards/lionbit.json b/boards/lionbit.json
@@ -5,9 +5,7 @@
     },
     "core": "esp32",
     "extra_flags": [
-      "-DARDUINO_LIONBIT",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_LIONBIT"
     ],
     "f_cpu": "240000000L",
     "f_flash": "40000000L",

diff --git a/boards/um_feathers3.json b/boards/um_feathers3.json
@@ -8,9 +8,7 @@
     "extra_flags": [
       "-DARDUINO_FEATHERS3",
       "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/boards/um_pros3.json b/boards/um_pros3.json
@@ -8,9 +8,7 @@
     "extra_flags": [
       "-DARDUINO_PROS3",
       "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/boards/um_tinys3.json b/boards/um_tinys3.json
@@ -8,9 +8,7 @@
     "extra_flags": [
       "-DARDUINO_TINYS3",
       "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py
@@ -1050,6 +1050,7 @@ def _get_installed_pip_packages():
         "future": ">=0.15.2",
         "pyparsing": ">=2.0.3,<2.4.0",
         "kconfiglib": "==13.7.1",
+        "idf-component-manager": "~=1.0"
     }
 
     installed_packages = _get_installed_pip_packages()

diff --git a/builder/main.py b/builder/main.py
@@ -51,15 +51,19 @@ def _get_board_f_flash(env):
 def _get_board_flash_mode(env):
     memory_type = env.BoardConfig().get("build.arduino.memory_type", "qio_qspi")
     mode = env.subst("$BOARD_FLASH_MODE")
-    if mode == "qio" or mode == "qout":
-        return "dio"
-    if memory_type == "opi_opi" or memory_type == "opi_qspi":
+    if memory_type in ("opi_opi", "opi_qspi"):
         return "dout"
+    if mode in ("qio", "qout"):
+        return "dio"
     return mode
 
 
 def _get_board_boot_mode(env):
-    return env.BoardConfig().get("build.boot", "$BOARD_FLASH_MODE")
+    memory_type = env.BoardConfig().get("build.arduino.memory_type", "qio_qspi")
+    build_boot = env.BoardConfig().get("build.boot", "$BOARD_FLASH_MODE")
+    if memory_type in ("opi_opi", "opi_qspi"):
+        build_boot = "opi"
+    return build_boot
 
 
 def _parse_size(value):
@@ -324,47 +328,6 @@ def __fetch_fs_size(target, source, env):
     "Calculate program size",
 )
 
-# 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 adjust the bootloader binary 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.
-bootloader_patch_required = bool(
-    env.get("PIOFRAMEWORK", []) == ["arduino"]
-    and (
-        "debug" in env.GetBuildType()
-        or env.subst("$UPLOAD_PROTOCOL") in board.get("debug.tools", {})
-    )
-)
-
-if bootloader_patch_required:
-    result = []
-    for offset, image in env.get("FLASH_EXTRA_IMAGES", []):
-        # 0x1000 for ESP32/S2, 0x0 for others
-        default_bootloader_offsets = ("0x0", "0x0000", "0x1000")
-        if offset in default_bootloader_offsets:
-            original_bootloader_path = env.subst(image)
-            image = join(env.subst("$BUILD_DIR"), "patched_bootloader.bin")
-            env.AddPreAction(
-                target_elf,
-                env.VerboseAction(" ".join([
-                    '"$PYTHONEXE"',
-                    join(platform.get_package_dir("tool-esptoolpy") or "", "esptool.py"),
-                    "--chip", mcu, "merge_bin",
-                    "-o", '"%s"' % image,
-                    "--flash_mode", _get_board_flash_mode(env),
-                    "--flash_freq", _get_board_f_flash(env),
-                    "--flash_size", board.get("upload.flash_size", "4MB"),
-                    "--target-offset", offset,
-                    offset, '"%s"' % original_bootloader_path
-                ]), "Updating bootloader headers")
-            )
-
-        result.append((offset, image))
-
-    env.Replace(FLASH_EXTRA_IMAGES=result)
-
 #
 # Target: Upload firmware or FS image
 #
@@ -550,13 +513,6 @@ 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
 #

diff --git a/examples/arduino-blink/.travis.yml b/examples/arduino-blink/.travis.yml
diff --git a/examples/arduino-briki-internal-libs/.travis.yml b/examples/arduino-briki-internal-libs/.travis.yml