From e2e44e62e816392cd6d6bbd9c35a54b9ac3137a2 Mon Sep 17 00:00:00 2001 From: Nezaemmy <38810350+Nezaemmy@users.noreply.github.com> Date: Mon, 1 Dec 2025 10:00:23 +0100 Subject: [PATCH 01/10] Modify Matter settings for WiFi and OpenThread Updated Matter settings to include WiFi and OpenThread configurations, and added endpoint IDs for both networks. --- configs/defconfig.esp32c5 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 4a71edfd3..4a5fa5209 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -47,12 +47,14 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff" CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # end of OpenThread -# Matter settings: OpenThread + CHIPoBLE +# Matter settings: WiFi and 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 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=25 # # Zigbee From 601bd89c4eece8ddc66a3beccf7514d4b7278a89 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 17 Dec 2025 23:57:04 -0300 Subject: [PATCH 02/10] fix(matter): changing endpoints to 16 - attempt --- configs/defconfig.esp32c5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 4a5fa5209..0b417669b 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -54,7 +54,7 @@ CONFIG_ENABLE_MATTER_OVER_THREAD=y 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=25 +CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=16 # # Zigbee From 57a9486627a2967c874d36f161149b3bbec47eed Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Thu, 18 Dec 2025 00:35:32 -0300 Subject: [PATCH 03/10] fix(matter): trying with 8 ep --- configs/defconfig.esp32c5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 0b417669b..5869917a7 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -54,7 +54,7 @@ CONFIG_ENABLE_MATTER_OVER_THREAD=y 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=16 +CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=8 # # Zigbee From 2eee63df8803b6924d218d608aa520f1bf030f4a Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Thu, 18 Dec 2025 01:16:40 -0300 Subject: [PATCH 04/10] fix(matter): WiFi only with 32 EPs Updated Matter settings to disable Thread and Wi-Fi configurations and increased maximum dynamic endpoint count. --- configs/defconfig.esp32c5 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 5869917a7..a0f023b5e 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -47,14 +47,15 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff" CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # end of OpenThread -# Matter settings: WiFi and OpenThread + CHIPoBLE +# Matter settings: WiFi + CHIPoBLE CONFIG_ENABLE_CHIPOBLE=y -CONFIG_ENABLE_MATTER_OVER_THREAD=y +# No SRAM for Thread and WiFi together! +# 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 # increase the maximum number of endpoints per device -CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=8 +CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=32 # # Zigbee From f8f8f97f31b0bc3c9dd346b87a1c93fa46885686 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Thu, 18 Dec 2025 10:51:17 -0300 Subject: [PATCH 05/10] fix(matter): C5 WiFi attemp --- configs/defconfig.esp32c5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index a0f023b5e..17fd9368b 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -50,10 +50,10 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # Matter settings: WiFi + CHIPoBLE CONFIG_ENABLE_CHIPOBLE=y # No SRAM for Thread and WiFi together! -# 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 +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 From 589dd7b196abae2e79352f99297f898fccd0724f Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Thu, 18 Dec 2025 11:46:34 -0300 Subject: [PATCH 06/10] fix(matter): ESP32-C5 configuration attempt --- configs/defconfig.esp32c5 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 17fd9368b..994a94d2d 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -47,15 +47,15 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff" CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # end of OpenThread -# Matter settings: WiFi + CHIPoBLE +# Matter settings: WiFi + Thread + CHIPoBLE CONFIG_ENABLE_CHIPOBLE=y -# No SRAM for Thread and WiFi together! -CONFIG_ENABLE_MATTER_OVER_THREAD=n +# Thread and WiFi must together! +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 +# Lack of memory will limit the maximum number of endpoints per device +CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 # # Zigbee From abad8bf6effce0b5d6933a8ac9fe72ab939b8ba8 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Thu, 18 Dec 2025 15:17:39 -0300 Subject: [PATCH 07/10] fix(matter): C5 with 3 EPs --- configs/defconfig.esp32c5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 994a94d2d..c0ade7dcb 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -55,7 +55,7 @@ CONFIG_ENABLE_MATTER_OVER_THREAD=y CONFIG_THREAD_NETWORK_ENDPOINT_ID=2 CONFIG_WIFI_NETWORK_ENDPOINT_ID=0 # Lack of memory will limit the maximum number of endpoints per device -CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 +CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=3 # # Zigbee From 04d563d01845f49c5e3699189004119d22dff3a9 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Thu, 18 Dec 2025 16:17:53 -0300 Subject: [PATCH 08/10] fix(matter): C5 WiFi + Thread - no AP Comment out the maximum dynamic endpoint count for ESP Matter. --- configs/defconfig.esp32c5 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index c0ade7dcb..92c9e16aa 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -49,13 +49,19 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # Matter settings: WiFi + Thread + CHIPoBLE CONFIG_ENABLE_CHIPOBLE=y +# Disable AP - it may save some RAM +CONFIG_ENABLE_WIFI_STATION=y +CONFIG_ENABLE_WIFI_AP=n + # Thread and WiFi must together! 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 + # Lack of memory will limit the maximum number of endpoints per device -CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=3 +# CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=3 # # Zigbee From 54e47888af8255addcee207012d4eebb21bc18f8 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Thu, 18 Dec 2025 16:55:01 -0300 Subject: [PATCH 09/10] fix(matter): C5 with WiFi + Thread, no AP, 8 EPs --- configs/defconfig.esp32c5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 92c9e16aa..039a9c305 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -61,7 +61,7 @@ CONFIG_THREAD_NETWORK_ENDPOINT_ID=2 CONFIG_WIFI_NETWORK_ENDPOINT_ID=0 # Lack of memory will limit the maximum number of endpoints per device -# CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=3 +# CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=8 # # Zigbee From 36ae56ca1dc5efca17f75a4bba03c5a54e4e03f1 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Thu, 18 Dec 2025 16:56:11 -0300 Subject: [PATCH 10/10] esp32c5 Matter STA + Thread (no AP) with 8 EPs --- configs/defconfig.esp32c5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5 index 039a9c305..c16348090 100644 --- a/configs/defconfig.esp32c5 +++ b/configs/defconfig.esp32c5 @@ -61,7 +61,7 @@ CONFIG_THREAD_NETWORK_ENDPOINT_ID=2 CONFIG_WIFI_NETWORK_ENDPOINT_ID=0 # Lack of memory will limit the maximum number of endpoints per device -# CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=8 +CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=8 # # Zigbee