From 64c03fd4b55af6994f24c79253936e73d29ee8d2 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Tue, 24 Jun 2025 19:49:01 -0300 Subject: [PATCH 01/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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