Merge branch 'fix_groups' into 'main'

components/esp-matter: enable GroupNames feature by default See merge request app-frameworks/esp-matter!860
espressif · Aug 28, 2024 · e4ae42c · e4ae42c
2 parents f4eaa69 + 2ef7fc5
commit e4ae42c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,10 @@
+# 28-Aug-2024
+
+- Removed the configurability of the NameSupport attribute of the Groups cluster and enabled
+  it by default. The NameSupport and feature-map attributes of the Groups cluster must be kept
+  in sync, the connectedhomeip SDK enables the GroupName feature by default and set the
+  NameSupport attribute to appropriate value.
+
 # 08-July-2024
 - Changed diagnostic cluster namespaces as per the matter specifications
   - diagnostics_network_wifi -> wifi_network_diagnotics  

diff --git a/components/esp_matter/esp_matter_cluster.cpp b/components/esp_matter/esp_matter_cluster.cpp
@@ -1061,12 +1061,12 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
         add_function_list(cluster, function_list, function_flags);
 
         /* Attributes managed internally */
-        global::attribute::create_feature_map(cluster, 0);
+        global::attribute::create_feature_map(cluster, static_cast<uint32_t>(Groups::NameSupportBitmap::kGroupNames));
 
         /* Attributes not managed internally */
         global::attribute::create_cluster_revision(cluster, cluster_revision);
         if (config) {
-            attribute::create_group_name_support(cluster, config->group_name_support);
+            attribute::create_group_name_support(cluster, chip::to_underlying(Groups::NameSupportBitmap::kGroupNames));
         } else {
             ESP_LOGE(TAG, "Config is NULL. Cannot add some attributes.");
         }

diff --git a/components/esp_matter/esp_matter_cluster.h b/components/esp_matter/esp_matter_cluster.h
@@ -231,11 +231,7 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags);
 } /* identify */
 
 namespace groups {
-typedef struct config {
-    uint8_t group_name_support;
-    config() : group_name_support(0) {}
-} config_t;
-
+using config_t = common::config_t;
 cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags);
 } /* groups */