Merge branch 'idf_installer_hybrid' into dev_merge_install

Author: Jason2866

builder/frameworks/arduino.py

@@ -197,4 +197,6 @@ def call_compile_libs():
         PIO_BUILD = "platformio-build.py"
     else:
         PIO_BUILD = "pioarduino-build.py"
-    SConscript(join(platform.get_package_dir("framework-arduinoespressif32"), "tools", PIO_BUILD))
+    SConscript(
+        join(DefaultEnvironment().PioPlatform().get_package_dir(
+            "framework-arduinoespressif32"), "tools", PIO_BUILD))

builder/frameworks/espidf.py

@@ -137,9 +137,9 @@ def _get_installed_standard_pip_packages():
 IDF_ENV_VERSION = "1.0.0"
 FRAMEWORK_DIR = platform.get_package_dir("framework-espidf")
 TOOLCHAIN_DIR = platform.get_package_dir(
-    "toolchain-xtensa-esp-elf"
+    "xtensa-esp-elf"
     if mcu in ("esp32", "esp32s2", "esp32s3")
-    else "toolchain-riscv32-esp"
+    else "riscv32-esp-elf"
 )
 
 

builder/frameworks/ulp.py

@@ -36,13 +36,13 @@ def prepare_ulp_env_vars(env):
     ulp_env.PrependENVPath("IDF_PATH", FRAMEWORK_DIR)
 
     toolchain_path = platform.get_package_dir(
-        "toolchain-xtensa-esp-elf"
+        "xtensa-esp-elf"
         if idf_variant not in ("esp32c6", "esp32p4")
-        else "toolchain-riscv32-esp"
+        else "riscv32-esp-elf"
     )
 
     toolchain_path_ulp = platform.get_package_dir(
-        "toolchain-esp32ulp"
+        "esp32ulp-elf"
         if sdk_config.get("ULP_COPROC_TYPE_FSM", False)
         else ""
     )

builder/main.py

@@ -254,9 +254,9 @@ def __fetch_fs_size(target, source, env):
     CXX="%s-elf-g++" % toolchain_arch,
     GDB=join(
         platform.get_package_dir(
-            "tool-riscv32-esp-elf-gdb"
+            "riscv32-esp-elf-gdb"
             if mcu in ("esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32p4")
-            else "tool-xtensa-esp-elf-gdb"
+            else "xtensa-esp-elf-gdb"
         )
         or "",
         "bin",
@@ -487,7 +487,7 @@ def __fetch_fs_size(target, source, env):
 
     env.Replace(
         UPLOADER=join(
-            platform.get_package_dir("tool-dfuutil-arduino") or "", "dfu-util"
+            platform.get_package_dir("tool-dfuutil") or "", "dfu-util"
         ),
         UPLOADERFLAGS=[
             "-d",
@@ -531,7 +531,7 @@ def __fetch_fs_size(target, source, env):
         f.replace(
             "$PACKAGE_DIR",
             _to_unix_slashes(
-                platform.get_package_dir("tool-openocd-esp32") or ""))
+                platform.get_package_dir("tool-openocd") or ""))
         for f in openocd_args
     ]
     env.Replace(

examples/espidf-arduino-littlefs/platformio.ini

@@ -11,14 +11,17 @@
 [env]
 platform = espressif32
 framework = arduino, espidf
+board_build.filesystem = littlefs
+board_build.partitions = partitions_custom.csv
 monitor_speed = 115200
+
+[env:esp32dev]
+board = esp32dev
 board_build.embed_txtfiles =
     managed_components/espressif__esp_insights/server_certs/https_server.crt
     managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
     managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
     managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
 
-[env:esp32dev]
-board = esp32dev
-board_build.filesystem = littlefs
-board_build.partitions = partitions_custom.csv
+[env:esp32-c2-devkitm-1]
+board = esp32-c2-devkitm-1

platform.json

@@ -41,91 +41,122 @@
       "owner": "espressif",
       "version": ""
     },
-    "framework-arduino-c2-skeleton-lib": {
-      "type": "framework",
-      "optional": true,
-      "owner": "espressif",
-      "version": "https://github.com/pioarduino/platform-espressif32/releases/download/53.03.10-rc3/c2_arduino_compile_skeleton.zip"
-    },
     "framework-espidf": {
       "type": "framework",
       "optional": true,
       "owner": "pioarduino",
       "version": "https://github.com/pioarduino/esp-idf/releases/download/v5.3.2.241012/esp-idf-v5.3.2.zip"
     },
-    "toolchain-xtensa-esp-elf": {
+    "xtensa-esp-elf": {
       "type": "toolchain",
       "optional": true,
-      "owner": "platformio",
-      "version": "13.2.0+20240530"
+      "owner": "",
+      "version": ""
     },
-    "toolchain-riscv32-esp": {
+    "riscv32-esp-elf": {
       "type": "toolchain",
       "optional": true,
-      "owner": "platformio",
-      "version": "13.2.0+20240530"
+      "owner": "",
+      "version": ""
     },
-    "toolchain-esp32ulp": {
+    "esp32ulp-elf": {
       "type": "toolchain",
       "optional": true,
-      "owner": "platformio",
-      "version": "~1.23800.0"
+      "owner": "",
+      "version": ""
     },
-      "tool-xtensa-esp-elf-gdb": {
+    "xtensa-esp-elf-gdb": {
       "type": "debugger",
       "optional": true,
-      "owner": "platformio",
-      "version": "14.2.0+20240403"
+      "owner": "",
+      "version": ""
     },
-    "tool-riscv32-esp-elf-gdb": {
+    "riscv32-esp-elf-gdb": {
       "type": "debugger",
       "optional": true,
-      "owner": "platformio",
-      "version": "14.2.0+20240403"
+      "owner": "",
+      "version": ""
     },
     "tool-esptoolpy": {
       "type": "uploader",
+      "optional": false,
       "owner": "pioarduino",
       "version": "https://github.com/pioarduino/esptool/releases/download/v4.8.5/esptool.zip"
     },
-    "tool-dfuutil-arduino": {
+    "tl-install": {
+      "optional": false,
+      "owner": "pioarduino",
+      "version": "https://github.com/pioarduino/esp_install/releases/download/v2.0.0/esp_install-v2.0.0.zip"
+    },
+    "tool-scons": {
+      "optional": true,
+      "owner": "",
+      "version": "https://github.com/pioarduino/scons/releases/download/4.8.1/scons-local-4.8.1.tar.gz"
+    },
+    "tool-cmake": {
+      "optional": true,
+      "owner": "",
+      "version": ""
+    },
+    "tool-ninja": {
+      "optional": true,
+      "owner": "",
+      "version": ""
+    },
+    "tool-dfuutil": {
       "type": "uploader",
       "optional": true,
-      "owner": "platformio",
-      "version": "~1.11.0"
+      "owner": "",
+      "version": ""
     },
-    "tool-openocd-esp32": {
+    "tool-openocd": {
       "type": "debugger",
       "optional": true,
-      "owner": "platformio",
-      "version": "~2.1100.0"
+      "owner": "",
+      "version": ""
     },
     "tool-mklittlefs": {
       "type": "uploader",
-      "owner": "tasmota",
-      "version": "^3.2.0"
+      "optional": true,
+      "owner": "",
+      "version": ""
     },
     "tool-mkfatfs": {
       "type": "uploader",
       "optional": true,
-      "owner": "platformio",
-      "version": "~2.0.0"
+      "owner": "",
+      "version": ""
     },
     "tool-mkspiffs": {
       "type": "uploader",
       "optional": true,
-      "owner": "platformio",
-      "version": "~2.230.0"
+      "owner": "",
+      "version": ""
     },
-    "tool-cmake": {
+    "tool-cppcheck": {
       "optional": true,
-      "owner": "platformio",
-      "version": "~3.21.0"
+      "owner": "",
+      "version": ""
     },
-    "tool-ninja": {
+    "tool-clangtidy": {
       "optional": true,
-      "owner": "platformio",
-      "version": "^1.7.0"
+      "owner": "",
+      "version": ""
+    },
+    "tool-pvs-studio": {
+      "optional": true,
+      "owner": "",
+      "version": ""
+    },
+    "contrib-piohome": {
+      "optional": true,
+      "owner": "",
+      "version": ""
+    },
+    "contrib-pioremote": {
+      "optional": true,
+      "owner": "",
+      "version": ""
     }
   }
 }