From 64c03fd4b55af6994f24c79253936e73d29ee8d2 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Tue, 24 Jun 2025 19:49:01 -0300 Subject: [PATCH 01/34] feat(matter): removes CHIPOBLE to manage it case by case --- configs/defconfig.common | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.common b/configs/defconfig.common index 48baf508..2d50cdac 100644 --- a/configs/defconfig.common +++ b/configs/defconfig.common @@ -125,7 +125,6 @@ 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 From ad9968077f6ee72480b34397eb6ac15a57ff1178 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Tue, 24 Jun 2025 21:18:29 -0300 Subject: [PATCH 02/34] feat(matter): Update defconfig.esp32 --- configs/defconfig.esp32 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index db01aeab..e033b20c 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -20,3 +20,7 @@ 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 +CONFIG_ESP_MATTER_ENABLE_OPENTHREAD=n From cab2b42cdebc473b6ce3224bead1c4979401c030 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Tue, 24 Jun 2025 21:21:58 -0300 Subject: [PATCH 03/34] feat(matter): Update defconfig.esp32c3 --- configs/defconfig.esp32c3 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index 804a908f..ff715f5f 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -12,3 +12,7 @@ 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 +CONFIG_ESP_MATTER_ENABLE_OPENTHREAD=n From ab99173588c4131ba9118d6022d7a7fcbcc2c020 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Tue, 24 Jun 2025 21:22:30 -0300 Subject: [PATCH 04/34] feat(matter): Update defconfig.esp32s2 --- configs/defconfig.esp32s2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index 3b0af548..aabbe9bc 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -15,3 +15,7 @@ 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 +CONFIG_ESP_MATTER_ENABLE_OPENTHREAD=n From 0d1fe99162f5435f579e1c31403215ef08a86b49 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Tue, 24 Jun 2025 21:23:07 -0300 Subject: [PATCH 05/34] feat(matter): Update defconfig.esp32s3 --- configs/defconfig.esp32s3 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 08e9d95c..2507ba39 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -26,3 +26,7 @@ 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 +CONFIG_ESP_MATTER_ENABLE_OPENTHREAD=n From 57d918eb3800d00229d64f073807936dc6083ada Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Tue, 24 Jun 2025 21:26:33 -0300 Subject: [PATCH 06/34] feat(matter): Update defconfig.esp32c6 --- configs/defconfig.esp32c6 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6 index ce5cb19e..0994f0d8 100644 --- a/configs/defconfig.esp32c6 +++ b/configs/defconfig.esp32c6 @@ -44,8 +44,12 @@ 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 # # Zigbee From 69ad6e8bdfea4324b27cf149f8f2d6cf54a824ec Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Tue, 24 Jun 2025 21:27:01 -0300 Subject: [PATCH 07/34] feat(matter): Update defconfig.esp32c5 --- configs/defconfig.esp32c5 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index b18dd4b0..7f936c4f 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -50,8 +50,12 @@ 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 # # Zigbee From 804e9576bc4c1c7b9a75d95ba2290ff5d0203fca Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Tue, 24 Jun 2025 21:28:18 -0300 Subject: [PATCH 08/34] feat(matter): Update defconfig.esp32h2 --- configs/defconfig.esp32h2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index 25e757de..cb0b188d 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -40,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 +# Set endpoint id for Thread +CONFIG_THREAD_NETWORK_ENDPOINT_ID=0 + + # # Zigbee # From 2e8d3bee886b65fad79d4d33f2e79bcb56c71e3b Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Tue, 24 Jun 2025 21:30:06 -0300 Subject: [PATCH 09/34] feat(matter): enable Matter for H2 - Update idf_component.yml --- main/idf_component.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/idf_component.yml b/main/idf_component.yml index a85eca54..4ba96d85 100644 --- 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]" From c411b801cd28ba64b74e00505e08da6615425c13 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Tue, 24 Jun 2025 21:52:40 -0300 Subject: [PATCH 10/34] feat(matter): disable Matter over WiFi - Update defconfig.esp32h2 --- configs/defconfig.esp32h2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index cb0b188d..f30fc911 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -43,6 +43,9 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # 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 # Set endpoint id for Thread CONFIG_THREAD_NETWORK_ENDPOINT_ID=0 From 6b6ab422cd37a58be077ace4fc66345c91663112 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 25 Jun 2025 00:25:54 -0300 Subject: [PATCH 11/34] fix(matter): disable matter over thread config setting --- configs/defconfig.esp32h2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index f30fc911..a535c93c 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -42,7 +42,7 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # Matter settings: OpenThread + CHIPoBLE CONFIG_ENABLE_CHIPOBLE=y -CONFIG_ENABLE_MATTER_OVER_THREAD=y +CONFIG_ENABLE_MATTER_OVER_THREAD=n # Disable Matter over WiFi CONFIG_ENABLE_WIFI_AP=n CONFIG_ENABLE_WIFI_STATION=n From 87aefa5f31aec74599f4c48a44ed6cf9a728a25f Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 25 Jun 2025 00:26:19 -0300 Subject: [PATCH 12/34] fix(matter): disable matter over thread config setting --- configs/defconfig.esp32c6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6 index 0994f0d8..8ae35df4 100644 --- a/configs/defconfig.esp32c6 +++ b/configs/defconfig.esp32c6 @@ -46,7 +46,7 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # Matter settings: WiFi and OpenThread + CHIPoBLE CONFIG_ENABLE_CHIPOBLE=y -CONFIG_ENABLE_MATTER_OVER_THREAD=y +CONFIG_ENABLE_MATTER_OVER_THREAD=n # 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 From 3f14c1fa94d1a9b12cd01339c34517dc170a549e Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 25 Jun 2025 00:27:04 -0300 Subject: [PATCH 13/34] fix(matter): disable matter over thread config setting --- configs/defconfig.esp32c5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 7f936c4f..2c4aa7fc 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -52,7 +52,7 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # Matter settings: WiFi and OpenThread + CHIPoBLE CONFIG_ENABLE_CHIPOBLE=y -CONFIG_ENABLE_MATTER_OVER_THREAD=y +CONFIG_ENABLE_MATTER_OVER_THREAD=n # 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 From dfc54a5685e77e6984941c084e0411e16cbd568f Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 25 Jun 2025 01:21:25 -0300 Subject: [PATCH 14/34] fix(matter): openthread option --- configs/defconfig.esp32 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index e033b20c..63bec306 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -23,4 +23,3 @@ CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=4096 # Matter settings: CONFIG_ENABLE_CHIPOBLE=n -CONFIG_ESP_MATTER_ENABLE_OPENTHREAD=n From 77c7ff08c30366968e2498f71e366c23789af8d9 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 25 Jun 2025 01:21:54 -0300 Subject: [PATCH 15/34] fix(matter): openthread option --- configs/defconfig.esp32c3 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index ff715f5f..d860aed2 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -15,4 +15,3 @@ CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=4096 # Matter settings: CONFIG_ENABLE_CHIPOBLE=y -CONFIG_ESP_MATTER_ENABLE_OPENTHREAD=n From 69a355c8e6daab61640b71a60e9cecd7d8c296fa Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 25 Jun 2025 01:23:45 -0300 Subject: [PATCH 16/34] fix(matter): openthread option --- configs/defconfig.esp32c5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 2c4aa7fc..7f936c4f 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -52,7 +52,7 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # Matter settings: WiFi and OpenThread + CHIPoBLE CONFIG_ENABLE_CHIPOBLE=y -CONFIG_ENABLE_MATTER_OVER_THREAD=n +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 From 8fcd509c4d1cc15c80af22f1bc7e345afa6cca7a Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 25 Jun 2025 01:24:41 -0300 Subject: [PATCH 17/34] Update defconfig.esp32c6 --- configs/defconfig.esp32c6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6 index 8ae35df4..0994f0d8 100644 --- a/configs/defconfig.esp32c6 +++ b/configs/defconfig.esp32c6 @@ -46,7 +46,7 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # Matter settings: WiFi and OpenThread + CHIPoBLE CONFIG_ENABLE_CHIPOBLE=y -CONFIG_ENABLE_MATTER_OVER_THREAD=n +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 From 5c15b9afc06c8f04fefd70f47b297fe8db01dd8a Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 25 Jun 2025 01:25:20 -0300 Subject: [PATCH 18/34] fix(matter): openthread option --- configs/defconfig.esp32h2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index a535c93c..f30fc911 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -42,7 +42,7 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # Matter settings: OpenThread + CHIPoBLE CONFIG_ENABLE_CHIPOBLE=y -CONFIG_ENABLE_MATTER_OVER_THREAD=n +CONFIG_ENABLE_MATTER_OVER_THREAD=y # Disable Matter over WiFi CONFIG_ENABLE_WIFI_AP=n CONFIG_ENABLE_WIFI_STATION=n From 45d62bf9b1ed9b685a33f9da5b8555f40351c719 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 25 Jun 2025 01:25:54 -0300 Subject: [PATCH 19/34] fix(matter): openthread option --- configs/defconfig.esp32s2 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index aabbe9bc..f90b0fab 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -18,4 +18,3 @@ CONFIG_ULP_COPROC_RESERVE_MEM=512 # Matter settings: CONFIG_ENABLE_CHIPOBLE=n -CONFIG_ESP_MATTER_ENABLE_OPENTHREAD=n From 98e5e840af38325cab7b3b78ceb9baa947dbf0b3 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 25 Jun 2025 01:26:22 -0300 Subject: [PATCH 20/34] fix(matter): openthread option --- configs/defconfig.esp32s3 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 2507ba39..2de36882 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -29,4 +29,3 @@ CONFIG_LCD_RGB_RESTART_IN_VSYNC=y # Matter settings: CONFIG_ENABLE_CHIPOBLE=y -CONFIG_ESP_MATTER_ENABLE_OPENTHREAD=n From 8ab2f8fce87aa59b22fff6135ec1ceae879a118f Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 25 Jun 2025 18:23:15 -0300 Subject: [PATCH 21/34] feat(matter): leave thread endpoint not defined --- configs/defconfig.esp32h2 | 3 --- 1 file changed, 3 deletions(-) diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index f30fc911..89bec306 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -46,9 +46,6 @@ CONFIG_ENABLE_MATTER_OVER_THREAD=y # Disable Matter over WiFi CONFIG_ENABLE_WIFI_AP=n CONFIG_ENABLE_WIFI_STATION=n -# Set endpoint id for Thread -CONFIG_THREAD_NETWORK_ENDPOINT_ID=0 - # # Zigbee From af50c0fa1fef1c25ae393e389fdeead37b2ccd84 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 25 Jun 2025 20:22:57 -0300 Subject: [PATCH 22/34] feat(matter): enable full mDNS for Matter --- configs/defconfig.common | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/defconfig.common b/configs/defconfig.common index 2d50cdac..911bf79a 100644 --- a/configs/defconfig.common +++ b/configs/defconfig.common @@ -130,6 +130,8 @@ CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n 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 #TinyUSB Config CONFIG_TINYUSB_CDC_MAX_PORTS=2 From 3c7720081c50205c2f57541a6bf2eee8ad0a3f8f Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Thu, 26 Jun 2025 12:14:36 -0300 Subject: [PATCH 23/34] fix(matter): downgrading C5 to manual WiFi only --- configs/defconfig.esp32c6 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6 index 0994f0d8..c325072f 100644 --- a/configs/defconfig.esp32c6 +++ b/configs/defconfig.esp32c6 @@ -45,11 +45,14 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # end of OpenThread # Matter settings: WiFi and OpenThread + CHIPoBLE -CONFIG_ENABLE_CHIPOBLE=y -CONFIG_ENABLE_MATTER_OVER_THREAD=y +# at this time, June/2025, Matter doesn't work correctly with CHIPoBLE, therefore it will be disabled by now. +# ESP32-C5 Matter will work with WiFi, in the same way as ESP32/ESP32-S2 does, by setting WiFi Credentials manually. +# +# 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 +# CONFIG_THREAD_NETWORK_ENDPOINT_ID=2 +# CONFIG_WIFI_NETWORK_ENDPOINT_ID=0 # # Zigbee From c642b215cc58247aeeb5a3f72dc56a74542ba04a Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Thu, 26 Jun 2025 16:46:23 -0300 Subject: [PATCH 24/34] fix(matter): C5 uses WiFi Manual Set for Matter --- configs/defconfig.esp32c5 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 7f936c4f..f3c9a599 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -51,11 +51,14 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # end of OpenThread # Matter settings: WiFi and OpenThread + CHIPoBLE -CONFIG_ENABLE_CHIPOBLE=y -CONFIG_ENABLE_MATTER_OVER_THREAD=y +# at this time, June/2025, Matter doesn't work correctly with CHIPoBLE, therefore it will be disabled by now. +# ESP32-C5 Matter will work with WiFi, in the same way as ESP32/ESP32-S2 does, by setting WiFi Credentials manually. +# +# 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 +# CONFIG_THREAD_NETWORK_ENDPOINT_ID=2 +# CONFIG_WIFI_NETWORK_ENDPOINT_ID=0 # # Zigbee From 883d8422ec446f7bc92cd61d76bd87f9c3f6a4db Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Thu, 26 Jun 2025 16:47:22 -0300 Subject: [PATCH 25/34] fix(matter): restore C6 matter configuration --- configs/defconfig.esp32c6 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6 index c325072f..0994f0d8 100644 --- a/configs/defconfig.esp32c6 +++ b/configs/defconfig.esp32c6 @@ -45,14 +45,11 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # end of OpenThread # Matter settings: WiFi and OpenThread + CHIPoBLE -# at this time, June/2025, Matter doesn't work correctly with CHIPoBLE, therefore it will be disabled by now. -# ESP32-C5 Matter will work with WiFi, in the same way as ESP32/ESP32-S2 does, by setting WiFi Credentials manually. -# -# CONFIG_ENABLE_CHIPOBLE=y -# CONFIG_ENABLE_MATTER_OVER_THREAD=y +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 +CONFIG_THREAD_NETWORK_ENDPOINT_ID=2 +CONFIG_WIFI_NETWORK_ENDPOINT_ID=0 # # Zigbee From 5190c327dad7756683664b3a7f50a5eb54257e01 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Thu, 26 Jun 2025 17:21:15 -0300 Subject: [PATCH 26/34] fix(matter): set different networking cluster EPid for WiFi and Thread --- configs/defconfig.esp32c5 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index f3c9a599..7653b068 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -57,8 +57,9 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # 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 +# ESP32-C5 has both, WiFi anf OpenThread Libraries, therefore both are enabled and each must point to a different EndPointID +CONFIG_THREAD_NETWORK_ENDPOINT_ID=2 +CONFIG_WIFI_NETWORK_ENDPOINT_ID=0 # # Zigbee From 1c8cd658615a4cc5ddb75b6d9253c1761cb10ece Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Fri, 27 Jun 2025 01:19:37 -0300 Subject: [PATCH 27/34] fix(matter): nimble evt buf --- configs/defconfig.esp32c5 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 7653b068..d1ff2afc 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -60,6 +60,7 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # ESP32-C5 has both, WiFi anf OpenThread Libraries, therefore both are enabled and each must point to a different EndPointID CONFIG_THREAD_NETWORK_ENDPOINT_ID=2 CONFIG_WIFI_NETWORK_ENDPOINT_ID=0 +CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70 # # Zigbee From 8c21130b174cf68c04fb41f727370b5658843c54 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Fri, 27 Jun 2025 02:50:11 -0300 Subject: [PATCH 28/34] feat(matter): ESP32C5 doesn't work with Matter 1.4 --- configs/defconfig.esp32c5 | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index d1ff2afc..4824c296 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -50,18 +50,6 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff" CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # end of OpenThread -# Matter settings: WiFi and OpenThread + CHIPoBLE -# at this time, June/2025, Matter doesn't work correctly with CHIPoBLE, therefore it will be disabled by now. -# ESP32-C5 Matter will work with WiFi, in the same way as ESP32/ESP32-S2 does, by setting WiFi Credentials manually. -# -# 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. -# ESP32-C5 has both, WiFi anf OpenThread Libraries, therefore both are enabled and each must point to a different EndPointID -CONFIG_THREAD_NETWORK_ENDPOINT_ID=2 -CONFIG_WIFI_NETWORK_ENDPOINT_ID=0 -CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70 - # # Zigbee # From 86982f23018d97720248114792e59dc376f87b66 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Fri, 27 Jun 2025 02:50:51 -0300 Subject: [PATCH 29/34] feat(matter): ESP32C5 doesn't work with Matter 1.4 --- main/idf_component.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/idf_component.yml b/main/idf_component.yml index 4ba96d85..36bc05ad 100644 --- 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, esp32p4]" + - if: "target not in [esp32c2, esp32c5, esp32p4]" From e275aabe63366d067eadbf51726d814c743d7f2d Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Fri, 27 Jun 2025 03:42:10 -0300 Subject: [PATCH 30/34] feat(matter): testing main branch for the C5 --- main/idf_component.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/idf_component.yml b/main/idf_component.yml index 36bc05ad..9303bc2a 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -17,7 +17,8 @@ dependencies: rules: - if: "target in [esp32s3]" espressif/esp_matter: - version: "1.4.1" + version: "main" + git: https://github.com/espressif/esp-matter.git require: public rules: - if: "target not in [esp32c2, esp32c5, esp32p4]" From 586ee4c8f3e4df798fd6951c6792a90fa4723477 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Fri, 27 Jun 2025 03:42:45 -0300 Subject: [PATCH 31/34] fix(matter): including C5 --- main/idf_component.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/idf_component.yml b/main/idf_component.yml index 9303bc2a..c31febb7 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -21,4 +21,4 @@ dependencies: git: https://github.com/espressif/esp-matter.git require: public rules: - - if: "target not in [esp32c2, esp32c5, esp32p4]" + - if: "target not in [esp32c2, esp32p4]" From 3b441621c434e37bd956b0ee1b3ec7a23ea279bd Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Fri, 27 Jun 2025 03:44:19 -0300 Subject: [PATCH 32/34] feat(matter): testing C5 with matter master branch --- configs/defconfig.esp32c5 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 4824c296..7f936c4f 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -50,6 +50,13 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff" CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # end of OpenThread +# 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 + # # Zigbee # From c252a624a57814873995b8eb7163a90c0c795c12 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Fri, 27 Jun 2025 15:08:29 -0300 Subject: [PATCH 33/34] feat(matter): final configuration - No C5 --- main/idf_component.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main/idf_component.yml b/main/idf_component.yml index c31febb7..36bc05ad 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -17,8 +17,7 @@ dependencies: rules: - if: "target in [esp32s3]" espressif/esp_matter: - version: "main" - git: https://github.com/espressif/esp-matter.git + version: "1.4.1" require: public rules: - - if: "target not in [esp32c2, esp32p4]" + - if: "target not in [esp32c2, esp32c5, esp32p4]" From bde2460476d67d3a43e4c5b31dbe6e4292c895b0 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Fri, 27 Jun 2025 15:10:21 -0300 Subject: [PATCH 34/34] feat(matter): final configuration - No C5 --- configs/defconfig.esp32c5 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 7f936c4f..4c9703d1 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -50,12 +50,13 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff" CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # end of OpenThread +# ESP32-C5 fails when ESP Matter 1.4.1 is used. Try this latter with some other IDF 5.5 commit # Matter settings: WiFi and OpenThread + CHIPoBLE -CONFIG_ENABLE_CHIPOBLE=y -CONFIG_ENABLE_MATTER_OVER_THREAD=y +# 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 +# CONFIG_THREAD_NETWORK_ENDPOINT_ID=2 +# CONFIG_WIFI_NETWORK_ENDPOINT_ID=0 # # Zigbee