From 4915593d0cdedf99c29a2c947ddc3bfb8c55c7e3 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Wed, 27 Oct 2021 22:02:31 +0200 Subject: [PATCH] Use Matter{{clusterName}}PluginServerInitCallback instead of the per endpoint init callback for diagnostics related cluster AttributeAccessInterface instance (#10938) * Use Matter{{clusterName}}PluginServerInitCallback instead of the per endpoint init callback for diagnostics related cluster AttributeAccessInterface instance * Update generated content --- .../ethernet_network_diagnostics_server.cpp | 9 +-- .../general_diagnostics_server.cpp | 9 +-- .../software_diagnostics_server.cpp | 9 +-- .../thread_network_diagnostics_server.cpp | 9 +-- .../wifi_network_diagnostics_server.cpp | 9 +-- src/app/zap-templates/templates/app/helper.js | 5 -- .../zap-generated/endpoint_config.h | 60 +++++-------------- .../zap-generated/endpoint_config.h | 60 +++++-------------- .../zap-generated/endpoint_config.h | 60 +++++-------------- .../lock-app/zap-generated/endpoint_config.h | 60 +++++-------------- .../pump-app/zap-generated/endpoint_config.h | 60 +++++-------------- .../zap-generated/endpoint_config.h | 60 +++++-------------- .../zap-generated/endpoint_config.h | 48 ++++----------- .../zap-generated/endpoint_config.h | 60 +++++-------------- .../tv-app/zap-generated/endpoint_config.h | 60 +++++-------------- .../zap-generated/endpoint_config.h | 60 +++++-------------- .../zap-generated/endpoint_config.h | 60 +++++-------------- 17 files changed, 172 insertions(+), 526 deletions(-) diff --git a/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp b/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp index e3c24e8d3393a9..74031490bfbaed 100644 --- a/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp +++ b/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp @@ -144,12 +144,7 @@ bool emberAfEthernetNetworkDiagnosticsClusterResetCountsCallback(app::CommandHan return true; } -void emberAfEthernetNetworkDiagnosticsClusterServerInitCallback(EndpointId endpoint) +void MatterEthernetNetworkDiagnosticsClusterServerInitCallback() { - static bool attrAccessRegistered = false; - if (!attrAccessRegistered) - { - registerAttributeAccessOverride(&gAttrAccess); - attrAccessRegistered = true; - } + registerAttributeAccessOverride(&gAttrAccess); } diff --git a/src/app/clusters/general_diagnostics_server/general_diagnostics_server.cpp b/src/app/clusters/general_diagnostics_server/general_diagnostics_server.cpp index 32603c728ad245..2534d0649a0dd2 100644 --- a/src/app/clusters/general_diagnostics_server/general_diagnostics_server.cpp +++ b/src/app/clusters/general_diagnostics_server/general_diagnostics_server.cpp @@ -92,12 +92,7 @@ CHIP_ERROR GeneralDiagosticsAttrAccess::Read(const ConcreteAttributePath & aPath } } // anonymous namespace -void emberAfGeneralDiagnosticsClusterServerInitCallback(EndpointId endpoint) +void MatterGeneralDiagnosticsPluginServerInitCallback() { - static bool attrAccessRegistered = false; - if (!attrAccessRegistered) - { - registerAttributeAccessOverride(&gAttrAccess); - attrAccessRegistered = true; - } + registerAttributeAccessOverride(&gAttrAccess); } diff --git a/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp b/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp index 02ca2cbb67ec1c..07cab4013f6b0c 100644 --- a/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp +++ b/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp @@ -118,12 +118,7 @@ bool emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(app::CommandHandle return true; } -void emberAfSoftwareDiagnosticsClusterServerInitCallback(EndpointId endpoint) +void MatterSoftwareDiagnosticsPluginServerInitCallback() { - static bool attrAccessRegistered = false; - if (!attrAccessRegistered) - { - registerAttributeAccessOverride(&gAttrAccess); - attrAccessRegistered = true; - } + registerAttributeAccessOverride(&gAttrAccess); } diff --git a/src/app/clusters/thread_network_diagnostics_server/thread_network_diagnostics_server.cpp b/src/app/clusters/thread_network_diagnostics_server/thread_network_diagnostics_server.cpp index 408e772b091495..52428ddc33c8c7 100644 --- a/src/app/clusters/thread_network_diagnostics_server/thread_network_diagnostics_server.cpp +++ b/src/app/clusters/thread_network_diagnostics_server/thread_network_diagnostics_server.cpp @@ -94,12 +94,7 @@ bool emberAfThreadNetworkDiagnosticsClusterResetCountsCallback(app::CommandHandl return true; } -void emberAfThreadNetworkDiagnosticsClusterServerInitCallback(EndpointId endpoint) +void MatterThreadNetworkDiagnosticsPluginServerInitCallback() { - static bool attrAccessRegistered = false; - if (!attrAccessRegistered) - { - registerAttributeAccessOverride(&gAttrAccess); - attrAccessRegistered = true; - } + registerAttributeAccessOverride(&gAttrAccess); } diff --git a/src/app/clusters/wifi_network_diagnostics_server/wifi_network_diagnostics_server.cpp b/src/app/clusters/wifi_network_diagnostics_server/wifi_network_diagnostics_server.cpp index 194624526c2693..fa237a5f26489a 100644 --- a/src/app/clusters/wifi_network_diagnostics_server/wifi_network_diagnostics_server.cpp +++ b/src/app/clusters/wifi_network_diagnostics_server/wifi_network_diagnostics_server.cpp @@ -160,12 +160,7 @@ bool emberAfWiFiNetworkDiagnosticsClusterResetCountsCallback(app::CommandHandler return true; } -void emberAfWiFiNetworkDiagnosticsClusterServerInitCallback(EndpointId endpoint) +void MatterWiFiNetworkDiagnosticsPluginServerInitCallback() { - static bool attrAccessRegistered = false; - if (!attrAccessRegistered) - { - registerAttributeAccessOverride(&gAttrAccess); - attrAccessRegistered = true; - } + registerAttributeAccessOverride(&gAttrAccess); } diff --git a/src/app/zap-templates/templates/app/helper.js b/src/app/zap-templates/templates/app/helper.js index fe00bc0858d915..57e3c4cddb14b2 100644 --- a/src/app/zap-templates/templates/app/helper.js +++ b/src/app/zap-templates/templates/app/helper.js @@ -104,11 +104,6 @@ var endpointClusterWithInit = [ 'Color Control', 'IAS Zone', 'Pump Configuration and Control', - 'Ethernet Network Diagnostics', - 'Software Diagnostics', - 'Thread Network Diagnostics', - 'General Diagnostics', - 'WiFi Network Diagnostics', ]; var endpointClusterWithAttributeChanged = [ 'Identify', 'Door Lock', 'Pump Configuration and Control' ]; var endpointClusterWithPreAttribute = [ 'IAS Zone' ]; diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index c5f54a4ccf30ad..a277e7e72ba7a0 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -2756,21 +2756,6 @@ const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \ (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \ }; \ - const EmberAfGenericClusterFunction chipFuncArrayGeneralDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfGeneralDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArraySoftwareDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfSoftwareDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayThreadNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfThreadNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayWiFiNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfWiFiNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayEthernetNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfEthernetNetworkDiagnosticsClusterServerInitCallback, \ - }; \ const EmberAfGenericClusterFunction chipFuncArrayGroupsServer[] = { \ (EmberAfGenericClusterFunction) emberAfGroupsClusterServerInitCallback, \ }; \ @@ -2836,36 +2821,21 @@ { \ 0x0032, ZAP_ATTRIBUTE_INDEX(36), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { 0x0033, \ - ZAP_ATTRIBUTE_INDEX(36), \ - 6, \ - 271, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGeneralDiagnosticsServer }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { 0x0034, \ - ZAP_ATTRIBUTE_INDEX(42), \ - 4, \ - 26, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArraySoftwareDiagnosticsServer }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { 0x0035, \ - ZAP_ATTRIBUTE_INDEX(46), \ - 64, \ - 774, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThreadNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { 0x0036, \ - ZAP_ATTRIBUTE_INDEX(110), \ - 14, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayWiFiNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { 0x0037, \ - ZAP_ATTRIBUTE_INDEX(124), \ - 10, \ - 53, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayEthernetNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ + { \ + 0x0033, ZAP_ATTRIBUTE_INDEX(36), 6, 271, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { \ + 0x0034, ZAP_ATTRIBUTE_INDEX(42), 4, 26, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + { \ + 0x0035, ZAP_ATTRIBUTE_INDEX(46), 64, 774, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ + { \ + 0x0036, ZAP_ATTRIBUTE_INDEX(110), 14, 54, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + { \ + 0x0037, ZAP_ATTRIBUTE_INDEX(124), 10, 53, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ 0x003C, ZAP_ATTRIBUTE_INDEX(134), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h index 40479805c682fe..eb087c0710edaf 100644 --- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h +++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h @@ -1004,21 +1004,6 @@ const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \ (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \ }; \ - const EmberAfGenericClusterFunction chipFuncArrayGeneralDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfGeneralDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArraySoftwareDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfSoftwareDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayThreadNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfThreadNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayWiFiNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfWiFiNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayEthernetNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfEthernetNetworkDiagnosticsClusterServerInitCallback, \ - }; \ const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = { \ (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback, \ }; \ @@ -1046,36 +1031,21 @@ { \ 0x0032, ZAP_ATTRIBUTE_INDEX(21), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { 0x0033, \ - ZAP_ATTRIBUTE_INDEX(21), \ - 6, \ - 271, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGeneralDiagnosticsServer }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { 0x0034, \ - ZAP_ATTRIBUTE_INDEX(27), \ - 4, \ - 26, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArraySoftwareDiagnosticsServer }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { 0x0035, \ - ZAP_ATTRIBUTE_INDEX(31), \ - 64, \ - 774, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThreadNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { 0x0036, \ - ZAP_ATTRIBUTE_INDEX(95), \ - 14, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayWiFiNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { 0x0037, \ - ZAP_ATTRIBUTE_INDEX(109), \ - 10, \ - 53, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayEthernetNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ + { \ + 0x0033, ZAP_ATTRIBUTE_INDEX(21), 6, 271, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { \ + 0x0034, ZAP_ATTRIBUTE_INDEX(27), 4, 26, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + { \ + 0x0035, ZAP_ATTRIBUTE_INDEX(31), 64, 774, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ + { \ + 0x0036, ZAP_ATTRIBUTE_INDEX(95), 14, 54, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + { \ + 0x0037, ZAP_ATTRIBUTE_INDEX(109), 10, 53, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ 0x003C, ZAP_ATTRIBUTE_INDEX(119), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h index 662446aa7ab025..4840413f4cfa35 100644 --- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h @@ -1093,21 +1093,6 @@ const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \ (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \ }; \ - const EmberAfGenericClusterFunction chipFuncArrayGeneralDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfGeneralDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArraySoftwareDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfSoftwareDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayThreadNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfThreadNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayWiFiNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfWiFiNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayEthernetNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfEthernetNetworkDiagnosticsClusterServerInitCallback, \ - }; \ const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = { \ (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback, \ }; \ @@ -1141,36 +1126,21 @@ { \ 0x0032, ZAP_ATTRIBUTE_INDEX(28), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { 0x0033, \ - ZAP_ATTRIBUTE_INDEX(28), \ - 6, \ - 271, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGeneralDiagnosticsServer }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { 0x0034, \ - ZAP_ATTRIBUTE_INDEX(34), \ - 4, \ - 26, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArraySoftwareDiagnosticsServer }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { 0x0035, \ - ZAP_ATTRIBUTE_INDEX(38), \ - 64, \ - 774, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThreadNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { 0x0036, \ - ZAP_ATTRIBUTE_INDEX(102), \ - 14, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayWiFiNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { 0x0037, \ - ZAP_ATTRIBUTE_INDEX(116), \ - 10, \ - 53, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayEthernetNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ + { \ + 0x0033, ZAP_ATTRIBUTE_INDEX(28), 6, 271, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { \ + 0x0034, ZAP_ATTRIBUTE_INDEX(34), 4, 26, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + { \ + 0x0035, ZAP_ATTRIBUTE_INDEX(38), 64, 774, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ + { \ + 0x0036, ZAP_ATTRIBUTE_INDEX(102), 14, 54, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + { \ + 0x0037, ZAP_ATTRIBUTE_INDEX(116), 10, 53, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ 0x003C, ZAP_ATTRIBUTE_INDEX(126), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h index cd457b4c338c89..ef3d5df219cb98 100644 --- a/zzz_generated/lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h @@ -961,21 +961,6 @@ const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \ (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \ }; \ - const EmberAfGenericClusterFunction chipFuncArrayGeneralDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfGeneralDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArraySoftwareDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfSoftwareDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayThreadNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfThreadNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayWiFiNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfWiFiNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayEthernetNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfEthernetNetworkDiagnosticsClusterServerInitCallback, \ - }; \ const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = { \ (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback, \ }; @@ -1000,36 +985,21 @@ { \ 0x0032, ZAP_ATTRIBUTE_INDEX(21), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { 0x0033, \ - ZAP_ATTRIBUTE_INDEX(21), \ - 6, \ - 271, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGeneralDiagnosticsServer }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { 0x0034, \ - ZAP_ATTRIBUTE_INDEX(27), \ - 4, \ - 26, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArraySoftwareDiagnosticsServer }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { 0x0035, \ - ZAP_ATTRIBUTE_INDEX(31), \ - 64, \ - 774, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThreadNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { 0x0036, \ - ZAP_ATTRIBUTE_INDEX(95), \ - 14, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayWiFiNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { 0x0037, \ - ZAP_ATTRIBUTE_INDEX(109), \ - 10, \ - 53, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayEthernetNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ + { \ + 0x0033, ZAP_ATTRIBUTE_INDEX(21), 6, 271, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { \ + 0x0034, ZAP_ATTRIBUTE_INDEX(27), 4, 26, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + { \ + 0x0035, ZAP_ATTRIBUTE_INDEX(31), 64, 774, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ + { \ + 0x0036, ZAP_ATTRIBUTE_INDEX(95), 14, 54, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + { \ + 0x0037, ZAP_ATTRIBUTE_INDEX(109), 10, 53, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ 0x003C, ZAP_ATTRIBUTE_INDEX(119), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h index 57ce5551a772bf..30a862df95ee40 100644 --- a/zzz_generated/pump-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h @@ -1034,21 +1034,6 @@ const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \ (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \ }; \ - const EmberAfGenericClusterFunction chipFuncArrayGeneralDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfGeneralDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArraySoftwareDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfSoftwareDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayThreadNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfThreadNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayWiFiNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfWiFiNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayEthernetNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfEthernetNetworkDiagnosticsClusterServerInitCallback, \ - }; \ const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = { \ (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback, \ }; \ @@ -1080,36 +1065,21 @@ { \ 0x0032, ZAP_ATTRIBUTE_INDEX(21), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { 0x0033, \ - ZAP_ATTRIBUTE_INDEX(21), \ - 6, \ - 271, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGeneralDiagnosticsServer }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { 0x0034, \ - ZAP_ATTRIBUTE_INDEX(27), \ - 4, \ - 26, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArraySoftwareDiagnosticsServer }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { 0x0035, \ - ZAP_ATTRIBUTE_INDEX(31), \ - 64, \ - 774, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThreadNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { 0x0036, \ - ZAP_ATTRIBUTE_INDEX(95), \ - 14, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayWiFiNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { 0x0037, \ - ZAP_ATTRIBUTE_INDEX(109), \ - 10, \ - 53, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayEthernetNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ + { \ + 0x0033, ZAP_ATTRIBUTE_INDEX(21), 6, 271, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { \ + 0x0034, ZAP_ATTRIBUTE_INDEX(27), 4, 26, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + { \ + 0x0035, ZAP_ATTRIBUTE_INDEX(31), 64, 774, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ + { \ + 0x0036, ZAP_ATTRIBUTE_INDEX(95), 14, 54, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + { \ + 0x0037, ZAP_ATTRIBUTE_INDEX(109), 10, 53, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ 0x003C, ZAP_ATTRIBUTE_INDEX(119), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ diff --git a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h index f07b5e804db353..4ebee0c62ae09b 100644 --- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h @@ -959,21 +959,6 @@ #define GENERATED_FUNCTION_ARRAYS \ const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \ (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayGeneralDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfGeneralDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArraySoftwareDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfSoftwareDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayThreadNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfThreadNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayWiFiNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfWiFiNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayEthernetNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfEthernetNetworkDiagnosticsClusterServerInitCallback, \ }; #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask @@ -1001,36 +986,21 @@ { \ 0x0032, ZAP_ATTRIBUTE_INDEX(22), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { 0x0033, \ - ZAP_ATTRIBUTE_INDEX(22), \ - 6, \ - 271, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGeneralDiagnosticsServer }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { 0x0034, \ - ZAP_ATTRIBUTE_INDEX(28), \ - 4, \ - 26, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArraySoftwareDiagnosticsServer }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { 0x0035, \ - ZAP_ATTRIBUTE_INDEX(32), \ - 64, \ - 774, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThreadNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { 0x0036, \ - ZAP_ATTRIBUTE_INDEX(96), \ - 14, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayWiFiNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { 0x0037, \ - ZAP_ATTRIBUTE_INDEX(110), \ - 10, \ - 53, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayEthernetNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ + { \ + 0x0033, ZAP_ATTRIBUTE_INDEX(22), 6, 271, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { \ + 0x0034, ZAP_ATTRIBUTE_INDEX(28), 4, 26, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + { \ + 0x0035, ZAP_ATTRIBUTE_INDEX(32), 64, 774, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ + { \ + 0x0036, ZAP_ATTRIBUTE_INDEX(96), 14, 54, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + { \ + 0x0037, ZAP_ATTRIBUTE_INDEX(110), 10, 53, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ 0x003C, ZAP_ATTRIBUTE_INDEX(120), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ diff --git a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h index 9f208a7e527c3f..807aa5076ef4ca 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h +++ b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h @@ -523,18 +523,6 @@ #define GENERATED_FUNCTION_ARRAYS \ const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \ (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayGeneralDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfGeneralDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArraySoftwareDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfSoftwareDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayWiFiNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfWiFiNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayEthernetNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfEthernetNetworkDiagnosticsClusterServerInitCallback, \ }; #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask @@ -557,30 +545,18 @@ { \ 0x0032, ZAP_ATTRIBUTE_INDEX(21), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { 0x0033, \ - ZAP_ATTRIBUTE_INDEX(21), \ - 6, \ - 271, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGeneralDiagnosticsServer }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { 0x0034, \ - ZAP_ATTRIBUTE_INDEX(27), \ - 2, \ - 10, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArraySoftwareDiagnosticsServer }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { 0x0036, \ - ZAP_ATTRIBUTE_INDEX(29), \ - 14, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayWiFiNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { 0x0037, \ - ZAP_ATTRIBUTE_INDEX(43), \ - 10, \ - 53, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayEthernetNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ + { \ + 0x0033, ZAP_ATTRIBUTE_INDEX(21), 6, 271, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { \ + 0x0034, ZAP_ATTRIBUTE_INDEX(27), 2, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + { \ + 0x0036, ZAP_ATTRIBUTE_INDEX(29), 14, 54, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + { \ + 0x0037, ZAP_ATTRIBUTE_INDEX(43), 10, 53, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ 0x003C, ZAP_ATTRIBUTE_INDEX(53), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index 4fe350a7a75c92..a45fc696d23371 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -2205,21 +2205,6 @@ const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \ (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \ }; \ - const EmberAfGenericClusterFunction chipFuncArrayGeneralDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfGeneralDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArraySoftwareDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfSoftwareDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayThreadNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfThreadNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayWiFiNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfWiFiNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayEthernetNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfEthernetNetworkDiagnosticsClusterServerInitCallback, \ - }; \ const EmberAfGenericClusterFunction chipFuncArrayIdentifyServer[] = { \ (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerInitCallback, \ (EmberAfGenericClusterFunction) MatterIdentifyClusterServerAttributeChangedCallback, \ @@ -2274,36 +2259,21 @@ { \ 0x0032, ZAP_ATTRIBUTE_INDEX(29), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { 0x0033, \ - ZAP_ATTRIBUTE_INDEX(29), \ - 6, \ - 271, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGeneralDiagnosticsServer }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { 0x0034, \ - ZAP_ATTRIBUTE_INDEX(35), \ - 4, \ - 26, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArraySoftwareDiagnosticsServer }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { 0x0035, \ - ZAP_ATTRIBUTE_INDEX(39), \ - 64, \ - 774, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThreadNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { 0x0036, \ - ZAP_ATTRIBUTE_INDEX(103), \ - 14, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayWiFiNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { 0x0037, \ - ZAP_ATTRIBUTE_INDEX(117), \ - 10, \ - 53, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayEthernetNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ + { \ + 0x0033, ZAP_ATTRIBUTE_INDEX(29), 6, 271, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { \ + 0x0034, ZAP_ATTRIBUTE_INDEX(35), 4, 26, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + { \ + 0x0035, ZAP_ATTRIBUTE_INDEX(39), 64, 774, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ + { \ + 0x0036, ZAP_ATTRIBUTE_INDEX(103), 14, 54, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + { \ + 0x0037, ZAP_ATTRIBUTE_INDEX(117), 10, 53, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ 0x003C, ZAP_ATTRIBUTE_INDEX(127), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index b9566c13a1a04a..caef6dd58fc929 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -1801,21 +1801,6 @@ const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \ (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \ }; \ - const EmberAfGenericClusterFunction chipFuncArrayGeneralDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfGeneralDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArraySoftwareDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfSoftwareDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayThreadNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfThreadNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayWiFiNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfWiFiNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayEthernetNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfEthernetNetworkDiagnosticsClusterServerInitCallback, \ - }; \ const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = { \ (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback, \ }; \ @@ -1852,36 +1837,21 @@ { \ 0x0032, ZAP_ATTRIBUTE_INDEX(30), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { 0x0033, \ - ZAP_ATTRIBUTE_INDEX(30), \ - 6, \ - 271, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGeneralDiagnosticsServer }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { 0x0034, \ - ZAP_ATTRIBUTE_INDEX(36), \ - 4, \ - 26, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArraySoftwareDiagnosticsServer }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { 0x0035, \ - ZAP_ATTRIBUTE_INDEX(40), \ - 64, \ - 774, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThreadNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { 0x0036, \ - ZAP_ATTRIBUTE_INDEX(104), \ - 14, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayWiFiNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { 0x0037, \ - ZAP_ATTRIBUTE_INDEX(118), \ - 10, \ - 53, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayEthernetNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ + { \ + 0x0033, ZAP_ATTRIBUTE_INDEX(30), 6, 271, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { \ + 0x0034, ZAP_ATTRIBUTE_INDEX(36), 4, 26, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + { \ + 0x0035, ZAP_ATTRIBUTE_INDEX(40), 64, 774, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ + { \ + 0x0036, ZAP_ATTRIBUTE_INDEX(104), 14, 54, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + { \ + 0x0037, ZAP_ATTRIBUTE_INDEX(118), 10, 53, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ 0x003C, ZAP_ATTRIBUTE_INDEX(128), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h index 1910c2487c35cd..2b451a85c1d091 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -2144,21 +2144,6 @@ const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \ (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \ }; \ - const EmberAfGenericClusterFunction chipFuncArrayGeneralDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfGeneralDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArraySoftwareDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfSoftwareDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayThreadNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfThreadNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayWiFiNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfWiFiNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayEthernetNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfEthernetNetworkDiagnosticsClusterServerInitCallback, \ - }; \ const EmberAfGenericClusterFunction chipFuncArrayIdentifyServer[] = { \ (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerInitCallback, \ (EmberAfGenericClusterFunction) MatterIdentifyClusterServerAttributeChangedCallback, \ @@ -2213,36 +2198,21 @@ { \ 0x0032, ZAP_ATTRIBUTE_INDEX(29), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { 0x0033, \ - ZAP_ATTRIBUTE_INDEX(29), \ - 6, \ - 271, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGeneralDiagnosticsServer }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { 0x0034, \ - ZAP_ATTRIBUTE_INDEX(35), \ - 4, \ - 26, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArraySoftwareDiagnosticsServer }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { 0x0035, \ - ZAP_ATTRIBUTE_INDEX(39), \ - 64, \ - 774, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThreadNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { 0x0036, \ - ZAP_ATTRIBUTE_INDEX(103), \ - 14, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayWiFiNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { 0x0037, \ - ZAP_ATTRIBUTE_INDEX(117), \ - 10, \ - 53, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayEthernetNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ + { \ + 0x0033, ZAP_ATTRIBUTE_INDEX(29), 6, 271, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { \ + 0x0034, ZAP_ATTRIBUTE_INDEX(35), 4, 26, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + { \ + 0x0035, ZAP_ATTRIBUTE_INDEX(39), 64, 774, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ + { \ + 0x0036, ZAP_ATTRIBUTE_INDEX(103), 14, 54, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + { \ + 0x0037, ZAP_ATTRIBUTE_INDEX(117), 10, 53, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ 0x003C, ZAP_ATTRIBUTE_INDEX(127), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h index 61c93da7d56b8d..94979968dc92a6 100644 --- a/zzz_generated/window-app/zap-generated/endpoint_config.h +++ b/zzz_generated/window-app/zap-generated/endpoint_config.h @@ -1012,21 +1012,6 @@ #define GENERATED_FUNCTION_ARRAYS \ const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \ (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayGeneralDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfGeneralDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArraySoftwareDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfSoftwareDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayThreadNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfThreadNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayWiFiNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfWiFiNetworkDiagnosticsClusterServerInitCallback, \ - }; \ - const EmberAfGenericClusterFunction chipFuncArrayEthernetNetworkDiagnosticsServer[] = { \ - (EmberAfGenericClusterFunction) emberAfEthernetNetworkDiagnosticsClusterServerInitCallback, \ }; #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask @@ -1046,36 +1031,21 @@ { \ 0x0031, ZAP_ATTRIBUTE_INDEX(20), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { 0x0033, \ - ZAP_ATTRIBUTE_INDEX(21), \ - 6, \ - 271, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGeneralDiagnosticsServer }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { 0x0034, \ - ZAP_ATTRIBUTE_INDEX(27), \ - 4, \ - 26, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArraySoftwareDiagnosticsServer }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { 0x0035, \ - ZAP_ATTRIBUTE_INDEX(31), \ - 64, \ - 774, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThreadNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { 0x0036, \ - ZAP_ATTRIBUTE_INDEX(95), \ - 14, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayWiFiNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { 0x0037, \ - ZAP_ATTRIBUTE_INDEX(109), \ - 10, \ - 53, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayEthernetNetworkDiagnosticsServer }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ + { \ + 0x0033, ZAP_ATTRIBUTE_INDEX(21), 6, 271, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { \ + 0x0034, ZAP_ATTRIBUTE_INDEX(27), 4, 26, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + { \ + 0x0035, ZAP_ATTRIBUTE_INDEX(31), 64, 774, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ + { \ + 0x0036, ZAP_ATTRIBUTE_INDEX(95), 14, 54, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + { \ + 0x0037, ZAP_ATTRIBUTE_INDEX(109), 10, 53, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ 0x003C, ZAP_ATTRIBUTE_INDEX(119), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \