espressif · me-no-dev · Jan 21, 2025 · Jan 21, 2025 · Jan 27, 2025 · Apr 23, 2025
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4]
+        target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4, esp32c5]
       fail-fast: false
     steps:
     - name: Checkout repository

diff --git a/clean.sh b/clean.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+rm -rf out build dist managed_components sdkconfig
diff --git a/configs/builds.json b/configs/builds.json
@@ -4,7 +4,7 @@
 			"file":"libspi_flash.a",
 			"src":"build/esp-idf/spi_flash/libspi_flash.a",
 			"out":"lib/libspi_flash.a",
-			"targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2","esp32p4"]
+			"targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2","esp32p4","esp32c5"]
 		},
 		{
 			"file":"libesp_psram.a",
@@ -44,6 +44,20 @@
 		}
 	],
 	"targets":[
+		{
+			"target": "esp32c5",
+			"features":["qio_ram"],
+			"idf_libs":["qio","80m"],
+			"bootloaders":[
+				["qio","80m"],
+				["dio","80m"],
+				["qio","40m"],
+				["dio","40m"]
+			],
+			"mem_variants":[
+				["dio","80m"]
+			]
+		},
 		{
 			"target": "esp32p4",
 			"features":["qio_ram"],

diff --git a/configs/defconfig.common b/configs/defconfig.common
@@ -125,12 +125,17 @@ CONFIG_I2S_ISR_IRAM_SAFE=y
 # Matter Settings
 #
 # Disable Matter BLE
-CONFIG_ENABLE_CHIPOBLE=n
 CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
 # ESP Insights
 CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n
 # Use compact attribute storage mode
 CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
+# Do not use minimal mDNS within Matter Core
+CONFIG_USE_MINIMAL_MDNS=n
+# Changes Matter Memory Allocation Mode to use the default malloc() that can use PSRAM is enabled
+CONFIG_ESP_MATTER_MEM_ALLOC_MODE_DEFAULT=y
+# Disable default mode that only allocates memory from DRAM
+CONFIG_ESP_MATTER_MEM_ALLOC_MODE_INTERNAL=n
 
 #TinyUSB Config
 CONFIG_TINYUSB_CDC_MAX_PORTS=2

diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
@@ -20,3 +20,9 @@ CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
 CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=4096
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=n
+# increase the maximum number of endpoints per device
+CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=32
+
diff --git a/configs/defconfig.esp32c2 b/configs/defconfig.esp32c2
@@ -1,7 +1,12 @@
 CONFIG_XTAL_FREQ_26=y
 CONFIG_XTAL_FREQ=26
 CONFIG_BT_ENABLED=y
-CONFIG_BT_BLE_BLUFI_ENABLE=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_BLUFI_ENABLE=y
 CONFIG_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304

diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3
@@ -2,8 +2,16 @@ CONFIG_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_ESP_WIFI_11KV_SUPPORT=y
 CONFIG_ESP_WIFI_SCAN_CACHE=y
 CONFIG_ESP_WIFI_MBO_SUPPORT=y
 CONFIG_ESP_WIFI_11R_SUPPORT=y
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=4096
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=y
diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5
@@ -0,0 +1,66 @@
+CONFIG_XTAL_FREQ_AUTO=y
+CONFIG_XTAL_FREQ=0
+CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_SPIRAM=y
+
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_BLUFI_ENABLE=y
+CONFIG_RTC_CLK_CAL_CYCLES=576
+# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
+CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
+# This Enables RISCV LP for C6 - but it can't be used within Arduino at this time. 
+#CONFIG_ULP_COPROC_ENABLED=y
+#CONFIG_ULP_COPROC_LP_CORE=y
+#CONFIG_ULP_COPROC_RESERVE_MEM=4096
+
+#
+# OpenThread
+#
+CONFIG_OPENTHREAD_ENABLED=y
+# Border Router disabled
+# CONFIG_OPENTHREAD_BORDER_ROUTER=y
+# CONFIG_OPENTHREAD_RADIO_SPINEL_UART=y
+
+# DNS64 and NAT64 will be disabled for a while
+# OT IDF issue https://github.com/espressif/esp-idf/issues/15069
+# CONFIG_OPENTHREAD_DNS64_CLIENT=y
+
+# Radio for RPC
+# CONFIG_OPENTHREAD_RADIO=y 
+# CONFIG_OPENTHREAD_RADIO_NATIVE=y
+# CONFIG_OPENTHREAD_DIAG=n
+CONFIG_OPENTHREAD_COMMISSIONER=y
+CONFIG_OPENTHREAD_JOINER=y
+CONFIG_OPENTHREAD_CLI=y
+CONFIG_OPENTHREAD_SRP_CLIENT=y
+CONFIG_OPENTHREAD_DNS_CLIENT=y
+# Default dataset for quick start
+CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread-ESP"
+CONFIG_OPENTHREAD_MESH_LOCAL_PREFIX="fd00:db8:a0:0::/64"
+CONFIG_OPENTHREAD_NETWORK_CHANNEL=15
+CONFIG_OPENTHREAD_NETWORK_PANID=0x1234
+CONFIG_OPENTHREAD_NETWORK_EXTPANID="dead00beef00cafe"
+CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
+CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
+# end of OpenThread
+
+# Matter settings: OpenThread + CHIPoBLE
+CONFIG_ENABLE_CHIPOBLE=y
+CONFIG_ENABLE_MATTER_OVER_THREAD=y
+# Disable Matter over WiFi
+CONFIG_ENABLE_WIFI_AP=n
+CONFIG_ENABLE_WIFI_STATION=n
+
+#
+# Zigbee
+#
+CONFIG_ZB_ENABLED=y
+CONFIG_ZB_ZED=y
+CONFIG_ZB_RADIO_NATIVE=y
+# end of Zigbee
diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6
@@ -1,5 +1,10 @@
 CONFIG_BT_ENABLED=y
-CONFIG_BT_BLE_BLUFI_ENABLE=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_BLUFI_ENABLE=y
 CONFIG_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
@@ -39,8 +44,14 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
 CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 # end of OpenThread
 
-# Matter shall use only WiFi
-CONFIG_ENABLE_MATTER_OVER_THREAD=n
+# Matter settings: WiFi and OpenThread + CHIPoBLE
+CONFIG_ENABLE_CHIPOBLE=y
+CONFIG_ENABLE_MATTER_OVER_THREAD=y
+# Set endpoint id for Thread and Wi-Fi, depending on the secondary network interface endpoint id.
+CONFIG_THREAD_NETWORK_ENDPOINT_ID=2
+CONFIG_WIFI_NETWORK_ENDPOINT_ID=0
+# increase the maximum number of endpoints per device
+CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=32
 
 #
 # Zigbee

diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2
@@ -1,5 +1,10 @@
 CONFIG_BT_ENABLED=y
-CONFIG_BT_BLE_BLUFI_ENABLE=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_BLUFI_ENABLE=y
 CONFIG_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
@@ -35,6 +40,13 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
 CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 # end of OpenThread
 
+# Matter settings: OpenThread + CHIPoBLE
+CONFIG_ENABLE_CHIPOBLE=y
+CONFIG_ENABLE_MATTER_OVER_THREAD=y
+# Disable Matter over WiFi
+CONFIG_ENABLE_WIFI_AP=n
+CONFIG_ENABLE_WIFI_STATION=n
+
 #
 # Zigbee
 #

diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
@@ -15,3 +15,6 @@ CONFIG_ULP_COPROC_ENABLED=y
 CONFIG_ULP_COPROC_TYPE_FSM=y
 # CONFIG_ULP_COPROC_TYPE_RISCV=y
 CONFIG_ULP_COPROC_RESERVE_MEM=512
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=n
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
@@ -1,4 +1,9 @@
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
 CONFIG_SPIRAM=y
@@ -21,3 +26,9 @@ CONFIG_ULP_COPROC_RESERVE_MEM=512
 # RGB Display Optimizations
 # CONFIG_LCD_RGB_ISR_IRAM_SAFE is not set
 CONFIG_LCD_RGB_RESTART_IN_VSYNC=y
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=y
+# increase the maximum number of endpoints per device
+CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=32
+
diff --git a/configs/defconfig.qio_ram b/configs/defconfig.qio_ram
@@ -1 +1,2 @@
+# CONFIG_SPIRAM_BOOT_HW_INIT is not set
 # CONFIG_SPIRAM_BOOT_INIT is not set
diff --git a/main/idf_component.yml b/main/idf_component.yml
@@ -20,4 +20,4 @@ dependencies:
     version: "1.4.1"
     require: public
     rules:
-      - if: "target not in [esp32c2, esp32h2, esp32p4]"
+      - if: "target not in [esp32c2, esp32p4]"
diff --git a/patches/lwip_max_tcp_pcb.diff b/patches/lwip_max_tcp_pcb.diff
diff --git a/tools/config.sh b/tools/config.sh
@@ -6,11 +6,11 @@ if [ -z $IDF_PATH ]; then
 fi
 
 if [ -z $IDF_BRANCH ]; then
-    IDF_BRANCH="release/v5.4"
+    IDF_BRANCH="release/v5.5"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
-    AR_PR_TARGET_BRANCH="master"
+    AR_PR_TARGET_BRANCH="release/v3.3.x"
 fi
 
 if [ -z $IDF_TARGET ]; then
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		rm -rf out build dist managed_components sdkconfig
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		# CONFIG_SPIRAM_BOOT_HW_INIT is not set
		# CONFIG_SPIRAM_BOOT_INIT is not set