Merge branch 'release/v6.11.0'

Author: valeros

boards/freenove_esp32_wrover.json

@@ -23,7 +23,7 @@
     "can"
   ],
   "debug": {
-    "openocd_board": "esp-wrover-32.cfg"
+    "openocd_board": "esp32-wrover.cfg"
   },
   "frameworks": [
     "arduino",

boards/lilygo-t-display.json

@@ -39,6 +39,6 @@
     "require_upload_port": true,
     "speed": 460800
   },
-  "url": "hhttps://www.lilygo.cc/products/lilygo%C2%AE-ttgo-t-display-1-14-inch-lcd-esp32-control-board",
+  "url": "https://www.lilygo.cc/products/lilygo%C2%AE-ttgo-t-display-1-14-inch-lcd-esp32-control-board",
   "vendor": "LilyGo"
 }

boards/minimain_esp32s2.json

@@ -46,5 +46,5 @@
     "speed": 460800
   },
   "url": "https://github.com/DepartmentOfAlchemy/minimain-esp32-s2",
-  "vendor": "Deparment of Alchemy"
+  "vendor": "Department of Alchemy"
 }

boards/seeed_xiao_esp32c6.json

@@ -0,0 +1,41 @@
+{
+  "build": {
+    "core": "esp32",
+    "f_cpu": "160000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0x2886",
+        "0x0048"
+      ],
+      [
+        "0x2886",
+        "0x8048"
+      ]
+    ],
+    "mcu": "esp32c6"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "zigbee",
+    "thread"
+  ],
+  "debug": {
+    "openocd_target": "esp32c6.cfg"
+  },
+  "frameworks": [
+    "espidf"
+  ],
+  "name": "Seeed Studio XIAO ESP32C6",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://wiki.seeedstudio.com/XIAO_ESP32C6_Getting_Started/",
+  "vendor": "Seeed Studio"
+}

builder/frameworks/espidf.py

@@ -284,6 +284,8 @@ def populate_idf_env_vars(idf_env):
     if board.get("build.esp-idf.overwrite_managed_components", "yes") == "yes":
         idf_env["IDF_COMPONENT_OVERWRITE_MANAGED_COMPONENTS"] = "1"
 
+    idf_env["ESP_ROM_ELF_DIR"] = platform.get_package_dir("tool-esp-rom-elfs")
+
 
 def get_target_config(project_configs, target_index, cmake_api_reply_dir):
     target_json = project_configs.get("targets")[target_index].get("jsonFile", "")
@@ -1277,14 +1279,17 @@ def _get_installed_pip_packages(python_exe_path):
         # https://github.com/platformio/platformio-core/issues/4614
         "urllib3": "<2",
         # https://github.com/platformio/platform-espressif32/issues/635
-        "cryptography": "~=41.0.1" if IDF5 else ">=2.1.4,<35.0.0",
-        "future": ">=0.18.3",
+        "cryptography": "~=44.0.0" if IDF5 else ">=2.1.4,<35.0.0",
         "pyparsing": ">=3.1.0,<4" if IDF5 else ">=2.0.3,<2.4.0",
-        "kconfiglib": "~=14.1.0" if IDF5 else "~=13.7.1",
         "idf-component-manager": "~=1.5.2" if IDF5 else "~=1.0",
-        "esp-idf-kconfig": ">=1.4.2,<2.0.0"
+        "esp-idf-kconfig": "~=2.5.0"
     }
 
+    if not IDF5:
+        deps["kconfiglib"] = "~=13.7.1"
+        deps["future"] = ">=0.18.3"
+        deps["esp-idf-kconfig"] = ">=1.4.2,<2.0.0"
+
     if sys_platform.system() == "Darwin" and "arm" in sys_platform.machine().lower():
         deps["chardet"] = ">=3.0.2,<4"
 

monitor/filter_exception_decoder.py

@@ -32,7 +32,7 @@
 class Esp32ExceptionDecoder(DeviceMonitorFilterBase):
     NAME = "esp32_exception_decoder"
 
-    ADDR_PATTERN = re.compile(r"((?:0x[0-9a-fA-F]{8}[: ]?)+)\s?$")
+    ADDR_PATTERN = re.compile(r"((?:0x[0-9a-fA-F]{8}[: ]?)+)")
     ADDR_SPLIT = re.compile(r"[ :]")
     PREFIX_RE = re.compile(r"^ *")
 

platform.json

@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif32.git"
   },
-  "version": "6.10.0",
+  "version": "6.11.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduinoespressif32",
@@ -88,7 +88,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~3.50400.0",
+      "version": "~3.50401.0",
       "optionalVersions": ["~3.40407.0"]
     },
     "tool-esptoolpy": {
@@ -145,6 +145,11 @@
       "optional": true,
       "owner": "platformio",
       "version": "~1.0.1"
+    },
+    "tool-esp-rom-elfs": {
+      "optional": true,
+      "owner": "platformio",
+      "version": "0.0.1+20241011"
     }
   }
 }

platform.py

@@ -106,7 +106,12 @@ def configure_default_packages(self, variables, targets):
 
             # Common packages for IDF and mixed Arduino+IDF projects
             for p in self.packages:
-                if p in ("tool-cmake", "tool-ninja", "toolchain-esp32ulp"):
+                if p in (
+                    "tool-cmake",
+                    "tool-ninja",
+                    "toolchain-esp32ulp",
+                    "tool-esp-rom-elfs",
+                ):
                     self.packages[p]["optional"] = False
                 elif p in ("tool-mconf", "tool-idf") and IS_WINDOWS:
                     self.packages[p]["optional"] = False