Merge branch 'fix/ember_contain_client' into 'main'

chshu · chshu · commit a91e6ffc24e5 · 2025-10-22T01:34:54.000Z
data_model_provider: Fix emberAfContainsClient() in ember stubs of esp_matter data model

Closes CON-1830

See merge request app-frameworks/esp-matter!1288
diff --git a/components/esp_matter/data_model_provider/esp_matter_ember_stubs.cpp b/components/esp_matter/data_model_provider/esp_matter_ember_stubs.cpp
@@ -1265,7 +1265,7 @@ bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId cluster
 bool emberAfContainsClient(chip::EndpointId endpoint, chip::ClusterId clusterId)
 {
     esp_matter::cluster_t *cluster = esp_matter::cluster::get(endpoint, clusterId);
-    if (cluster && (esp_matter::cluster::get_flags(cluster) & esp_matter::CLUSTER_FLAG_SERVER)) {
+    if (cluster && (esp_matter::cluster::get_flags(cluster) & esp_matter::CLUSTER_FLAG_CLIENT)) {
         return true;
     }
     return false;

Original file line number	Diff line number	Diff line change
`@@ -1265,7 +1265,7 @@ bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId cluster`
`1265`	`1265`	`bool emberAfContainsClient(chip::EndpointId endpoint, chip::ClusterId clusterId)`
`1266`	`1266`	`{`
`1267`	`1267`	`esp_matter::cluster_t *cluster = esp_matter::cluster::get(endpoint, clusterId);`
`1268`		`- if (cluster && (esp_matter::cluster::get_flags(cluster) & esp_matter::CLUSTER_FLAG_SERVER)) {`
	`1268`	`+ if (cluster && (esp_matter::cluster::get_flags(cluster) & esp_matter::CLUSTER_FLAG_CLIENT)) {`
`1269`	`1269`	`return true;`
`1270`	`1270`	`}`
`1271`	`1271`	`return false;`