Merge branch 'bugfix/descriptor' into 'main'

components/esp-matter: Add features as parameter in descriptor cluster create() API.

See merge request app-frameworks/esp-matter!963

Author: dhrishi

components/esp_matter/esp_matter_cluster.cpp

@@ -140,6 +140,11 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
         global::attribute::create_cluster_revision(cluster, cluster_revision);
     }
 
+     /* Features */
+    if (config != NULL && config->features & feature::taglist::get_id()) {
+        feature::taglist::add(cluster);
+    }
+
     return cluster;
 }
 } /* descriptor */

components/esp_matter/esp_matter_cluster.h

@@ -65,7 +65,10 @@ typedef struct config {
 } /* common */
 
 namespace descriptor {
-using config_t = common::config_t;
+typedef struct config {
+    uint32_t features;
+    config() : features(0) {}
+} config_t;
 cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags);
 } /* descriptor */
 

components/esp_matter/esp_matter_endpoint.cpp

@@ -132,10 +132,6 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
         return err;
     }
 
-    cluster_t *cluster = descriptor::create(endpoint, &(config->descriptor), CLUSTER_FLAG_SERVER);
-    if (!cluster) {
-        return ESP_ERR_INVALID_STATE;
-    }
     cluster_t *cluster_p = cluster::ota_provider::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
     cluster_t *cluster_r = cluster::ota_requestor::create(endpoint, &(config->ota_requestor), CLUSTER_FLAG_SERVER);
     if (!cluster_p || !cluster_r) {
@@ -181,11 +177,7 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
         return err;
     }
 
-    cluster_t *cluster = descriptor::create(endpoint, &(config->descriptor), CLUSTER_FLAG_SERVER);
-    if (!cluster) {
-        return ESP_ERR_INVALID_STATE;
-    }
-    cluster = cluster::ota_provider::create(endpoint, &(config->ota_provider), CLUSTER_FLAG_SERVER);
+    cluster_t *cluster = cluster::ota_provider::create(endpoint, &(config->ota_provider), CLUSTER_FLAG_SERVER);
     if (!cluster) {
         return ESP_FAIL;
     }