From 119080772b91953de507d26b5e5bc2c36fe4bf20 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Sun, 26 Feb 2023 10:16:59 -0500 Subject: [PATCH] Update ZAP to tip. (#25327) Fixes the width of device type in the generated discovery commands to match spec. --- .../docker/images/chip-cert-bins/Dockerfile | 2 +- scripts/setup/zap.json | 2 +- .../app-templates/endpoint_config.h | 468 +++++++++--------- .../app-templates/endpoint_config.h | 174 +++---- scripts/tools/zap/zap_execution.py | 2 +- .../tests/simulated-cluster-objects.h | 2 +- .../chip-tool/zap-generated/test/Commands.h | 2 +- .../zap-generated/endpoint_config.h | 396 +++++++-------- 8 files changed, 524 insertions(+), 524 deletions(-) diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile index 872c3e696fed1f..f1b51ab72c1962 100644 --- a/integrations/docker/images/chip-cert-bins/Dockerfile +++ b/integrations/docker/images/chip-cert-bins/Dockerfile @@ -7,7 +7,7 @@ ARG COMMITHASH=7b99e6399c6069037c613782d78132c69b9dcabb # ZAP Development install, so that it runs on both x64 and arm64 # Generally this should match with the ZAP version that is used for codegen within the # specified SHA -ARG ZAP_VERSION=v2023.02.16-nightly +ARG ZAP_VERSION=v2023.02.25-nightly # Ensure TARGETPLATFORM is set RUN case ${TARGETPLATFORM} in \ diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json index 9dff5d9940e660..dc90b31539b2e4 100644 --- a/scripts/setup/zap.json +++ b/scripts/setup/zap.json @@ -8,7 +8,7 @@ "mac-arm64", "windows-amd64" ], - "tags": ["version:2@v2023.02.16-nightly.1"] + "tags": ["version:2@v2023.02.25-nightly.1"] } ] } diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h index 53abe1bd9e8aa7..befeed9758c537 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h @@ -1929,1015 +1929,1015 @@ #define GENERATED_CLUSTERS { \ { \ /* Endpoint: 0, Cluster: Identify (server) */ \ - .clusterId = 0x00000003, \ + .clusterId = 0x00000003, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 4, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Groups (server) */ \ - .clusterId = 0x00000004, \ + .clusterId = 0x00000004, \ .attributes = ZAP_ATTRIBUTE_INDEX(4), \ .attributeCount = 3, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 3 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 10 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 3 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 10 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Descriptor (server) */ \ - .clusterId = 0x0000001D, \ + .clusterId = 0x0000001D, \ .attributes = ZAP_ATTRIBUTE_INDEX(7), \ .attributeCount = 6, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Binding (server) */ \ - .clusterId = 0x0000001E, \ + .clusterId = 0x0000001E, \ .attributes = ZAP_ATTRIBUTE_INDEX(13), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Access Control (server) */ \ - .clusterId = 0x0000001F, \ + .clusterId = 0x0000001F, \ .attributes = ZAP_ATTRIBUTE_INDEX(16), \ .attributeCount = 7, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 0 ), \ .eventCount = 2, \ },\ { \ /* Endpoint: 0, Cluster: Basic Information (server) */ \ - .clusterId = 0x00000028, \ + .clusterId = 0x00000028, \ .attributes = ZAP_ATTRIBUTE_INDEX(23), \ .attributeCount = 22, \ .clusterSize = 41, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 2 ), \ .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \ - .clusterId = 0x00000029, \ + .clusterId = 0x00000029, \ .attributes = ZAP_ATTRIBUTE_INDEX(45), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ - .clusterId = 0x0000002A, \ + .clusterId = 0x0000002A, \ .attributes = ZAP_ATTRIBUTE_INDEX(45), \ .attributeCount = 6, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 15 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 15 ), \ + .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 5 ), \ .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ - .clusterId = 0x0000002B, \ + .clusterId = 0x0000002B, \ .attributes = ZAP_ATTRIBUTE_INDEX(51), \ .attributeCount = 4, \ .clusterSize = 42, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayLocalizationConfigurationServer, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ - .clusterId = 0x0000002C, \ + .clusterId = 0x0000002C, \ .attributes = ZAP_ATTRIBUTE_INDEX(55), \ .attributeCount = 5, \ .clusterSize = 8, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayTimeFormatLocalizationServer, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Unit Localization (server) */ \ - .clusterId = 0x0000002D, \ + .clusterId = 0x0000002D, \ .attributes = ZAP_ATTRIBUTE_INDEX(60), \ .attributeCount = 3, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Power Source Configuration (server) */ \ - .clusterId = 0x0000002E, \ + .clusterId = 0x0000002E, \ .attributes = ZAP_ATTRIBUTE_INDEX(63), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Power Source (server) */ \ - .clusterId = 0x0000002F, \ + .clusterId = 0x0000002F, \ .attributes = ZAP_ATTRIBUTE_INDEX(66), \ .attributeCount = 8, \ .clusterSize = 72, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - .clusterId = 0x00000030, \ + .clusterId = 0x00000030, \ .attributes = ZAP_ATTRIBUTE_INDEX(74), \ .attributeCount = 7, \ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 17 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 21 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 17 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 21 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - .clusterId = 0x00000031, \ + .clusterId = 0x00000031, \ .attributes = ZAP_ATTRIBUTE_INDEX(81), \ .attributeCount = 10, \ .clusterSize = 48, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - .clusterId = 0x00000032, \ + .clusterId = 0x00000032, \ .attributes = ZAP_ATTRIBUTE_INDEX(91), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - .clusterId = 0x00000033, \ + .clusterId = 0x00000033, \ .attributes = ZAP_ATTRIBUTE_INDEX(93), \ .attributeCount = 11, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ), \ + .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 8 ), \ .eventCount = 4, \ },\ { \ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - .clusterId = 0x00000034, \ + .clusterId = 0x00000034, \ .attributes = ZAP_ATTRIBUTE_INDEX(104), \ .attributeCount = 6, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 42 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 42 ), \ + .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 12 ), \ .eventCount = 1, \ },\ { \ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - .clusterId = 0x00000035, \ + .clusterId = 0x00000035, \ .attributes = ZAP_ATTRIBUTE_INDEX(110), \ .attributeCount = 65, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - .clusterId = 0x00000036, \ + .clusterId = 0x00000036, \ .attributes = ZAP_ATTRIBUTE_INDEX(175), \ .attributeCount = 15, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ), \ + .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 13 ), \ .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ - .clusterId = 0x00000037, \ + .clusterId = 0x00000037, \ .attributes = ZAP_ATTRIBUTE_INDEX(190), \ .attributeCount = 11, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ - .clusterId = 0x0000003C, \ + .clusterId = 0x0000003C, \ .attributes = ZAP_ATTRIBUTE_INDEX(201), \ .attributeCount = 5, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - .clusterId = 0x0000003E, \ + .clusterId = 0x0000003E, \ .attributes = ZAP_ATTRIBUTE_INDEX(206), \ .attributeCount = 8, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Group Key Management (server) */ \ - .clusterId = 0x0000003F, \ + .clusterId = 0x0000003F, \ .attributes = ZAP_ATTRIBUTE_INDEX(214), \ .attributeCount = 6, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Fixed Label (server) */ \ - .clusterId = 0x00000040, \ + .clusterId = 0x00000040, \ .attributes = ZAP_ATTRIBUTE_INDEX(220), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: User Label (server) */ \ - .clusterId = 0x00000041, \ + .clusterId = 0x00000041, \ .attributes = ZAP_ATTRIBUTE_INDEX(223), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ - .clusterId = 0x00000405, \ + .clusterId = 0x00000405, \ .attributes = ZAP_ATTRIBUTE_INDEX(226), \ .attributeCount = 5, \ .clusterSize = 12, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Fault Injection (server) */ \ - .clusterId = 0xFFF1FC06, \ + .clusterId = 0xFFF1FC06, \ .attributes = ZAP_ATTRIBUTE_INDEX(231), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Identify (server) */ \ - .clusterId = 0x00000003, \ + .clusterId = 0x00000003, \ .attributes = ZAP_ATTRIBUTE_INDEX(233), \ .attributeCount = 4, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ - .clusterId = 0x00000004, \ + .clusterId = 0x00000004, \ .attributes = ZAP_ATTRIBUTE_INDEX(237), \ .attributeCount = 3, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 82 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 82 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Scenes (server) */ \ - .clusterId = 0x00000005, \ + .clusterId = 0x00000005, \ .attributes = ZAP_ATTRIBUTE_INDEX(240), \ .attributeCount = 7, \ .clusterSize = 12, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayScenesServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 94 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 102 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 94 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 102 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: On/Off (server) */ \ - .clusterId = 0x00000006, \ + .clusterId = 0x00000006, \ .attributes = ZAP_ATTRIBUTE_INDEX(247), \ .attributeCount = 7, \ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 109 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 109 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: On/off Switch Configuration (server) */ \ - .clusterId = 0x00000007, \ + .clusterId = 0x00000007, \ .attributes = ZAP_ATTRIBUTE_INDEX(254), \ .attributeCount = 4, \ .clusterSize = 8, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Level Control (server) */ \ - .clusterId = 0x00000008, \ + .clusterId = 0x00000008, \ .attributes = ZAP_ATTRIBUTE_INDEX(258), \ .attributeCount = 16, \ .clusterSize = 27, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayLevelControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 116 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 116 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Binary Input (Basic) (server) */ \ - .clusterId = 0x0000000F, \ + .clusterId = 0x0000000F, \ .attributes = ZAP_ATTRIBUTE_INDEX(274), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Descriptor (server) */ \ - .clusterId = 0x0000001D, \ + .clusterId = 0x0000001D, \ .attributes = ZAP_ATTRIBUTE_INDEX(279), \ .attributeCount = 6, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Binding (server) */ \ - .clusterId = 0x0000001E, \ + .clusterId = 0x0000001E, \ .attributes = ZAP_ATTRIBUTE_INDEX(285), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Actions (server) */ \ - .clusterId = 0x00000025, \ + .clusterId = 0x00000025, \ .attributes = ZAP_ATTRIBUTE_INDEX(288), \ .attributeCount = 5, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Power Source (server) */ \ - .clusterId = 0x0000002F, \ + .clusterId = 0x0000002F, \ .attributes = ZAP_ATTRIBUTE_INDEX(293), \ .attributeCount = 8, \ .clusterSize = 72, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Switch (server) */ \ - .clusterId = 0x0000003B, \ + .clusterId = 0x0000003B, \ .attributes = ZAP_ATTRIBUTE_INDEX(301), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 16 ), \ .eventCount = 1, \ },\ { \ /* Endpoint: 1, Cluster: Fixed Label (server) */ \ - .clusterId = 0x00000040, \ + .clusterId = 0x00000040, \ .attributes = ZAP_ATTRIBUTE_INDEX(306), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: User Label (server) */ \ - .clusterId = 0x00000041, \ + .clusterId = 0x00000041, \ .attributes = ZAP_ATTRIBUTE_INDEX(309), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Boolean State (server) */ \ - .clusterId = 0x00000045, \ + .clusterId = 0x00000045, \ .attributes = ZAP_ATTRIBUTE_INDEX(312), \ .attributeCount = 3, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Mode Select (server) */ \ - .clusterId = 0x00000050, \ + .clusterId = 0x00000050, \ .attributes = ZAP_ATTRIBUTE_INDEX(315), \ .attributeCount = 9, \ .clusterSize = 45, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayModeSelectServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 125 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 125 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Door Lock (server) */ \ - .clusterId = 0x00000101, \ + .clusterId = 0x00000101, \ .attributes = ZAP_ATTRIBUTE_INDEX(324), \ .attributeCount = 33, \ .clusterSize = 55, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayDoorLockServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 127 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 142 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 127 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 142 ), \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 17 ), \ .eventCount = 4, \ },\ { \ /* Endpoint: 1, Cluster: Window Covering (server) */ \ - .clusterId = 0x00000102, \ + .clusterId = 0x00000102, \ .attributes = ZAP_ATTRIBUTE_INDEX(357), \ .attributeCount = 24, \ .clusterSize = 43, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayWindowCoveringServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 148 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 148 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Barrier Control (server) */ \ - .clusterId = 0x00000103, \ + .clusterId = 0x00000103, \ .attributes = ZAP_ATTRIBUTE_INDEX(381), \ .attributeCount = 6, \ .clusterSize = 11, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayBarrierControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 156 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 156 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \ - .clusterId = 0x00000200, \ + .clusterId = 0x00000200, \ .attributes = ZAP_ATTRIBUTE_INDEX(387), \ .attributeCount = 25, \ .clusterSize = 52, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayPumpConfigurationAndControlServer, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Thermostat (server) */ \ - .clusterId = 0x00000201, \ + .clusterId = 0x00000201, \ .attributes = ZAP_ATTRIBUTE_INDEX(412), \ .attributeCount = 16, \ .clusterSize = 31, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayThermostatServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 159 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 159 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Fan Control (server) */ \ - .clusterId = 0x00000202, \ + .clusterId = 0x00000202, \ .attributes = ZAP_ATTRIBUTE_INDEX(428), \ .attributeCount = 13, \ .clusterSize = 17, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayFanControlServer, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ - .clusterId = 0x00000204, \ + .clusterId = 0x00000204, \ .attributes = ZAP_ATTRIBUTE_INDEX(441), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayThermostatUserInterfaceConfigurationServer, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Color Control (server) */ \ - .clusterId = 0x00000300, \ + .clusterId = 0x00000300, \ .attributes = ZAP_ATTRIBUTE_INDEX(446), \ .attributeCount = 54, \ .clusterSize = 345, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayColorControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 161 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 161 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \ - .clusterId = 0x00000400, \ + .clusterId = 0x00000400, \ .attributes = ZAP_ATTRIBUTE_INDEX(500), \ .attributeCount = 7, \ .clusterSize = 15, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \ - .clusterId = 0x00000402, \ + .clusterId = 0x00000402, \ .attributes = ZAP_ATTRIBUTE_INDEX(507), \ .attributeCount = 6, \ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \ - .clusterId = 0x00000403, \ + .clusterId = 0x00000403, \ .attributes = ZAP_ATTRIBUTE_INDEX(513), \ .attributeCount = 5, \ .clusterSize = 12, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ - .clusterId = 0x00000404, \ + .clusterId = 0x00000404, \ .attributes = ZAP_ATTRIBUTE_INDEX(518), \ .attributeCount = 6, \ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \ - .clusterId = 0x00000405, \ + .clusterId = 0x00000405, \ .attributes = ZAP_ATTRIBUTE_INDEX(524), \ .attributeCount = 6, \ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - .clusterId = 0x00000406, \ + .clusterId = 0x00000406, \ .attributes = ZAP_ATTRIBUTE_INDEX(530), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayOccupancySensingServer, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Wake on LAN (server) */ \ - .clusterId = 0x00000503, \ + .clusterId = 0x00000503, \ .attributes = ZAP_ATTRIBUTE_INDEX(535), \ .attributeCount = 3, \ .clusterSize = 39, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Channel (server) */ \ - .clusterId = 0x00000504, \ + .clusterId = 0x00000504, \ .attributes = ZAP_ATTRIBUTE_INDEX(538), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Target Navigator (server) */ \ - .clusterId = 0x00000505, \ + .clusterId = 0x00000505, \ .attributes = ZAP_ATTRIBUTE_INDEX(541), \ .attributeCount = 4, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 181 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 183 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 181 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 183 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Media Playback (server) */ \ - .clusterId = 0x00000506, \ + .clusterId = 0x00000506, \ .attributes = ZAP_ATTRIBUTE_INDEX(545), \ .attributeCount = 8, \ .clusterSize = 43, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Media Input (server) */ \ - .clusterId = 0x00000507, \ + .clusterId = 0x00000507, \ .attributes = ZAP_ATTRIBUTE_INDEX(553), \ .attributeCount = 4, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 185 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 185 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Low Power (server) */ \ - .clusterId = 0x00000508, \ + .clusterId = 0x00000508, \ .attributes = ZAP_ATTRIBUTE_INDEX(557), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 190 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 190 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Keypad Input (server) */ \ - .clusterId = 0x00000509, \ + .clusterId = 0x00000509, \ .attributes = ZAP_ATTRIBUTE_INDEX(559), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 192 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 194 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 192 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 194 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Content Launcher (server) */ \ - .clusterId = 0x0000050A, \ + .clusterId = 0x0000050A, \ .attributes = ZAP_ATTRIBUTE_INDEX(561), \ .attributeCount = 4, \ .clusterSize = 10, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Audio Output (server) */ \ - .clusterId = 0x0000050B, \ + .clusterId = 0x0000050B, \ .attributes = ZAP_ATTRIBUTE_INDEX(565), \ .attributeCount = 4, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Application Launcher (server) */ \ - .clusterId = 0x0000050C, \ + .clusterId = 0x0000050C, \ .attributes = ZAP_ATTRIBUTE_INDEX(569), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Application Basic (server) */ \ - .clusterId = 0x0000050D, \ + .clusterId = 0x0000050D, \ .attributes = ZAP_ATTRIBUTE_INDEX(572), \ .attributeCount = 9, \ .clusterSize = 110, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Account Login (server) */ \ - .clusterId = 0x0000050E, \ + .clusterId = 0x0000050E, \ .attributes = ZAP_ATTRIBUTE_INDEX(581), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \ - .clusterId = 0x00000B04, \ + .clusterId = 0x00000B04, \ .attributes = ZAP_ATTRIBUTE_INDEX(583), \ .attributeCount = 13, \ .clusterSize = 32, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Unit Testing (server) */ \ - .clusterId = 0xFFF1FC05, \ + .clusterId = 0xFFF1FC05, \ .attributes = ZAP_ATTRIBUTE_INDEX(596), \ .attributeCount = 83, \ .clusterSize = 2289, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 196 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 215 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 196 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 215 ), \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 21 ), \ .eventCount = 2, \ },\ { \ /* Endpoint: 2, Cluster: Groups (server) */ \ - .clusterId = 0x00000004, \ + .clusterId = 0x00000004, \ .attributes = ZAP_ATTRIBUTE_INDEX(679), \ .attributeCount = 3, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 225 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 232 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 225 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 232 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 2, Cluster: On/Off (server) */ \ - .clusterId = 0x00000006, \ + .clusterId = 0x00000006, \ .attributes = ZAP_ATTRIBUTE_INDEX(682), \ .attributeCount = 7, \ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 237 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 237 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 2, Cluster: Descriptor (server) */ \ - .clusterId = 0x0000001D, \ + .clusterId = 0x0000001D, \ .attributes = ZAP_ATTRIBUTE_INDEX(689), \ .attributeCount = 6, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 2, Cluster: Power Source (server) */ \ - .clusterId = 0x0000002F, \ + .clusterId = 0x0000002F, \ .attributes = ZAP_ATTRIBUTE_INDEX(695), \ .attributeCount = 8, \ .clusterSize = 72, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \ - .clusterId = 0x00000406, \ + .clusterId = 0x00000406, \ .attributes = ZAP_ATTRIBUTE_INDEX(703), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayOccupancySensingServer, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 65534, Cluster: Network Commissioning (server) */ \ - .clusterId = 0x00000031, \ + .clusterId = 0x00000031, \ .attributes = ZAP_ATTRIBUTE_INDEX(708), \ .attributeCount = 10, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 241 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 248 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 241 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 248 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h index f70a3c5efe82e8..43598a42835cd6 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h @@ -769,378 +769,378 @@ #define GENERATED_CLUSTERS { \ { \ /* Endpoint: 0, Cluster: Groups (server) */ \ - .clusterId = 0x00000004, \ + .clusterId = 0x00000004, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 3, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 7 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 7 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Descriptor (server) */ \ - .clusterId = 0x0000001D, \ + .clusterId = 0x0000001D, \ .attributes = ZAP_ATTRIBUTE_INDEX(3), \ .attributeCount = 6, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Access Control (server) */ \ - .clusterId = 0x0000001F, \ + .clusterId = 0x0000001F, \ .attributes = ZAP_ATTRIBUTE_INDEX(9), \ .attributeCount = 7, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 0 ), \ .eventCount = 2, \ },\ { \ /* Endpoint: 0, Cluster: Basic Information (server) */ \ - .clusterId = 0x00000028, \ + .clusterId = 0x00000028, \ .attributes = ZAP_ATTRIBUTE_INDEX(16), \ .attributeCount = 22, \ .clusterSize = 41, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 2 ), \ .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \ - .clusterId = 0x00000029, \ + .clusterId = 0x00000029, \ .attributes = ZAP_ATTRIBUTE_INDEX(38), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ - .clusterId = 0x0000002A, \ + .clusterId = 0x0000002A, \ .attributes = ZAP_ATTRIBUTE_INDEX(38), \ .attributeCount = 6, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 12 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 12 ), \ + .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 5 ), \ .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ - .clusterId = 0x0000002B, \ + .clusterId = 0x0000002B, \ .attributes = ZAP_ATTRIBUTE_INDEX(44), \ .attributeCount = 4, \ .clusterSize = 42, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayLocalizationConfigurationServer, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ - .clusterId = 0x0000002C, \ + .clusterId = 0x0000002C, \ .attributes = ZAP_ATTRIBUTE_INDEX(48), \ .attributeCount = 5, \ .clusterSize = 8, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayTimeFormatLocalizationServer, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - .clusterId = 0x00000030, \ + .clusterId = 0x00000030, \ .attributes = ZAP_ATTRIBUTE_INDEX(53), \ .attributeCount = 7, \ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 14 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 18 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 14 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 18 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - .clusterId = 0x00000031, \ + .clusterId = 0x00000031, \ .attributes = ZAP_ATTRIBUTE_INDEX(60), \ .attributeCount = 10, \ .clusterSize = 48, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 22 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 29 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 22 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 29 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - .clusterId = 0x00000032, \ + .clusterId = 0x00000032, \ .attributes = ZAP_ATTRIBUTE_INDEX(70), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - .clusterId = 0x00000033, \ + .clusterId = 0x00000033, \ .attributes = ZAP_ATTRIBUTE_INDEX(72), \ .attributeCount = 11, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ), \ + .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 8 ), \ .eventCount = 4, \ },\ { \ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - .clusterId = 0x00000034, \ + .clusterId = 0x00000034, \ .attributes = ZAP_ATTRIBUTE_INDEX(83), \ .attributeCount = 6, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - .clusterId = 0x00000035, \ + .clusterId = 0x00000035, \ .attributes = ZAP_ATTRIBUTE_INDEX(89), \ .attributeCount = 65, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - .clusterId = 0x00000036, \ + .clusterId = 0x00000036, \ .attributes = ZAP_ATTRIBUTE_INDEX(154), \ .attributeCount = 15, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ), \ + .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 12 ), \ .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ - .clusterId = 0x00000037, \ + .clusterId = 0x00000037, \ .attributes = ZAP_ATTRIBUTE_INDEX(169), \ .attributeCount = 11, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Switch (server) */ \ - .clusterId = 0x0000003B, \ + .clusterId = 0x0000003B, \ .attributes = ZAP_ATTRIBUTE_INDEX(180), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ - .clusterId = 0x0000003C, \ + .clusterId = 0x0000003C, \ .attributes = ZAP_ATTRIBUTE_INDEX(182), \ .attributeCount = 5, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - .clusterId = 0x0000003E, \ + .clusterId = 0x0000003E, \ .attributes = ZAP_ATTRIBUTE_INDEX(187), \ .attributeCount = 8, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Group Key Management (server) */ \ - .clusterId = 0x0000003F, \ + .clusterId = 0x0000003F, \ .attributes = ZAP_ATTRIBUTE_INDEX(195), \ .attributeCount = 6, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Fixed Label (server) */ \ - .clusterId = 0x00000040, \ + .clusterId = 0x00000040, \ .attributes = ZAP_ATTRIBUTE_INDEX(201), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: User Label (server) */ \ - .clusterId = 0x00000041, \ + .clusterId = 0x00000041, \ .attributes = ZAP_ATTRIBUTE_INDEX(204), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Identify (server) */ \ - .clusterId = 0x00000003, \ + .clusterId = 0x00000003, \ .attributes = ZAP_ATTRIBUTE_INDEX(207), \ .attributeCount = 4, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ - .clusterId = 0x00000004, \ + .clusterId = 0x00000004, \ .attributes = ZAP_ATTRIBUTE_INDEX(211), \ .attributeCount = 3, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: On/Off (server) */ \ - .clusterId = 0x00000006, \ + .clusterId = 0x00000006, \ .attributes = ZAP_ATTRIBUTE_INDEX(214), \ .attributeCount = 7, \ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Level Control (server) */ \ - .clusterId = 0x00000008, \ + .clusterId = 0x00000008, \ .attributes = ZAP_ATTRIBUTE_INDEX(221), \ .attributeCount = 16, \ .clusterSize = 27, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayLevelControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Descriptor (server) */ \ - .clusterId = 0x0000001D, \ + .clusterId = 0x0000001D, \ .attributes = ZAP_ATTRIBUTE_INDEX(237), \ .attributeCount = 6, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Color Control (server) */ \ - .clusterId = 0x00000300, \ + .clusterId = 0x00000300, \ .attributes = ZAP_ATTRIBUTE_INDEX(243), \ .attributeCount = 23, \ .clusterSize = 40, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayColorControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ) ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ), \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - .clusterId = 0x00000406, \ + .clusterId = 0x00000406, \ .attributes = ZAP_ATTRIBUTE_INDEX(266), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayOccupancySensingServer, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py index 88f94dbc86028b..c78257b377cba2 100644 --- a/scripts/tools/zap/zap_execution.py +++ b/scripts/tools/zap/zap_execution.py @@ -23,7 +23,7 @@ # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many # files may need updating for versions # -MIN_ZAP_VERSION = '2023.2.16' +MIN_ZAP_VERSION = '2023.2.25' class ZapTool: diff --git a/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h index c4db867b7323be..cdeb96347a0132 100644 --- a/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h @@ -748,7 +748,7 @@ struct DiscoveryCommandResponse uint16_t vendorId; uint16_t productId; uint8_t commissioningMode; - uint16_t deviceType; + uint32_t deviceType; chip::CharSpan deviceName; chip::ByteSpan rotatingId; uint64_t rotatingIdLen; diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 4721a0107a5305..e090a600cff0d5 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -66010,7 +66010,7 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("deviceType", value.deviceType, mDeviceType.HasValue() ? mDeviceType.Value() : 65535U)); + VerifyOrReturn(CheckValue("deviceType", value.deviceType, mDeviceType.HasValue() ? mDeviceType.Value() : 65535UL)); } shouldContinue = true; break; diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h index 721a201f18ea7e..3d74200cb77c4f 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h @@ -64,859 +64,859 @@ #define GENERATED_CLUSTERS { \ { \ /* Endpoint: 1, Cluster: Identify (client) */ \ - .clusterId = 0x00000003, \ + .clusterId = 0x00000003, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Groups (client) */ \ - .clusterId = 0x00000004, \ + .clusterId = 0x00000004, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Scenes (client) */ \ - .clusterId = 0x00000005, \ + .clusterId = 0x00000005, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: On/Off (client) */ \ - .clusterId = 0x00000006, \ + .clusterId = 0x00000006, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: On/off Switch Configuration (client) */ \ - .clusterId = 0x00000007, \ + .clusterId = 0x00000007, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Level Control (client) */ \ - .clusterId = 0x00000008, \ + .clusterId = 0x00000008, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Binary Input (Basic) (client) */ \ - .clusterId = 0x0000000F, \ + .clusterId = 0x0000000F, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Descriptor (client) */ \ - .clusterId = 0x0000001D, \ + .clusterId = 0x0000001D, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Binding (client) */ \ - .clusterId = 0x0000001E, \ + .clusterId = 0x0000001E, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Access Control (client) */ \ - .clusterId = 0x0000001F, \ + .clusterId = 0x0000001F, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Actions (client) */ \ - .clusterId = 0x00000025, \ + .clusterId = 0x00000025, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Basic Information (client) */ \ - .clusterId = 0x00000028, \ + .clusterId = 0x00000028, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: OTA Software Update Provider (client) */ \ - .clusterId = 0x00000029, \ + .clusterId = 0x00000029, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: OTA Software Update Requestor (client) */ \ - .clusterId = 0x0000002A, \ + .clusterId = 0x0000002A, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Localization Configuration (client) */ \ - .clusterId = 0x0000002B, \ + .clusterId = 0x0000002B, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Time Format Localization (client) */ \ - .clusterId = 0x0000002C, \ + .clusterId = 0x0000002C, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Unit Localization (client) */ \ - .clusterId = 0x0000002D, \ + .clusterId = 0x0000002D, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Power Source Configuration (client) */ \ - .clusterId = 0x0000002E, \ + .clusterId = 0x0000002E, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Power Source (client) */ \ - .clusterId = 0x0000002F, \ + .clusterId = 0x0000002F, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: General Commissioning (client) */ \ - .clusterId = 0x00000030, \ + .clusterId = 0x00000030, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Network Commissioning (client) */ \ - .clusterId = 0x00000031, \ + .clusterId = 0x00000031, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Diagnostic Logs (client) */ \ - .clusterId = 0x00000032, \ + .clusterId = 0x00000032, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: General Diagnostics (client) */ \ - .clusterId = 0x00000033, \ + .clusterId = 0x00000033, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Software Diagnostics (client) */ \ - .clusterId = 0x00000034, \ + .clusterId = 0x00000034, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Thread Network Diagnostics (client) */ \ - .clusterId = 0x00000035, \ + .clusterId = 0x00000035, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: WiFi Network Diagnostics (client) */ \ - .clusterId = 0x00000036, \ + .clusterId = 0x00000036, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Ethernet Network Diagnostics (client) */ \ - .clusterId = 0x00000037, \ + .clusterId = 0x00000037, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Bridged Device Basic Information (client) */ \ - .clusterId = 0x00000039, \ + .clusterId = 0x00000039, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Switch (client) */ \ - .clusterId = 0x0000003B, \ + .clusterId = 0x0000003B, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Administrator Commissioning (client) */ \ - .clusterId = 0x0000003C, \ + .clusterId = 0x0000003C, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Operational Credentials (client) */ \ - .clusterId = 0x0000003E, \ + .clusterId = 0x0000003E, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Group Key Management (client) */ \ - .clusterId = 0x0000003F, \ + .clusterId = 0x0000003F, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Fixed Label (client) */ \ - .clusterId = 0x00000040, \ + .clusterId = 0x00000040, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: User Label (client) */ \ - .clusterId = 0x00000041, \ + .clusterId = 0x00000041, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Boolean State (client) */ \ - .clusterId = 0x00000045, \ + .clusterId = 0x00000045, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Mode Select (client) */ \ - .clusterId = 0x00000050, \ + .clusterId = 0x00000050, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Door Lock (client) */ \ - .clusterId = 0x00000101, \ + .clusterId = 0x00000101, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Window Covering (client) */ \ - .clusterId = 0x00000102, \ + .clusterId = 0x00000102, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Barrier Control (client) */ \ - .clusterId = 0x00000103, \ + .clusterId = 0x00000103, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Pump Configuration and Control (client) */ \ - .clusterId = 0x00000200, \ + .clusterId = 0x00000200, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Thermostat (client) */ \ - .clusterId = 0x00000201, \ + .clusterId = 0x00000201, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Fan Control (client) */ \ - .clusterId = 0x00000202, \ + .clusterId = 0x00000202, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (client) */ \ - .clusterId = 0x00000204, \ + .clusterId = 0x00000204, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Color Control (client) */ \ - .clusterId = 0x00000300, \ + .clusterId = 0x00000300, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Ballast Configuration (client) */ \ - .clusterId = 0x00000301, \ + .clusterId = 0x00000301, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Illuminance Measurement (client) */ \ - .clusterId = 0x00000400, \ + .clusterId = 0x00000400, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Temperature Measurement (client) */ \ - .clusterId = 0x00000402, \ + .clusterId = 0x00000402, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Pressure Measurement (client) */ \ - .clusterId = 0x00000403, \ + .clusterId = 0x00000403, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Flow Measurement (client) */ \ - .clusterId = 0x00000404, \ + .clusterId = 0x00000404, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Relative Humidity Measurement (client) */ \ - .clusterId = 0x00000405, \ + .clusterId = 0x00000405, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Occupancy Sensing (client) */ \ - .clusterId = 0x00000406, \ + .clusterId = 0x00000406, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Wake on LAN (client) */ \ - .clusterId = 0x00000503, \ + .clusterId = 0x00000503, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Channel (client) */ \ - .clusterId = 0x00000504, \ + .clusterId = 0x00000504, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Target Navigator (client) */ \ - .clusterId = 0x00000505, \ + .clusterId = 0x00000505, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Media Playback (client) */ \ - .clusterId = 0x00000506, \ + .clusterId = 0x00000506, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Media Input (client) */ \ - .clusterId = 0x00000507, \ + .clusterId = 0x00000507, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Low Power (client) */ \ - .clusterId = 0x00000508, \ + .clusterId = 0x00000508, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Keypad Input (client) */ \ - .clusterId = 0x00000509, \ + .clusterId = 0x00000509, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Content Launcher (client) */ \ - .clusterId = 0x0000050A, \ + .clusterId = 0x0000050A, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Audio Output (client) */ \ - .clusterId = 0x0000050B, \ + .clusterId = 0x0000050B, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Application Launcher (client) */ \ - .clusterId = 0x0000050C, \ + .clusterId = 0x0000050C, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Application Basic (client) */ \ - .clusterId = 0x0000050D, \ + .clusterId = 0x0000050D, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Account Login (client) */ \ - .clusterId = 0x0000050E, \ + .clusterId = 0x0000050E, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Electrical Measurement (client) */ \ - .clusterId = 0x00000B04, \ + .clusterId = 0x00000B04, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Client Monitoring (client) */ \ - .clusterId = 0x00001046, \ + .clusterId = 0x00001046, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Unit Testing (client) */ \ - .clusterId = 0xFFF1FC05, \ + .clusterId = 0xFFF1FC05, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = nullptr, \ + .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ },\