From 7ff6cafec2b1af1504e77338c9dce000ab5479f2 Mon Sep 17 00:00:00 2001 From: mahesh Date: Fri, 26 Dec 2025 09:16:41 +0530 Subject: [PATCH] fix: correct misplaced server init callback in wifi-network-diagnostics-cluster Fixes https://github.com/espressif/esp-matter/issues/1623 --- components/esp_matter/data_model/esp_matter_cluster.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp_matter/data_model/esp_matter_cluster.cpp b/components/esp_matter/data_model/esp_matter_cluster.cpp index 92790eda4..5918479c8 100644 --- a/components/esp_matter/data_model/esp_matter_cluster.cpp +++ b/components/esp_matter/data_model/esp_matter_cluster.cpp @@ -745,6 +745,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) /* Attributes not managed internally */ global::attribute::create_cluster_revision(cluster, cluster_revision); + + cluster::set_init_and_shutdown_callbacks(cluster, ESPMatterWiFiNetworkDiagnosticsClusterServerInitCallback, + ESPMatterWiFiNetworkDiagnosticsClusterServerShutdownCallback); } return cluster; @@ -3529,9 +3532,6 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) /** Attributes not managed internally **/ global::attribute::create_cluster_revision(cluster, cluster_revision); - - cluster::set_init_and_shutdown_callbacks(cluster, ESPMatterWiFiNetworkDiagnosticsClusterServerInitCallback, - ESPMatterWiFiNetworkDiagnosticsClusterServerShutdownCallback); } /* Commands */