Merge 57b9da5fb6 into 834c3c5cc2

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} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>

bin/platformio-custom.py

@@ -63,6 +63,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)