From ca8f5c6519b2e41c6c3fce8929b132af3b731cd9 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 18 Sep 2024 18:46:14 +0200 Subject: [PATCH] Tasmota Arduino Core 3.0.5 --- .github/workflows/examples.yml | 2 +- builder/main.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index cf4affcb7..6d040bd0d 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -44,7 +44,7 @@ jobs: run: | python -m pip install --upgrade pip pip install wheel - pip install -U https://github.com/Jason2866/platformio-core/archive/rm_telemetry.zip + pip install -U https://github.com/Jason2866/platformio-core/archive/refs/tags/v6.1.16+free.zip pio pkg install --global --platform symlink://. - name: git clone Tasmota and add to examples if: "matrix.example == 'examples/tasmota' && matrix.os != 'windows-2022'" diff --git a/builder/main.py b/builder/main.py index 23c3bc37a..dcc577d68 100644 --- a/builder/main.py +++ b/builder/main.py @@ -261,12 +261,9 @@ def __fetch_fs_size(target, source, env): GDB=join( platform.get_package_dir( "tool-riscv32-esp-elf-gdb" - if mcu in ("esp32c2", "esp32c3", "esp32c6") + if mcu in ("esp32c2", "esp32c3", "esp32c6", "esp32h2") else "tool-xtensa-esp-elf-gdb" ) - or "", - "bin", - "%s-elf-gdb" % toolchain_arch, ), OBJCOPY=join(platform.get_package_dir("tool-esptoolpy") or "", "esptool.py"), RANLIB="%s-elf-gcc-ranlib" % toolchain_arch, @@ -326,7 +323,7 @@ def __fetch_fs_size(target, source, env): "-b", "$FS_BLOCK", ] - if filesystem in ("littlefs") + if filesystem in ("littlefs", "spiffs") else [] ) + ["$TARGET"]