From 82ed096be30b8d9496afb240265029480ca62029 Mon Sep 17 00:00:00 2001 From: vidplace7 Date: Wed, 20 Aug 2025 11:06:05 -0400 Subject: [PATCH] Update platformio/espressif32 to v6.12.0 --- arch/esp32/esp32.ini | 2 +- bin/platformio-custom.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini index d2c933461..b2de66858 100644 --- a/arch/esp32/esp32.ini +++ b/arch/esp32/esp32.ini @@ -4,7 +4,7 @@ extends = arduino_base custom_esp32_kind = esp32 platform = # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32 - platformio/espressif32@6.11.0 + platformio/espressif32@6.12.0 build_src_filter = ${arduino_base.build_src_filter} - - - - - diff --git a/bin/platformio-custom.py b/bin/platformio-custom.py index 4a1887d9d..090fc5e14 100644 --- a/bin/platformio-custom.py +++ b/bin/platformio-custom.py @@ -65,6 +65,12 @@ def esp32_create_combined_bin(source, target, env): if platform.name == "espressif32": sys.path.append(join(platform.get_package_dir("tool-esptoolpy"))) + # IntelHex workaround, remove after fixed upstream + # https://github.com/platformio/platform-espressif32/issues/1632 + try: + import intelhex + except ImportError: + env.Execute("$PYTHONEXE -m pip install intelhex") import esptool env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)