espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cluster_select): gate Thread clusters on OPENTHREAD_ENABLED

Browse Source 
The three Thread-related clusters (Thread Network Diagnostics, Thread
Border Router Management, Thread Network Directory) default to enabled
regardless of whether OpenThread is present. On WiFi-only devices this
causes the clusters to be registered on the root node endpoint, but
read requests fail with CHIP_ERROR_NOT_IMPLEMENTED because
CHIP_DEVICE_CONFIG_ENABLE_THREAD is disabled, producing noisy DMG
errors like:

  E chip[DMG]: Fail to retrieve data ... clusterId: 0x0000_0035 err = 2d

Add `depends on OPENTHREAD_ENABLED` so these clusters are only
available when the Thread stack is actually present.
This commit is contained in:
Chris Leishman
2026-02-24 23:22:39 -08:00
parent 7a3c60a1c4
commit a0dfcbf85f
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/utils/cluster_select/Kconfig.in
+3
View File
@@ -431,14 +431,17 @@ config SUPPORT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER
config SUPPORT_THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER config SUPPORT_THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER
bool "Support THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER" bool "Support THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER"
depends on OPENTHREAD_ENABLED
default y default y
config SUPPORT_THREAD_NETWORK_DIAGNOSTICS_CLUSTER config SUPPORT_THREAD_NETWORK_DIAGNOSTICS_CLUSTER
bool "Support THREAD_NETWORK_DIAGNOSTICS_CLUSTER" bool "Support THREAD_NETWORK_DIAGNOSTICS_CLUSTER"
depends on OPENTHREAD_ENABLED
default y default y
config SUPPORT_THREAD_NETWORK_DIRECTORY_CLUSTER config SUPPORT_THREAD_NETWORK_DIRECTORY_CLUSTER
bool "Support THREAD_NETWORK_DIRECTORY_CLUSTER" bool "Support THREAD_NETWORK_DIRECTORY_CLUSTER"
depends on OPENTHREAD_ENABLED
default y default y
config SUPPORT_TIME_FORMAT_LOCALIZATION_CLUSTER config SUPPORT_TIME_FORMAT_LOCALIZATION_CLUSTER
components/esp_matter/utils/cluster_select/generate_cluster_select_files.py
+15 -5
View File
@@ -46,15 +46,25 @@ def load_json(json_file):
return {key: value for key, value in server_dirs.items() if value} return {key: value for key, value in server_dirs.items() if value}
# Clusters that require OpenThread support
OPENTHREAD_CLUSTERS = {
'THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER',
'THREAD_NETWORK_DIAGNOSTICS_CLUSTER',
'THREAD_NETWORK_DIRECTORY_CLUSTER',
}
def generate_cluster_select_kconfig(cluster_list, output_dir): def generate_cluster_select_kconfig(cluster_list, output_dir):
with open(os.path.join(output_dir, 'Kconfig.in'), 'w') as kconfig_file: with open(os.path.join(output_dir, 'Kconfig.in'), 'w') as kconfig_file:
write_file_header(kconfig_file) write_file_header(kconfig_file)
for cluster in cluster_list.keys(): for cluster in cluster_list.keys():
kconfig_file.writelines( lines = [f'config SUPPORT_{cluster}\n',
[f'config SUPPORT_{cluster}\n', f'\tbool "Support {cluster}"\n']
f'\tbool "Support {cluster}"\n', if cluster in OPENTHREAD_CLUSTERS:
'\tdefault y\n' lines.append('\tdepends on OPENTHREAD_ENABLED\n')
'\n']) lines.append('\tdefault y\n')
lines.append('\n')
kconfig_file.writelines(lines)
def generate_cluster_select_cmake(cluster_list, output_dir): def generate_cluster_select_cmake(cluster_list, output_dir):