Fix compile Arduino as an component of IDF for C2

Author: Jason2866

builder/frameworks/arduino.py

@@ -230,6 +230,20 @@ def shorthen_includes(env, node):
         + shortened_includes,
     )
 
+# Check if framework = arduino, espidf is set -> compile Arduino as an component of IDF
+# using platformio.ini entry since we modify the framework env var for Hybrid Compile!
+def get_frameworks_in_current_env():
+    current_env_section = "env:" + env["PIOENV"]
+    if "framework" in config.options(current_env_section):
+        frameworks = config.get(current_env_section, "framework", "")
+        return frameworks
+    return []
+
+current_env_frameworks = get_frameworks_in_current_env()
+if "arduino" in current_env_frameworks and "espidf" in current_env_frameworks:
+    # Arduino as component is set, switch off Hybrid compile
+    flag_custom_sdkconfig = False
+
 def call_compile_libs():
     if mcu == "esp32c2":
         ARDUINO_FRMWRK_C2_LIB_DIR = join(platform.get_package_dir("framework-arduinoespressif32-libs"),mcu)

builder/frameworks/espidf.py

@@ -155,10 +155,14 @@ def _get_installed_standard_pip_packages():
 ):
     print("Warning! Debugging an IDF project requires PlatformIO Core >= 6.1.11!")
 
-# Arduino framework as a component is not compatible with ESP-IDF >5.3
 if "arduino" in env.subst("$PIOFRAMEWORK"):
     ARDUINO_FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32")
     ARDUINO_FRMWRK_LIB_DIR = platform.get_package_dir("framework-arduinoespressif32-libs")
+    if mcu == "esp32c2":
+        ARDUINO_FRMWRK_C2_LIB_DIR = join(platform.get_package_dir("framework-arduinoespressif32-libs"),mcu)
+        if not os.path.exists(ARDUINO_FRMWRK_C2_LIB_DIR):
+            ARDUINO_C2_DIR = join(platform.get_package_dir("framework-arduino-c2-skeleton-lib"),mcu)
+            shutil.copytree(ARDUINO_C2_DIR, ARDUINO_FRMWRK_C2_LIB_DIR, dirs_exist_ok=True)
     # Possible package names in 'package@version' format is not compatible with CMake
     if "@" in os.path.basename(ARDUINO_FRAMEWORK_DIR):
         new_path = os.path.join(
@@ -296,7 +300,7 @@ def HandleCOMPONENTsettings(env):
     if flag_custom_component_add == True or flag_custom_component_remove == True: # todo remove duplicated
         import yaml
         from yaml import SafeLoader
-        print("*** \"custom_component\" is used to select managed idf components ***")
+        print("*** \"custom_component\" is used to (de)select managed idf components ***")
         if flag_custom_component_remove == True:
             idf_custom_component_remove = env.GetProjectOption("custom_component_remove").splitlines()
         else:
@@ -365,7 +369,7 @@ def HandleCOMPONENTsettings(env):
 if flag_custom_component_add == True or flag_custom_component_remove == True:
     HandleCOMPONENTsettings(env)
 
-if flag_custom_sdkonfig == True and "arduino" in env.subst("$PIOFRAMEWORK"):
+if flag_custom_sdkonfig == True and "arduino" in env.subst("$PIOFRAMEWORK") and "espidf" not in env.subst("$PIOFRAMEWORK"):
     HandleArduinoIDFsettings(env)
     LIB_SOURCE = os.path.join(ProjectConfig.get_instance().get("platformio", "platforms_dir"), "espressif32", "builder", "build_lib")
     if not bool(os.path.exists(os.path.join(PROJECT_DIR, ".dummy"))):
@@ -2056,7 +2060,7 @@ def _skip_prj_source_files(node):
 # Compile Arduino IDF sources
 #
 
-if "arduino" in env.get("PIOFRAMEWORK") and "espidf" not in env.get("PIOFRAMEWORK"):
+if ("arduino" in env.subst("$PIOFRAMEWORK")) and ("espidf" not in env.subst("$PIOFRAMEWORK")):
     def idf_lib_copy(source, target, env):
         env_build = join(env["PROJECT_BUILD_DIR"],env["PIOENV"])
         sdkconfig_h_path = join(env_build,"config","sdkconfig.h")
@@ -2114,7 +2118,7 @@ def idf_lib_copy(source, target, env):
                 print("*** Original Arduino \"idf_component.yml\" couldnt be restored ***")
     env.AddPostAction("checkprogsize", idf_lib_copy)
 
-if "espidf" in env.get("PIOFRAMEWORK") and (flag_custom_component_add == True or flag_custom_component_remove == True):
+if "espidf" in env.subst("$PIOFRAMEWORK") and (flag_custom_component_add == True or flag_custom_component_remove == True):
     def idf_custom_component(source, target, env):
         try:
             shutil.copy(join(ARDUINO_FRAMEWORK_DIR,"idf_component.yml.orig"),join(ARDUINO_FRAMEWORK_DIR,"idf_component.yml"))

examples/tasmota_platformio_override.ini

@@ -37,8 +37,7 @@ custom_sdkconfig        = https://raw.githubusercontent.com/pioarduino/sdkconfig
                           '# CONFIG_ETH_PHY_INTERFACE_RMII is not set'
                           '# CONFIG_ETH_RMII_CLK_INPUT is not set'
                           '# CONFIG_ETH_RMII_CLK_IN_GPIO is not set'
-custom_component_remove = espressif/esp_hosted
-                          espressif/esp_wifi_remote
+custom_component_remove =
                           espressif/esp-dsp
                           espressif/network_provisioning
                           espressif/esp-zboss-lib

platform.json

@@ -6,13 +6,13 @@
   "license": "Apache-2.0",
   "keywords": [
     "dev-platform",
-    "Wi-Fi",
+    "WiFi",
     "Bluetooth",
     "Xtensa",
     "RISC-V"
   ],
   "engines": {
-    "platformio": ">=6.1.16"
+    "platformio": ">=6.1.18"
   },
   "repository": {
     "type": "git",

platform.py

@@ -68,9 +68,6 @@ def configure_default_packages(self, variables, targets):
         core_variant_build = (''.join(variables.get("build_flags", []))).replace("-D", " ")
         frameworks = variables.get("pioframework", [])
 
-        if variables.get("custom_sdkconfig") is not None:
-            frameworks.append("espidf")
-
         # Enable debug tool gdb only when build debug is enabled
         if (variables.get("build_type") or "debug" in "".join(targets)) and tl_flag:
             self.packages["riscv32-esp-elf-gdb"]["optional"] = False if mcu in ["esp32c2", "esp32c3", "esp32c5", "esp32c6", "esp32h2", "esp32p4"] else True