Merge branch 'update-submodule-1-3' into 'release/v1.3'

[v1.3] connectedhomeip: update submodule to fix group clusters chunking issue

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

Author: dhrishi

.gitlab-ci.yml

@@ -25,7 +25,7 @@ variables:
     IDF_CHECKOUT_REF: "v5.2.1"
     # This variable represents the short hash of the connectedhomeip submodule.
     # Note: Do change this short hash on submodule update MRs.
-    CHIP_SHORT_HASH: "735b69f73e"
+    CHIP_SHORT_HASH: "593d5c6f63"
     DOCKER_IMAGE_NAME: "espressif/chip-idf"
 
 .add_gitlab_ssh_key: &add_gitlab_ssh_key |

components/esp_matter/esp_matter_cluster.cpp

@@ -1215,6 +1215,9 @@ const function_generic_t function_list[] = {
 };
 const int function_flags = CLUSTER_FLAG_INIT_FUNCTION;
 
+static uint8_t server_cluster_count = 0;
+uint8_t get_server_cluster_count() { return server_cluster_count; }
+
 cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
 {
     cluster_t *cluster = cluster::create(endpoint, Groups::Id, flags);
@@ -1243,6 +1246,8 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
         } else {
             ESP_LOGE(TAG, "Config is NULL. Cannot add some attributes.");
         }
+
+        server_cluster_count++;
     }
 
     /* Commands */

components/esp_matter/esp_matter_cluster.h

@@ -306,6 +306,7 @@ typedef struct config {
 } config_t;
 
 cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags);
+uint8_t get_server_cluster_count();
 } /* groups */
 
 namespace scenes_management {

components/esp_matter/esp_matter_core.cpp

@@ -25,6 +25,7 @@
 #include <app/util/attribute-storage.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/FabricTable.h>
+#include <credentials/GroupDataProviderImpl.h>
 #include <lib/core/DataModelTypes.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/DeviceInfoProvider.h>
@@ -59,6 +60,10 @@ using chip::DeviceLayer::ThreadStackMgr;
 #define ESP_MATTER_NVS_PART_NAME CONFIG_ESP_MATTER_NVS_PART_NAME
 #define ESP_MATTER_MAX_DEVICE_TYPE_COUNT CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT
 
+// TODO: replace 4 with CONFIG_MAX_GROUPS_PER_FABRIC_PER_ENDPOINT
+// This will be fixed in https://github.com/project-chip/connectedhomeip/pull/35394
+#define MAX_GROUPS_PER_FABRIC_PER_ENDPOINT 4
+
 static const char *TAG = "esp_matter_core";
 static bool esp_matter_started = false;
 
@@ -891,8 +896,26 @@ static void esp_matter_chip_init_task(intptr_t context)
 {
     TaskHandle_t task_to_notify = reinterpret_cast<TaskHandle_t>(context);
     static chip::CommonCaseDeviceServerInitParams initParams;
+
     initParams.InitializeStaticResourcesBeforeServerInit();
     initParams.appDelegate = &s_app_delegate;
+
+#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
+    // Group data provider injection for dynamic data model
+    {
+        uint8_t groups_server_cluster_count = cluster::groups::get_server_cluster_count();
+        uint16_t max_groups_per_fabric = groups_server_cluster_count * MAX_GROUPS_PER_FABRIC_PER_ENDPOINT;
+
+        // since groupDataProvider is a static variable, it won't be released.
+        static chip::Credentials::GroupDataProviderImpl groupDataProvider(max_groups_per_fabric, CHIP_CONFIG_MAX_GROUP_KEYS_PER_FABRIC);
+
+        groupDataProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
+        groupDataProvider.SetSessionKeystore(initParams.sessionKeystore);
+        groupDataProvider.Init();
+        initParams.groupDataProvider = &groupDataProvider;
+    }
+#endif // CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
+
     CHIP_ERROR ret = chip::Server::GetInstance().GetFabricTable().AddFabricDelegate(&s_fabric_delegate);
     if (ret != CHIP_NO_ERROR)
     {