diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 107f2ef..0b8e356 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -59,12 +59,15 @@ TOOLCHAIN_DIR = platform.get_package_dir( ) ) +# Legacy toolchains for mixed IDF/Arduino projects +if "arduino" in env.subst("$PIOFRAMEWORK"): + TOOLCHAIN_DIR = platform.get_package_dir("toolchain-xtensa32") + assert os.path.isdir(FRAMEWORK_DIR) assert os.path.isdir(TOOLCHAIN_DIR) # Arduino framework as a component is not compatible with ESP-IDF >=4.1 if "arduino" in env.subst("$PIOFRAMEWORK"): - TOOLCHAIN_DIR = platform.get_package_dir("toolchain-xtensa32") ARDUINO_FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32") # Possible package names in 'package@version' format is not compatible with CMake if "@" in os.path.basename(ARDUINO_FRAMEWORK_DIR):