205merge (#29)

* Tasmota github as source

* --dont-append-digest

* esptool v4.1

* 2.0.5dev

* platformio": ">=6.1.0

* Update espidf.py

* Add default nameOnDisk value for external CMake projects

* Build 918

newest wifi libs from idf44

* Tasmota IDF 4.4.3

* Tasmota release Core 2.0.4.1

* Merge firmware before flashing via OpenOCD

* Merge firmware before flashing via OpenOCD

* Update arduino.py

* Update espidf.py

* update boards 1/2

* Update Boards 2/2

* v2.0.4.1

* Mode qio

* Board supports qio

* OpenOCD has now apple ARM support

* rm custom OpenOCD

* fix install OpenOCD

* Allow overriding reset operation via project file

* flash options from env for uploadfs

* revert

* flash options from env for uploadfs

* no .DS_Store

* fix boot flash mode

* refactor

* Esptool.py v4.2.1

* Update bootloader image headers before debugging or uploading via deb…

…ug tools
This approach is less intrusive than merging the entire application into one binary
implemented in #006d64e8b268e479703a0aac7eed8bef1ebea587

In this implementation we safely copy the required bootloader binary to the
build directory, adjust the headers via esptoolpy and the "merge_bin" command
according to --flash-size and --flash-mode arguments.

* better specs

* replace deprecated flash modes

* Board support faster flash mode

* now "memory_type": "qio_opi"

* qio

* opi flash needs flash mode `dout`

flash mode `dio `works for `qout` as mode too

* 8 MB

* Tasmota/205

* Update IDF to 4.4.3.1

* Use S2 / S3 / C3 as board

* cmake v3.21

* core pre 2.0.5

* Move the process of patching bootloader to the Arduino build script

* Remove obsolete workaround for propagating debug configurations

* Update platform.py

* Update platform.json

* Update sdkconfig.defaults

* PSK needed for wifi

* Update Arduino / IDF

* Update platform.json

* Update platform.json

* Update main.py

* Update platform.py

* flash mode `dout` for opi

* rm litter

* 16MB flash

* framework now as zip

* Apple ARM toolchain 8.4.0-2021r2-patch4

* more "pythonic"

Author: Jason2866

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,

builder/main.py

@@ -51,10 +51,10 @@ 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
 
 
@@ -324,47 +324,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 +509,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
 #

platform.json

@@ -37,7 +37,7 @@
       "type": "framework",
       "optional": true,
       "owner": "tasmota",
-      "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/987/framework-arduinoespressif32-IDF_Arduino-83797312d3.tar.gz"
+      "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/990/framework-arduinoespressif32-IDF_Arduino-bce2fe1fd3.zip"
     },
     "framework-espidf": {
       "type": "framework",
@@ -73,25 +73,25 @@
       "type": "toolchain",
       "optional": true,
       "owner": "tasmota",
-      "version": "https://github.com/Jason2866/crosstool-NG/releases/download/8.4.0/toolchain-xtensa-esp32.tar.gz"
+      "version": "https://github.com/Jason2866/crosstool-NG/releases/download/v8.4.0/xtensa-esp32-elf.tar.gz"
     },
     "toolchain-xtensa-esp32s2-arm": {
       "type": "toolchain",
       "optional": true,
       "owner": "tasmota",
-      "version": "https://github.com/Jason2866/crosstool-NG/releases/download/8.4.0/toolchain-xtensa-esp32s2.tar.gz"
+      "version": "https://github.com/Jason2866/crosstool-NG/releases/download/v8.4.0/xtensa-esp32s2-elf.tar.gz"
     },
     "toolchain-xtensa-esp32s3-arm": {
       "type": "toolchain",
       "optional": true,
       "owner": "tasmota",
-      "version": "https://github.com/Jason2866/crosstool-NG/releases/download/8.4.0/toolchain-xtensa-esp32s3.tar.gz"
+      "version": "https://github.com/Jason2866/crosstool-NG/releases/download/v8.4.0/xtensa-esp32s3-elf.tar.gz"
     },
     "toolchain-riscv32-esp-arm": {
       "type": "toolchain",
       "optional": true,
       "owner": "tasmota",
-      "version": "https://github.com/Jason2866/crosstool-NG/releases/download/8.4.0/toolchain-riscv32-esp.tar.gz"
+      "version": "https://github.com/Jason2866/crosstool-NG/releases/download/v8.4.0/riscv32-esp-elf.tar.gz"
     },
     "toolchain-esp32ulp": {
       "type": "toolchain",

platform.py

@@ -275,23 +275,16 @@ def configure_debug_session(self, debug_config):
         if any(ignore_conds):
             return
 
-        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 = [
+            '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]
-                    + ("_merged" if merged_firmware else "")
-                ),
+                to_unix_path(debug_config.build_data["prog_path"][:-4]),
                 build_extra_data.get("application_offset", "0x10000"),
             )
         )