From 61d76b87f4e89df9dcda9f3e8e552c27aa3c2420 Mon Sep 17 00:00:00 2001 From: Hare Date: Fri, 11 Aug 2023 09:19:18 +0800 Subject: [PATCH] Chang the configuration used --- .../rootnode_smokecoalarm_686fe0dcb8.matter | 92 +- .../rootnode_smokecoalarm_686fe0dcb8.zap | 133 +- .../zap/tests/inputs/all-clusters-app.zap | 577 ++++++- .../app-templates/CHIPClusters.h | 7 - .../app-templates/IMClusterCommandHandler.cpp | 254 ---- .../all-clusters-app/app-templates/access.h | 30 - .../app-templates/endpoint_config.h | 1332 ++++------------- .../app-templates/gen_config.h | 188 --- 8 files changed, 915 insertions(+), 1698 deletions(-) diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter index cf1552b62c4528..5f8ecf0b531e78 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter @@ -675,9 +675,6 @@ server cluster PowerSource = 47 { readonly attribute PowerSourceStatusEnum status = 0; readonly attribute int8u order = 1; readonly attribute char_string<60> description = 2; - readonly attribute BatChargeLevelEnum batChargeLevel = 14; - readonly attribute boolean batReplacementNeeded = 15; - readonly attribute BatReplaceabilityEnum batReplaceability = 16; readonly attribute endpoint_no endpointList[] = 31; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1033,58 +1030,6 @@ server cluster GeneralDiagnostics = 51 { command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0; } -/** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices. -Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags. -Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */ -server cluster Switch = 59 { - bitmap Feature : BITMAP32 { - kLatchingSwitch = 0x1; - kMomentarySwitch = 0x2; - kMomentarySwitchRelease = 0x4; - kMomentarySwitchLongPress = 0x8; - kMomentarySwitchMultiPress = 0x10; - } - - info event SwitchLatched = 0 { - INT8U newPosition = 0; - } - - info event InitialPress = 1 { - INT8U newPosition = 0; - } - - info event LongPress = 2 { - INT8U newPosition = 0; - } - - info event ShortRelease = 3 { - INT8U previousPosition = 0; - } - - info event LongRelease = 4 { - INT8U previousPosition = 0; - } - - info event MultiPressOngoing = 5 { - INT8U newPosition = 0; - INT8U currentNumberOfPressesCounted = 1; - } - - info event MultiPressComplete = 6 { - INT8U previousPosition = 0; - INT8U totalNumberOfPressesCounted = 1; - } - - readonly attribute int8u numberOfPositions = 0; - readonly attribute int8u currentPosition = 1; - readonly attribute command_id generatedCommandList[] = 65528; - readonly attribute command_id acceptedCommandList[] = 65529; - readonly attribute event_id eventList[] = 65530; - readonly attribute attrib_id attributeList[] = 65531; - readonly attribute bitmap32 featureMap = 65532; - readonly attribute int16u clusterRevision = 65533; -} - /** Commands to trigger a Node to allow a new Administrator to commission it. */ server cluster AdministratorCommissioning = 60 { enum CommissioningWindowStatusEnum : ENUM8 { @@ -1424,13 +1369,8 @@ server cluster SmokeCoAlarm = 92 { } endpoint 0 { - device type rootdevice = 22, version 1; + device type ma_rootdevice = 22, version 1; - server cluster Groups { - ram attribute nameSupport; - ram attribute featureMap default = 0; - ram attribute clusterRevision default = 3; - } server cluster Descriptor { callback attribute deviceTypeList; @@ -1524,13 +1464,6 @@ endpoint 0 { ram attribute clusterRevision default = 0x0001; } - server cluster Switch { - ram attribute numberOfPositions default = 2; - ram attribute currentPosition; - ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; - } - server cluster AdministratorCommissioning { callback attribute windowStatus default = 0; callback attribute adminFabricIndex default = 1; @@ -1560,14 +1493,14 @@ endpoint 0 { } } endpoint 1 { - device type anonymousEndpointType = 118, version 1; + device type ma_smokecoalarm = 118, version 1; + server cluster Identify { ram attribute identifyTime default = 0x0; ram attribute identifyType default = 0x0; callback attribute generatedCommandList default = 0; callback attribute acceptedCommandList default = 0; - callback attribute eventList; callback attribute attributeList default = 0; ram attribute featureMap default = 0; ram attribute clusterRevision default = 2; @@ -1577,7 +1510,6 @@ endpoint 1 { ram attribute nameSupport; callback attribute generatedCommandList; callback attribute acceptedCommandList; - callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 0; ram attribute clusterRevision default = 3; @@ -1593,7 +1525,6 @@ endpoint 1 { callback attribute remainingCapacity; callback attribute generatedCommandList; callback attribute acceptedCommandList; - callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 0; ram attribute clusterRevision default = 5; @@ -1606,27 +1537,21 @@ endpoint 1 { callback attribute partsList default = 0; callback attribute generatedCommandList default = 0; callback attribute acceptedCommandList default = 0; - callback attribute eventList; callback attribute attributeList default = 0; ram attribute featureMap default = 0; ram attribute clusterRevision default = 1; } server cluster PowerSource { - emits event BatFaultChange; - ram attribute status default = 0; - ram attribute order default = 2; - ram attribute description default = "B2"; - ram attribute batChargeLevel default = 0; - ram attribute batReplacementNeeded; - ram attribute batReplaceability; + ram attribute status; + ram attribute order; + ram attribute description; callback attribute endpointList; callback attribute generatedCommandList; callback attribute acceptedCommandList; - callback attribute eventList; callback attribute attributeList; - ram attribute featureMap default = 2; - ram attribute clusterRevision default = 2; + ram attribute featureMap default = 0; + ram attribute clusterRevision default = 1; } server cluster SmokeCoAlarm { @@ -1656,7 +1581,6 @@ endpoint 1 { ram attribute expiryDate default = 0; callback attribute generatedCommandList; callback attribute acceptedCommandList; - callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 3; ram attribute clusterRevision default = 1; diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap index 2cd0aa5433fea6..f83b0e33b2ae48 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap @@ -33,7 +33,33 @@ ], "endpointTypes": [ { + "id": 47, "name": "MA-rootdevice", + "deviceTypeRef": { + "id": 2, + "code": 22, + "profileId": 259, + "label": "MA-rootdevice", + "name": "MA-rootdevice" + }, + "deviceTypes": [ + { + "id": 2, + "code": 22, + "profileId": 259, + "label": "MA-rootdevice", + "name": "MA-rootdevice" + } + ], + "deviceTypeRefs": [ + 2 + ], + "deviceVersions": [ + 1 + ], + "deviceIdentifiers": [ + 22 + ], "deviceTypeName": "MA-rootdevice", "deviceTypeCode": 22, "deviceTypeProfileId": 259, @@ -198,7 +224,7 @@ "mfgCode": null, "define": "GROUPS_CLUSTER", "side": "server", - "enabled": 1, + "enabled": 0, "commands": [ { "name": "AddGroupResponse", @@ -4619,7 +4645,7 @@ "mfgCode": null, "define": "SWITCH_CLUSTER", "side": "server", - "enabled": 1, + "enabled": 0, "attributes": [ { "name": "NumberOfPositions", @@ -5394,7 +5420,33 @@ ] }, { + "id": 48, "name": "Anonymous Endpoint Type", + "deviceTypeRef": { + "id": 44, + "code": 118, + "profileId": 259, + "label": "MA-smokecoalarm", + "name": "MA-smokecoalarm" + }, + "deviceTypes": [ + { + "id": 44, + "code": 118, + "profileId": 259, + "label": "MA-smokecoalarm", + "name": "MA-smokecoalarm" + } + ], + "deviceTypeRefs": [ + 44 + ], + "deviceVersions": [ + 1 + ], + "deviceIdentifiers": [ + 118 + ], "deviceTypeName": "MA-smokecoalarm", "deviceTypeCode": 118, "deviceTypeProfileId": 259, @@ -5537,7 +5589,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -5785,7 +5837,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -6169,7 +6221,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -6423,7 +6475,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -6861,7 +6913,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -7035,22 +7087,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "TagList", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "GeneratedCommandList", "code": 65528, @@ -7089,7 +7125,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -7253,7 +7289,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -7373,7 +7409,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -7389,7 +7425,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -7405,7 +7441,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "B2", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -7593,11 +7629,11 @@ "mfgCode": null, "side": "server", "type": "BatChargeLevelEnum", - "included": 1, + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -7609,7 +7645,7 @@ "mfgCode": null, "side": "server", "type": "boolean", - "included": 1, + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -7625,7 +7661,7 @@ "mfgCode": null, "side": "server", "type": "BatReplaceabilityEnum", - "included": 1, + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -7913,7 +7949,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -7949,7 +7985,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -7965,21 +8001,12 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 } - ], - "events": [ - { - "name": "BatFaultChange", - "code": 1, - "mfgCode": null, - "side": "server", - "included": 1 - } ] }, { @@ -8288,7 +8315,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -9167,7 +9194,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -9493,7 +9520,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -10587,7 +10614,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -10799,7 +10826,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -11192,18 +11219,14 @@ "endpointTypeIndex": 0, "profileId": 259, "endpointId": 0, - "networkId": 0, - "endpointVersion": 1, - "deviceIdentifier": 22 + "networkId": 0 }, { "endpointTypeName": "Anonymous Endpoint Type", "endpointTypeIndex": 1, "profileId": 259, "endpointId": 1, - "networkId": 0, - "endpointVersion": 1, - "deviceIdentifier": 118 + "networkId": 0 } ], "log": [] diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index de1df2565556fc..744bc1a1d88b23 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -16,6 +16,12 @@ } ], "package": [ + { + "pathRelativity": "relativeToZap", + "path": "../../../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" + }, { "pathRelativity": "relativeToZap", "path": "../../../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json", @@ -23,17 +29,37 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data with some extensions" - }, - { - "pathRelativity": "relativeToZap", - "path": "../../../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" } ], "endpointTypes": [ { + "id": 64, "name": "MA-rootdevice", + "deviceTypeRef": { + "id": 55, + "code": 22, + "profileId": 259, + "label": "MA-rootdevice", + "name": "MA-rootdevice" + }, + "deviceTypes": [ + { + "id": 55, + "code": 22, + "profileId": 259, + "label": "MA-rootdevice", + "name": "MA-rootdevice" + } + ], + "deviceTypeRefs": [ + 55 + ], + "deviceVersions": [ + 1 + ], + "deviceIdentifiers": [ + 22 + ], "deviceTypeName": "MA-rootdevice", "deviceTypeCode": 22, "deviceTypeProfileId": 259, @@ -8739,7 +8765,33 @@ ] }, { + "id": 61, "name": "MA-onofflight", + "deviceTypeRef": { + "id": 61, + "code": 256, + "profileId": 259, + "label": "MA-onofflight", + "name": "MA-onofflight" + }, + "deviceTypes": [ + { + "id": 61, + "code": 256, + "profileId": 259, + "label": "MA-onofflight", + "name": "MA-onofflight" + } + ], + "deviceTypeRefs": [ + 61 + ], + "deviceVersions": [ + 1 + ], + "deviceIdentifiers": [ + 256 + ], "deviceTypeName": "MA-onofflight", "deviceTypeCode": 256, "deviceTypeProfileId": 259, @@ -12755,6 +12807,451 @@ } ] }, + { + "name": "Smoke CO Alarm", + "code": 92, + "mfgCode": null, + "define": "SMOKE_CO_ALARM_CLUSTER", + "side": "client", + "enabled": 0, + "commands": [ + { + "name": "SelfTestRequest", + "code": 0, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + } + ], + "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + } + ] + }, + { + "name": "Smoke CO Alarm", + "code": 92, + "mfgCode": null, + "define": "SMOKE_CO_ALARM_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ + { + "name": "ExpressedState", + "code": 0, + "mfgCode": null, + "side": "server", + "type": "ExpressedStateEnum", + "included": 1, + "storageOption": "NVM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "SmokeState", + "code": 1, + "mfgCode": null, + "side": "server", + "type": "AlarmStateEnum", + "included": 1, + "storageOption": "NVM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "COState", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "AlarmStateEnum", + "included": 1, + "storageOption": "NVM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "BatteryAlert", + "code": 3, + "mfgCode": null, + "side": "server", + "type": "AlarmStateEnum", + "included": 1, + "storageOption": "NVM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "DeviceMuted", + "code": 4, + "mfgCode": null, + "side": "server", + "type": "MuteStateEnum", + "included": 1, + "storageOption": "NVM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "TestInProgress", + "code": 5, + "mfgCode": null, + "side": "server", + "type": "boolean", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "HardwareFaultAlert", + "code": 6, + "mfgCode": null, + "side": "server", + "type": "boolean", + "included": 1, + "storageOption": "NVM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "EndOfServiceAlert", + "code": 7, + "mfgCode": null, + "side": "server", + "type": "EndOfServiceEnum", + "included": 1, + "storageOption": "NVM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "InterconnectSmokeAlarm", + "code": 8, + "mfgCode": null, + "side": "server", + "type": "AlarmStateEnum", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "InterconnectCOAlarm", + "code": 9, + "mfgCode": null, + "side": "server", + "type": "AlarmStateEnum", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ContaminationState", + "code": 10, + "mfgCode": null, + "side": "server", + "type": "ContaminationStateEnum", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "SmokeSensitivityLevel", + "code": 11, + "mfgCode": null, + "side": "server", + "type": "SensitivityEnum", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ExpiryDate", + "code": 12, + "mfgCode": null, + "side": "server", + "type": "epoch_s", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "GeneratedCommandList", + "code": 65528, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "AcceptedCommandList", + "code": 65529, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "EventList", + "code": 65530, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 0, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "3", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + } + ], + "events": [ + { + "name": "SmokeAlarm", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "COAlarm", + "code": 1, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "LowBattery", + "code": 2, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "HardwareFault", + "code": 3, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "EndOfService", + "code": 4, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "SelfTestComplete", + "code": 5, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "AlarmMuted", + "code": 6, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "MuteEnded", + "code": 7, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "InterconnectSmokeAlarm", + "code": 8, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "InterconnectCOAlarm", + "code": 9, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "AllClear", + "code": 10, + "mfgCode": null, + "side": "server", + "included": 1 + } + ] + }, { "name": "Door Lock", "code": 257, @@ -20980,7 +21477,33 @@ ] }, { + "id": 63, "name": "MA-onofflight", + "deviceTypeRef": { + "id": 61, + "code": 256, + "profileId": 259, + "label": "MA-onofflight", + "name": "MA-onofflight" + }, + "deviceTypes": [ + { + "id": 61, + "code": 256, + "profileId": 259, + "label": "MA-onofflight", + "name": "MA-onofflight" + } + ], + "deviceTypeRefs": [ + 61 + ], + "deviceVersions": [ + 1 + ], + "deviceIdentifiers": [ + 256 + ], "deviceTypeName": "MA-onofflight", "deviceTypeCode": 256, "deviceTypeProfileId": 259, @@ -24586,7 +25109,33 @@ ] }, { + "id": 62, "name": "Anonymous Endpoint Type", + "deviceTypeRef": { + "id": 106, + "code": 61442, + "profileId": 259, + "label": "MA-secondary-network-commissioning", + "name": "MA-secondary-network-commissioning" + }, + "deviceTypes": [ + { + "id": 106, + "code": 61442, + "profileId": 259, + "label": "MA-secondary-network-commissioning", + "name": "MA-secondary-network-commissioning" + } + ], + "deviceTypeRefs": [ + 106 + ], + "deviceVersions": [ + 1 + ], + "deviceIdentifiers": [ + 61442 + ], "deviceTypeName": "MA-secondary-network-commissioning", "deviceTypeCode": 61442, "deviceTypeProfileId": 259, @@ -25068,36 +25617,28 @@ "endpointTypeIndex": 0, "profileId": 259, "endpointId": 0, - "networkId": 0, - "endpointVersion": 1, - "deviceIdentifier": 22 + "networkId": 0 }, { "endpointTypeName": "MA-onofflight", "endpointTypeIndex": 1, "profileId": 259, "endpointId": 1, - "networkId": 0, - "endpointVersion": 1, - "deviceIdentifier": 256 + "networkId": 0 }, { "endpointTypeName": "MA-onofflight", "endpointTypeIndex": 2, "profileId": 259, "endpointId": 2, - "networkId": 0, - "endpointVersion": 1, - "deviceIdentifier": 256 + "networkId": 0 }, { "endpointTypeName": "Anonymous Endpoint Type", "endpointTypeIndex": 3, "profileId": 259, "endpointId": 65534, - "networkId": 0, - "endpointVersion": 1, - "deviceIdentifier": 61442 + "networkId": 0 } ], "log": [] diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h index 84f3b303bc5843..1d5409424b5724 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h @@ -28,13 +28,6 @@ namespace chip { namespace Controller { -class DLL_EXPORT OnOffCluster : public ClusterBase -{ -public: - OnOffCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : ClusterBase(exchangeManager, session, endpoint) {} - ~OnOffCluster() {} -}; - class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase { public: diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp index 6352addc5f9f87..9c13a201ffd099 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp @@ -345,49 +345,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } -namespace DishwasherAlarm { - -void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - CHIP_ERROR TLVError = CHIP_NO_ERROR; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::Reset::Id: { - Commands::Reset::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDishwasherAlarmClusterResetCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::ModifyEnabledAlarms::Id: { - Commands::ModifyEnabledAlarms::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDishwasherAlarmClusterModifyEnabledAlarmsCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - default: { - // Unrecognized command ID, error status will apply. - apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI, ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId)); - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || !wasHandled) - { - apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand); - ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format()); - } -} - -} - namespace DoorLock { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -509,14 +466,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::UnboltDoor::Id: { - Commands::UnboltDoor::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterUnboltDoorCallback(apCommandObj, aCommandPath, commandData); - } - break; - } default: { // Unrecognized command ID, error status will apply. apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); @@ -570,41 +519,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } -namespace FanControl { - -void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - CHIP_ERROR TLVError = CHIP_NO_ERROR; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::Step::Id: { - Commands::Step::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfFanControlClusterStepCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - default: { - // Unrecognized command ID, error status will apply. - apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI, ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId)); - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || !wasHandled) - { - apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand); - ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format()); - } -} - -} - namespace FaultInjection { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -868,57 +782,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } -namespace IcdManagement { - -void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - CHIP_ERROR TLVError = CHIP_NO_ERROR; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::RegisterClient::Id: { - Commands::RegisterClient::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfIcdManagementClusterRegisterClientCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::UnregisterClient::Id: { - Commands::UnregisterClient::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfIcdManagementClusterUnregisterClientCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::StayActiveRequest::Id: { - Commands::StayActiveRequest::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfIcdManagementClusterStayActiveRequestCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - default: { - // Unrecognized command ID, error status will apply. - apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI, ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId)); - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || !wasHandled) - { - apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand); - ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format()); - } -} - -} - namespace Identify { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -1523,41 +1386,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } -namespace TemperatureControl { - -void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - CHIP_ERROR TLVError = CHIP_NO_ERROR; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::SetTemperature::Id: { - Commands::SetTemperature::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTemperatureControlClusterSetTemperatureCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - default: { - // Unrecognized command ID, error status will apply. - apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI, ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId)); - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || !wasHandled) - { - apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand); - ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format()); - } -} - -} - namespace Thermostat { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -1628,73 +1456,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } -namespace TimeSynchronization { - -void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - CHIP_ERROR TLVError = CHIP_NO_ERROR; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::SetUTCTime::Id: { - Commands::SetUTCTime::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTimeSynchronizationClusterSetUTCTimeCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::SetTrustedTimeSource::Id: { - Commands::SetTrustedTimeSource::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTimeSynchronizationClusterSetTrustedTimeSourceCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::SetTimeZone::Id: { - Commands::SetTimeZone::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTimeSynchronizationClusterSetTimeZoneCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::SetDSTOffset::Id: { - Commands::SetDSTOffset::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTimeSynchronizationClusterSetDSTOffsetCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::SetDefaultNTP::Id: { - Commands::SetDefaultNTP::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTimeSynchronizationClusterSetDefaultNTPCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - default: { - // Unrecognized command ID, error status will apply. - apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI, ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId)); - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || !wasHandled) - { - apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand); - ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format()); - } -} - -} - namespace UnitTesting { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -2003,18 +1764,12 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: case Clusters::DiagnosticLogs::Id: Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; - case Clusters::DishwasherAlarm::Id: - Clusters::DishwasherAlarm::DispatchServerCommand(apCommandObj, aCommandPath, aReader); - break; case Clusters::DoorLock::Id: Clusters::DoorLock::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; case Clusters::EthernetNetworkDiagnostics::Id: Clusters::EthernetNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; - case Clusters::FanControl::Id: - Clusters::FanControl::DispatchServerCommand(apCommandObj, aCommandPath, aReader); - break; case Clusters::FaultInjection::Id: Clusters::FaultInjection::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; @@ -2030,9 +1785,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: case Clusters::Groups::Id: Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; - case Clusters::IcdManagement::Id: - Clusters::IcdManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader); - break; case Clusters::Identify::Id: Clusters::Identify::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; @@ -2069,18 +1821,12 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: case Clusters::TargetNavigator::Id: Clusters::TargetNavigator::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; - case Clusters::TemperatureControl::Id: - Clusters::TemperatureControl::DispatchServerCommand(apCommandObj, aCommandPath, aReader); - break; case Clusters::Thermostat::Id: Clusters::Thermostat::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; case Clusters::ThreadNetworkDiagnostics::Id: Clusters::ThreadNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; - case Clusters::TimeSynchronization::Id: - Clusters::TimeSynchronization::DispatchServerCommand(apCommandObj, aCommandPath, aReader); - break; case Clusters::UnitTesting::Id: Clusters::UnitTesting::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h index 799f8f7d5a9574..56437352d10126 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h @@ -49,8 +49,6 @@ 0x0000003E, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \ /* Cluster: User Label, Attribute: LabelList, Privilege: view */ \ - 0x00000046, /* Cluster: ICD Management, Attribute: RegisteredClients, Privilege: administer */ \ - 0x00000046, /* Cluster: ICD Management, Attribute: ICDCounter, Privilege: administer */ \ /* Cluster: Door Lock, Attribute: DoorOpenEvents, Privilege: view */ \ /* Cluster: Door Lock, Attribute: DoorClosedEvents, Privilege: view */ \ /* Cluster: Door Lock, Attribute: OpenPeriod, Privilege: view */ \ @@ -114,8 +112,6 @@ 0x00000000, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \ /* Cluster: User Label, Attribute: LabelList, Privilege: view */ \ - 0x00000003, /* Cluster: ICD Management, Attribute: RegisteredClients, Privilege: administer */ \ - 0x00000004, /* Cluster: ICD Management, Attribute: ICDCounter, Privilege: administer */ \ /* Cluster: Door Lock, Attribute: DoorOpenEvents, Privilege: view */ \ /* Cluster: Door Lock, Attribute: DoorClosedEvents, Privilege: view */ \ /* Cluster: Door Lock, Attribute: OpenPeriod, Privilege: view */ \ @@ -179,8 +175,6 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \ /* Cluster: User Label, Attribute: LabelList, Privilege: view */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: ICD Management, Attribute: RegisteredClients, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: ICD Management, Attribute: ICDCounter, Privilege: administer */ \ /* Cluster: Door Lock, Attribute: DoorOpenEvents, Privilege: view */ \ /* Cluster: Door Lock, Attribute: DoorClosedEvents, Privilege: view */ \ /* Cluster: Door Lock, Attribute: OpenPeriod, Privilege: view */ \ @@ -410,11 +404,6 @@ 0x00000031, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - 0x00000038, /* Cluster: Time Synchronization, Command: SetUTCTime, Privilege: administer */ \ - 0x00000038, /* Cluster: Time Synchronization, Command: SetTrustedTimeSource, Privilege: administer */ \ - 0x00000038, /* Cluster: Time Synchronization, Command: SetTimeZone, Privilege: manage */ \ - 0x00000038, /* Cluster: Time Synchronization, Command: SetDSTOffset, Privilege: manage */ \ - 0x00000038, /* Cluster: Time Synchronization, Command: SetDefaultNTP, Privilege: administer */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ 0x0000003C, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ @@ -430,9 +419,6 @@ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \ - 0x00000046, /* Cluster: ICD Management, Command: RegisterClient, Privilege: manage */ \ - 0x00000046, /* Cluster: ICD Management, Command: UnregisterClient, Privilege: manage */ \ - 0x00000046, /* Cluster: ICD Management, Command: StayActiveRequest, Privilege: manage */ \ 0x00000101, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ 0x00000101, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ 0x00000101, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \ @@ -470,11 +456,6 @@ 0x00000006, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - 0x00000000, /* Cluster: Time Synchronization, Command: SetUTCTime, Privilege: administer */ \ - 0x00000001, /* Cluster: Time Synchronization, Command: SetTrustedTimeSource, Privilege: administer */ \ - 0x00000002, /* Cluster: Time Synchronization, Command: SetTimeZone, Privilege: manage */ \ - 0x00000004, /* Cluster: Time Synchronization, Command: SetDSTOffset, Privilege: manage */ \ - 0x00000005, /* Cluster: Time Synchronization, Command: SetDefaultNTP, Privilege: administer */ \ 0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ 0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ 0x00000002, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ @@ -490,9 +471,6 @@ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ 0x00000004, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \ - 0x00000000, /* Cluster: ICD Management, Command: RegisterClient, Privilege: manage */ \ - 0x00000002, /* Cluster: ICD Management, Command: UnregisterClient, Privilege: manage */ \ - 0x00000003, /* Cluster: ICD Management, Command: StayActiveRequest, Privilege: manage */ \ 0x0000000B, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ 0x0000000C, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ 0x0000000D, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \ @@ -530,11 +508,6 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Time Synchronization, Command: SetUTCTime, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Time Synchronization, Command: SetTrustedTimeSource, Privilege: administer */ \ - kMatterAccessPrivilegeManage, /* Cluster: Time Synchronization, Command: SetTimeZone, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Time Synchronization, Command: SetDSTOffset, Privilege: manage */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Time Synchronization, Command: SetDefaultNTP, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ @@ -550,9 +523,6 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \ - kMatterAccessPrivilegeManage, /* Cluster: ICD Management, Command: RegisterClient, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: ICD Management, Command: UnregisterClient, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: ICD Management, Command: StayActiveRequest, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \ 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 64de33c5ad0145..8924656affc669 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 @@ -47,115 +47,109 @@ /* 9 - Breadcrumb, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ -\ - /* Endpoint: 1, Cluster: Scenes (server), big-endian */\ -\ - /* 17 - LastConfiguredBy, */\ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ -\ \ /* Endpoint: 1, Cluster: Power Source (server), big-endian */\ \ - /* 25 - Description, */\ + /* 17 - Description, */\ 2, 'B', '2', \ \ \ /* Endpoint: 1, Cluster: Mode Select (server), big-endian */\ \ - /* 28 - Description, */\ + /* 20 - Description, */\ 6, 'C', 'o', 'f', 'f', 'e', 'e', \ \ \ /* Endpoint: 1, Cluster: Door Lock (server), big-endian */\ \ - /* 35 - Language, */\ + /* 27 - Language, */\ 2, 'e', 'n', \ \ \ /* Endpoint: 1, Cluster: Media Playback (server), big-endian */\ \ - /* 38 - StartTime, */\ + /* 30 - StartTime, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,\ \ - /* 46 - Duration, */\ + /* 38 - Duration, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 54 - SeekRangeEnd, */\ + /* 46 - SeekRangeEnd, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 62 - SeekRangeStart, */\ + /* 54 - SeekRangeStart, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ \ /* Endpoint: 1, Cluster: Unit Testing (server), big-endian */\ \ - /* 70 - bitmap64, */\ + /* 62 - bitmap64, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 78 - int40u, */\ + /* 70 - int40u, */\ 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 83 - int48u, */\ + /* 75 - int48u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 89 - int56u, */\ + /* 81 - int56u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 96 - int64u, */\ + /* 88 - int64u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 104 - int40s, */\ + /* 96 - int40s, */\ 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 109 - int48s, */\ + /* 101 - int48s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 115 - int56s, */\ + /* 107 - int56s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 122 - int64s, */\ + /* 114 - int64s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 130 - float_double, */\ + /* 122 - float_double, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 138 - epoch_us, */\ + /* 130 - epoch_us, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 146 - nullable_bitmap64, */\ + /* 138 - nullable_bitmap64, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 154 - nullable_int40u, */\ + /* 146 - nullable_int40u, */\ 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 159 - nullable_int48u, */\ + /* 151 - nullable_int48u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 165 - nullable_int56u, */\ + /* 157 - nullable_int56u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 172 - nullable_int64u, */\ + /* 164 - nullable_int64u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 180 - nullable_int40s, */\ + /* 172 - nullable_int40s, */\ 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 185 - nullable_int48s, */\ + /* 177 - nullable_int48s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 191 - nullable_int56s, */\ + /* 183 - nullable_int56s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 198 - nullable_int64s, */\ + /* 190 - nullable_int64s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ - /* 206 - nullable_float_double, */\ + /* 198 - nullable_float_double, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ \ \ /* Endpoint: 2, Cluster: Power Source (server), big-endian */\ \ - /* 214 - Description, */\ + /* 206 - Description, */\ 2, 'B', '3', \ \ } @@ -181,125 +175,119 @@ /* 9 - Breadcrumb, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ -\ - /* Endpoint: 1, Cluster: Scenes (server), little-endian */\ -\ - /* 17 - LastConfiguredBy, */\ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ -\ \ /* Endpoint: 1, Cluster: Power Source (server), little-endian */\ \ - /* 25 - Description, */\ + /* 17 - Description, */\ 2, 'B', '2', \ \ \ /* Endpoint: 1, Cluster: Mode Select (server), little-endian */\ \ - /* 28 - Description, */\ + /* 20 - Description, */\ 6, 'C', 'o', 'f', 'f', 'e', 'e', \ \ \ /* Endpoint: 1, Cluster: Door Lock (server), little-endian */\ \ - /* 35 - Language, */\ + /* 27 - Language, */\ 2, 'e', 'n', \ \ \ /* Endpoint: 1, Cluster: Media Playback (server), little-endian */\ \ - /* 38 - StartTime, */\ + /* 30 - StartTime, */\ 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 46 - Duration, */\ + /* 38 - Duration, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 54 - SeekRangeEnd, */\ + /* 46 - SeekRangeEnd, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 62 - SeekRangeStart, */\ + /* 54 - SeekRangeStart, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ \ /* Endpoint: 1, Cluster: Unit Testing (server), little-endian */\ \ - /* 70 - bitmap64, */\ + /* 62 - bitmap64, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 78 - int40u, */\ + /* 70 - int40u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 83 - int48u, */\ + /* 75 - int48u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 89 - int56u, */\ + /* 81 - int56u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 96 - int64u, */\ + /* 88 - int64u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 104 - int40s, */\ + /* 96 - int40s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 109 - int48s, */\ + /* 101 - int48s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 115 - int56s, */\ + /* 107 - int56s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 122 - int64s, */\ + /* 114 - int64s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 130 - float_double, */\ + /* 122 - float_double, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 138 - epoch_us, */\ + /* 130 - epoch_us, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 146 - nullable_bitmap64, */\ + /* 138 - nullable_bitmap64, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 154 - nullable_int40u, */\ + /* 146 - nullable_int40u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 159 - nullable_int48u, */\ + /* 151 - nullable_int48u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 165 - nullable_int56u, */\ + /* 157 - nullable_int56u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 172 - nullable_int64u, */\ + /* 164 - nullable_int64u, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 180 - nullable_int40s, */\ + /* 172 - nullable_int40s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 185 - nullable_int48s, */\ + /* 177 - nullable_int48s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 191 - nullable_int56s, */\ + /* 183 - nullable_int56s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 198 - nullable_int64s, */\ + /* 190 - nullable_int64s, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 206 - nullable_float_double, */\ + /* 198 - nullable_float_double, */\ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ \ /* Endpoint: 2, Cluster: Power Source (server), little-endian */\ \ - /* 214 - Description, */\ + /* 206 - Description, */\ 2, 'B', '3', \ \ } #endif // BIGENDIAN_CPU -#define GENERATED_DEFAULTS_COUNT (33) +#define GENERATED_DEFAULTS_COUNT (32) // This is an array of EmberAfAttributeMinMaxValue structures. -#define GENERATED_MIN_MAX_DEFAULT_COUNT 52 +#define GENERATED_MIN_MAX_DEFAULT_COUNT 48 #define GENERATED_MIN_MAX_DEFAULTS { \ \ /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ @@ -368,12 +356,6 @@ { (uint16_t)0x0, (uint16_t)0x0, (uint16_t)0xFEFF }, /* ColorPointBX */ \ { (uint16_t)0x0, (uint16_t)0x0, (uint16_t)0xFEFF }, /* ColorPointBY */ \ { (uint16_t)0x0, (uint16_t)0x0, (uint16_t)0xFEFF }, /* StartUpColorTemperatureMireds */ \ -\ - /* Endpoint: 1, Cluster: Ballast Configuration (server) */ \ - { (uint16_t)0x1, (uint16_t)0x1, (uint16_t)0xFE }, /* MinLevel */ \ - { (uint16_t)0xFE, (uint16_t)0x1, (uint16_t)0xFE }, /* MaxLevel */ \ - { (uint16_t)0xFF, (uint16_t)0x64, (uint16_t)0xFFFF }, /* BallastFactorAdjustment */ \ - { (uint16_t)0x0, (uint16_t)0x0, (uint16_t)0x1 }, /* LampAlarmMode */ \ \ /* Endpoint: 1, Cluster: Unit Testing (server) */ \ { (uint16_t)0x46, (uint16_t)0x14, (uint16_t)0x64 }, /* range_restricted_int8u */ \ @@ -391,7 +373,7 @@ // This is an array of EmberAfAttributeMetadata structures. -#define GENERATED_ATTRIBUTE_COUNT 991 +#define GENERATED_ATTRIBUTE_COUNT 739 #define GENERATED_ATTRIBUTES { \ \ /* Endpoint: 0, Cluster: Identify (server) */ \ @@ -445,11 +427,11 @@ { ZAP_EMPTY_DEFAULT(), 0x0000000E, 65, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductLabel */ \ { ZAP_EMPTY_DEFAULT(), 0x0000000F, 33, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SerialNumber */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000010, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LocalConfigDisabled */ \ + { ZAP_SIMPLE_DEFAULT(1), 0x00000011, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* Reachable */ \ { ZAP_EMPTY_DEFAULT(), 0x00000012, 33, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* UniqueID */ \ { ZAP_EMPTY_DEFAULT(), 0x00000013, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CapabilityMinima */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000014, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductAppearance */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* DefaultOTAProviders */ \ @@ -630,22 +612,6 @@ { ZAP_EMPTY_DEFAULT(), 0x00000008, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TimeSinceReset */ \ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 0, Cluster: Time Synchronization (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 8, ZAP_TYPE(EPOCH_US), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* UTCTime */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Granularity */ \ - { ZAP_SIMPLE_DEFAULT(0x00), 0x00000002, 1, ZAP_TYPE(ENUM8), 0 }, /* TimeSource */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* TrustedTimeSource */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 129, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DefaultNTP */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TimeZone */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000006, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DSTOffset */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000007, 8, ZAP_TYPE(EPOCH_US), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LocalTime */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* TimeZoneDatabase */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TimeZoneListMaxSize */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000000B, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DSTOffsetListMaxSize */ \ - { ZAP_SIMPLE_DEFAULT(false), 0x0000000C, 1, ZAP_TYPE(BOOLEAN), 0 }, /* SupportsDNSResolve */ \ - { ZAP_SIMPLE_DEFAULT(0x0B), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */ \ @@ -681,16 +647,6 @@ { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LabelList */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 0, Cluster: ICD Management (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* IdleModeInterval */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveModeInterval */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveModeThreshold */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RegisteredClients */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ICDCounter */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClientsSupportedPerFabric */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ @@ -720,9 +676,6 @@ { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000002, 2, ZAP_TYPE(GROUP_ID), 0 }, /* CurrentGroup */ \ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(BOOLEAN), 0 }, /* SceneValid */ \ { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BITMAP8), 0 }, /* NameSupport */ \ - { ZAP_LONG_DEFAULTS_INDEX(17), 0x00000005, 8, ZAP_TYPE(NODE_ID), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastConfiguredBy */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000006, 2, ZAP_TYPE(INT16U), 0 }, /* SceneTableSize */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000007, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RemainingCapacity */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ @@ -789,7 +742,7 @@ /* Endpoint: 1, Cluster: Power Source (server) */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8), 0 }, /* Status */ \ { ZAP_SIMPLE_DEFAULT(2), 0x00000001, 1, ZAP_TYPE(INT8U), 0 }, /* Order */ \ - { ZAP_LONG_DEFAULTS_INDEX(25), 0x00000002, 61, ZAP_TYPE(CHAR_STRING), 0 }, /* Description */ \ + { ZAP_LONG_DEFAULTS_INDEX(17), 0x00000002, 61, ZAP_TYPE(CHAR_STRING), 0 }, /* Description */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000000E, 1, ZAP_TYPE(ENUM8), 0 }, /* BatChargeLevel */ \ { ZAP_EMPTY_DEFAULT(), 0x0000000F, 1, ZAP_TYPE(BOOLEAN), 0 }, /* BatReplacementNeeded */ \ { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(ENUM8), 0 }, /* BatReplaceability */ \ @@ -820,7 +773,7 @@ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Mode Select (server) */ \ - { ZAP_LONG_DEFAULTS_INDEX(28), 0x00000000, 65, ZAP_TYPE(CHAR_STRING), 0 }, /* Description */ \ + { ZAP_LONG_DEFAULTS_INDEX(20), 0x00000000, 65, ZAP_TYPE(CHAR_STRING), 0 }, /* Description */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(ENUM16), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StandardNamespace */ \ { ZAP_SIMPLE_DEFAULT(255), 0xFFF10001, 1, ZAP_TYPE(INT8U), 0 }, /* ManufacturerExtension */ \ { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */ \ @@ -829,64 +782,6 @@ { ZAP_SIMPLE_DEFAULT(255), 0x00000005, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Laundry Washer Mode (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentMode */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Refrigerator And Temperature Controlled Cabinet Mode (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentMode */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: RVC Run Mode (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentMode */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: RVC Clean Mode (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentMode */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Temperature Control (server) */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000004, 1, ZAP_TYPE(INT8U), 0 }, /* SelectedTemperatureLevel */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedTemperatureLevels */ \ - { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Refrigerator Alarm (server) */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000000, 4, ZAP_TYPE(BITMAP32), 0 }, /* Mask */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 4, ZAP_TYPE(BITMAP32), 0 }, /* State */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000003, 4, ZAP_TYPE(BITMAP32), 0 }, /* Supported */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Dishwasher Mode (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentMode */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Air Quality (server) */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8), 0 }, /* AirQuality */ \ - { ZAP_SIMPLE_DEFAULT(15), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Smoke CO Alarm (server) */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ExpressedState */ \ @@ -904,54 +799,6 @@ { ZAP_SIMPLE_DEFAULT(0), 0x0000000C, 4, ZAP_TYPE(EPOCH_S), 0 }, /* ExpiryDate */ \ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Dishwasher Alarm (server) */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000000, 4, ZAP_TYPE(BITMAP32), 0 }, /* Mask */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 4, ZAP_TYPE(BITMAP32), 0 }, /* Latch */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 4, ZAP_TYPE(BITMAP32), 0 }, /* State */ \ - { ZAP_SIMPLE_DEFAULT(15), 0x00000003, 4, ZAP_TYPE(BITMAP32), 0 }, /* Supported */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Operational State (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PhaseList */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPhase */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(ELAPSED_S), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CountdownTime */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalStateList */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalState */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalError */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: RVC Operational State (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PhaseList */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPhase */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(ELAPSED_S), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CountdownTime */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalStateList */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalState */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalError */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: HEPA Filter Monitoring (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(PERCENT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Condition */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DegradationDirection */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ChangeIndication */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* InPlaceIndicator */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(EPOCH_S), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastChangedTime */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ReplacementProductList */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Activated Carbon Filter Monitoring (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(PERCENT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Condition */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DegradationDirection */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ChangeIndication */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* InPlaceIndicator */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(EPOCH_S), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastChangedTime */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ReplacementProductList */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Door Lock (server) */ \ { ZAP_SIMPLE_DEFAULT(2), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LockState */ \ @@ -973,7 +820,7 @@ { ZAP_SIMPLE_DEFAULT(10), 0x0000001A, 1, ZAP_TYPE(INT8U), 0 }, /* MinRFIDCodeLength */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000001B, 1, ZAP_TYPE(BITMAP8), 0 }, /* CredentialRulesSupport */ \ { ZAP_SIMPLE_DEFAULT(5), 0x0000001C, 1, ZAP_TYPE(INT8U), 0 }, /* NumberOfCredentialsSupportedPerUser */ \ - { ZAP_LONG_DEFAULTS_INDEX(35), 0x00000021, 4, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Language */ \ + { ZAP_LONG_DEFAULTS_INDEX(27), 0x00000021, 4, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Language */ \ { ZAP_SIMPLE_DEFAULT(60), 0x00000023, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* AutoRelockTime */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(7), 0x00000024, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* SoundVolume */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(8), 0x00000025, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OperatingMode */ \ @@ -985,7 +832,7 @@ { ZAP_MIN_MAX_DEFAULTS_INDEX(9), 0x00000030, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* WrongCodeEntryLimit */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(10), 0x00000031, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* UserCodeTemporaryDisableTime */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000033, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* RequirePINforRemoteOperation */ \ - { ZAP_SIMPLE_DEFAULT(0x1D13), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ + { ZAP_SIMPLE_DEFAULT(0xD13), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Window Covering (server) */ \ @@ -1046,8 +893,8 @@ { ZAP_SIMPLE_DEFAULT(0x00000000), 0x00000017, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LifetimeEnergyConsumed */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(12), 0x00000020, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OperationMode */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(13), 0x00000021, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ControlMode */ \ - { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ + { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Thermostat (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LocalTemperature */ \ @@ -1075,12 +922,11 @@ { ZAP_SIMPLE_DEFAULT(100), 0x00000004, 1, ZAP_TYPE(INT8U), 0 }, /* SpeedMax */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(26), 0x00000005, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SpeedSetting */ \ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000006, 1, ZAP_TYPE(INT8U), 0 }, /* SpeedCurrent */ \ - { ZAP_SIMPLE_DEFAULT(0x03), 0x00000007, 1, ZAP_TYPE(BITMAP8), 0 }, /* RockSupport */ \ + { ZAP_SIMPLE_DEFAULT(0x00), 0x00000007, 1, ZAP_TYPE(BITMAP8), 0 }, /* RockSupport */ \ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000008, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* RockSetting */ \ - { ZAP_SIMPLE_DEFAULT(0x03), 0x00000009, 1, ZAP_TYPE(BITMAP8), 0 }, /* WindSupport */ \ + { ZAP_SIMPLE_DEFAULT(0x00), 0x00000009, 1, ZAP_TYPE(BITMAP8), 0 }, /* WindSupport */ \ { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000A, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* WindSetting */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000000B, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* AirflowDirection */ \ - { ZAP_SIMPLE_DEFAULT(0x3F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ + { ZAP_SIMPLE_DEFAULT(0x0F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ @@ -1091,14 +937,14 @@ { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Color Control (server) */ \ - { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentHue */ \ - { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentSaturation */ \ + { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(INT8U), 0 }, /* CurrentHue */ \ + { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(INT8U), 0 }, /* CurrentSaturation */ \ { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000002, 2, ZAP_TYPE(INT16U), 0 }, /* RemainingTime */ \ - { ZAP_SIMPLE_DEFAULT(0x616B), 0x00000003, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentX */ \ - { ZAP_SIMPLE_DEFAULT(0x607D), 0x00000004, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentY */ \ + { ZAP_SIMPLE_DEFAULT(0x616B), 0x00000003, 2, ZAP_TYPE(INT16U), 0 }, /* CurrentX */ \ + { ZAP_SIMPLE_DEFAULT(0x607D), 0x00000004, 2, ZAP_TYPE(INT16U), 0 }, /* CurrentY */ \ { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), 0 }, /* DriftCompensation */ \ { ZAP_EMPTY_DEFAULT(), 0x00000006, 255, ZAP_TYPE(CHAR_STRING), 0 }, /* CompensationText */ \ - { ZAP_SIMPLE_DEFAULT(0x00FA), 0x00000007, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorTemperatureMireds */ \ + { ZAP_SIMPLE_DEFAULT(0x00FA), 0x00000007, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTemperatureMireds */ \ { ZAP_SIMPLE_DEFAULT(0x01), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* ColorMode */ \ { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000F, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Options */ \ { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NumberOfPrimaries */ \ @@ -1131,38 +977,20 @@ { ZAP_MIN_MAX_DEFAULTS_INDEX(36), 0x0000003A, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointBX */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(37), 0x0000003B, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointBY */ \ { ZAP_EMPTY_DEFAULT(), 0x0000003C, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ColorPointBIntensity */ \ - { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* EnhancedCurrentHue */ \ - { ZAP_SIMPLE_DEFAULT(0x01), 0x00004001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* EnhancedColorMode */ \ - { ZAP_SIMPLE_DEFAULT(0x00), 0x00004002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorLoopActive */ \ - { ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorLoopDirection */ \ - { ZAP_SIMPLE_DEFAULT(0x0019), 0x00004004, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorLoopTime */ \ + { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004000, 2, ZAP_TYPE(INT16U), 0 }, /* EnhancedCurrentHue */ \ + { ZAP_SIMPLE_DEFAULT(0x01), 0x00004001, 1, ZAP_TYPE(ENUM8), 0 }, /* EnhancedColorMode */ \ + { ZAP_SIMPLE_DEFAULT(0x00), 0x00004002, 1, ZAP_TYPE(INT8U), 0 }, /* ColorLoopActive */ \ + { ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(INT8U), 0 }, /* ColorLoopDirection */ \ + { ZAP_SIMPLE_DEFAULT(0x0019), 0x00004004, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopTime */ \ { ZAP_SIMPLE_DEFAULT(0x2300), 0x00004005, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStartEnhancedHue */ \ { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004006, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStoredEnhancedHue */ \ { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000400A, 2, ZAP_TYPE(BITMAP16), 0 }, /* ColorCapabilities */ \ { ZAP_SIMPLE_DEFAULT(0x0000), 0x0000400B, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTempPhysicalMinMireds */ \ { ZAP_SIMPLE_DEFAULT(0xFEFF), 0x0000400C, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTempPhysicalMaxMireds */ \ { ZAP_EMPTY_DEFAULT(), 0x0000400D, 2, ZAP_TYPE(INT16U), 0 }, /* CoupleColorTempToLevelMinMireds */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(38), 0x00004010, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpColorTemperatureMireds */ \ + { ZAP_MIN_MAX_DEFAULTS_INDEX(38), 0x00004010, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpColorTemperatureMireds */ \ { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Ballast Configuration (server) */ \ - { ZAP_SIMPLE_DEFAULT(0x01), 0x00000000, 1, ZAP_TYPE(INT8U), 0 }, /* PhysicalMinLevel */ \ - { ZAP_SIMPLE_DEFAULT(0xFE), 0x00000001, 1, ZAP_TYPE(INT8U), 0 }, /* PhysicalMaxLevel */ \ - { ZAP_SIMPLE_DEFAULT(0x00), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* BallastStatus */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(39), 0x00000010, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MinLevel */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(40), 0x00000011, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MaxLevel */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000014, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* IntrinsicBallastFactor */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(41), 0x00000015, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BallastFactorAdjustment */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000020, 1, ZAP_TYPE(INT8U), 0 }, /* LampQuantity */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000030, 17, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LampType */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000031, 17, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LampManufacturer */ \ - { ZAP_SIMPLE_DEFAULT(0xFFFFFF), 0x00000032, 3, ZAP_TYPE(INT24U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LampRatedHours */ \ - { ZAP_SIMPLE_DEFAULT(0x000000), 0x00000033, 3, ZAP_TYPE(INT24U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LampBurnHours */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(42), 0x00000034, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LampAlarmMode */ \ - { ZAP_SIMPLE_DEFAULT(0xFFFFFF), 0x00000035, 3, ZAP_TYPE(INT24U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LampBurnHoursTripPoint */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \ { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ @@ -1210,156 +1038,6 @@ { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Carbon Monoxide Concentration Measurement (server) */ \ - { ZAP_SIMPLE_DEFAULT(401), 0x00000000, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(50), 0x00000001, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(1500), 0x00000002, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(511), 0x00000003, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000004, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* PeakMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(213), 0x00000005, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000006, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* AverageMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(10), 0x00000007, 4, ZAP_TYPE(SINGLE), 0 }, /* Uncertainty */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementUnit */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementMedium */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000000A, 1, ZAP_TYPE(ENUM8), 0 }, /* LevelValue */ \ - { ZAP_SIMPLE_DEFAULT(63), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Carbon Dioxide Concentration Measurement (server) */ \ - { ZAP_SIMPLE_DEFAULT(458), 0x00000000, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(300), 0x00000001, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(2000), 0x00000002, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(523), 0x00000003, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000004, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* PeakMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(421), 0x00000005, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000006, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* AverageMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x00000007, 4, ZAP_TYPE(SINGLE), 0 }, /* Uncertainty */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementUnit */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementMedium */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000000A, 1, ZAP_TYPE(ENUM8), 0 }, /* LevelValue */ \ - { ZAP_SIMPLE_DEFAULT(63), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Nitrogen Dioxide Concentration Measurement (server) */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x00000000, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(150), 0x00000002, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x00000003, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(120), 0x00000004, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* PeakMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x00000005, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(120), 0x00000006, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* AverageMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000007, 4, ZAP_TYPE(SINGLE), 0 }, /* Uncertainty */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementUnit */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementMedium */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000000A, 1, ZAP_TYPE(ENUM8), 0 }, /* LevelValue */ \ - { ZAP_SIMPLE_DEFAULT(63), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Ozone Concentration Measurement (server) */ \ - { ZAP_SIMPLE_DEFAULT(10), 0x00000000, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x00000001, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(300), 0x00000002, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(50), 0x00000003, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000004, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* PeakMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(20), 0x00000005, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000006, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* AverageMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000007, 4, ZAP_TYPE(SINGLE), 0 }, /* Uncertainty */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementUnit */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementMedium */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000000A, 1, ZAP_TYPE(ENUM8), 0 }, /* LevelValue */ \ - { ZAP_SIMPLE_DEFAULT(63), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: PM2.5 Concentration Measurement (server) */ \ - { ZAP_SIMPLE_DEFAULT(42), 0x00000000, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(400), 0x00000002, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(90), 0x00000003, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000004, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* PeakMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(35), 0x00000005, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000006, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* AverageMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(4), 0x00000007, 4, ZAP_TYPE(SINGLE), 0 }, /* Uncertainty */ \ - { ZAP_SIMPLE_DEFAULT(4), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementUnit */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementMedium */ \ - { ZAP_SIMPLE_DEFAULT(2), 0x0000000A, 1, ZAP_TYPE(ENUM8), 0 }, /* LevelValue */ \ - { ZAP_SIMPLE_DEFAULT(63), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Formaldehyde Concentration Measurement (server) */ \ - { ZAP_SIMPLE_DEFAULT(10), 0x00000000, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(200), 0x00000002, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(10), 0x00000003, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(7200), 0x00000004, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* PeakMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(2), 0x00000005, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(7200), 0x00000006, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* AverageMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000007, 4, ZAP_TYPE(SINGLE), 0 }, /* Uncertainty */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementUnit */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementMedium */ \ - { ZAP_SIMPLE_DEFAULT(2), 0x0000000A, 1, ZAP_TYPE(ENUM8), 0 }, /* LevelValue */ \ - { ZAP_SIMPLE_DEFAULT(63), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: PM1 Concentration Measurement (server) */ \ - { ZAP_SIMPLE_DEFAULT(39), 0x00000000, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(400), 0x00000002, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(70), 0x00000003, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000004, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* PeakMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(41), 0x00000005, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000006, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* AverageMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(4), 0x00000007, 4, ZAP_TYPE(SINGLE), 0 }, /* Uncertainty */ \ - { ZAP_SIMPLE_DEFAULT(4), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementUnit */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementMedium */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000000A, 1, ZAP_TYPE(ENUM8), 0 }, /* LevelValue */ \ - { ZAP_SIMPLE_DEFAULT(63), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: PM10 Concentration Measurement (server) */ \ - { ZAP_SIMPLE_DEFAULT(7), 0x00000000, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(2), 0x00000001, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(400), 0x00000002, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(49), 0x00000003, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000004, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* PeakMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(43), 0x00000005, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000006, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* AverageMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(2), 0x00000007, 4, ZAP_TYPE(SINGLE), 0 }, /* Uncertainty */ \ - { ZAP_SIMPLE_DEFAULT(4), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementUnit */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementMedium */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000000A, 1, ZAP_TYPE(ENUM8), 0 }, /* LevelValue */ \ - { ZAP_SIMPLE_DEFAULT(63), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Total Volatile Organic Compounds Concentration Measurement (server) */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x00000000, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(100), 0x00000002, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(8), 0x00000003, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000004, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* PeakMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(2), 0x00000005, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000006, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* AverageMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000007, 4, ZAP_TYPE(SINGLE), 0 }, /* Uncertainty */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementUnit */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementMedium */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000000A, 1, ZAP_TYPE(ENUM8), 0 }, /* LevelValue */ \ - { ZAP_SIMPLE_DEFAULT(63), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ -\ - /* Endpoint: 1, Cluster: Radon Concentration Measurement (server) */ \ - { ZAP_SIMPLE_DEFAULT(10), 0x00000000, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x00000001, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(100), 0x00000002, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(36), 0x00000003, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000004, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* PeakMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(20), 0x00000005, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */ \ - { ZAP_SIMPLE_DEFAULT(3600), 0x00000006, 4, ZAP_TYPE(ELAPSED_S), 0 }, /* AverageMeasuredValueWindow */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000007, 4, ZAP_TYPE(SINGLE), 0 }, /* Uncertainty */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementUnit */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 1, ZAP_TYPE(ENUM8), 0 }, /* MeasurementMedium */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000000A, 1, ZAP_TYPE(ENUM8), 0 }, /* LevelValue */ \ - { ZAP_SIMPLE_DEFAULT(63), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Wake on LAN (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 33, ZAP_TYPE(CHAR_STRING), 0 }, /* MACAddress */ \ @@ -1379,11 +1057,11 @@ \ /* Endpoint: 1, Cluster: Media Playback (server) */ \ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(ENUM8), 0 }, /* CurrentState */ \ - { ZAP_LONG_DEFAULTS_INDEX(38), 0x00000001, 8, ZAP_TYPE(EPOCH_US), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartTime */ \ - { ZAP_LONG_DEFAULTS_INDEX(46), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Duration */ \ + { ZAP_LONG_DEFAULTS_INDEX(30), 0x00000001, 8, ZAP_TYPE(EPOCH_US), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartTime */ \ + { ZAP_LONG_DEFAULTS_INDEX(38), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Duration */ \ { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(SINGLE), 0 }, /* PlaybackSpeed */ \ - { ZAP_LONG_DEFAULTS_INDEX(54), 0x00000005, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SeekRangeEnd */ \ - { ZAP_LONG_DEFAULTS_INDEX(62), 0x00000006, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SeekRangeStart */ \ + { ZAP_LONG_DEFAULTS_INDEX(46), 0x00000005, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SeekRangeEnd */ \ + { ZAP_LONG_DEFAULTS_INDEX(54), 0x00000006, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SeekRangeStart */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ @@ -1453,27 +1131,27 @@ { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* bitmap8 */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 2, ZAP_TYPE(BITMAP16), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* bitmap16 */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* bitmap32 */ \ - { ZAP_LONG_DEFAULTS_INDEX(70), 0x00000004, 8, ZAP_TYPE(BITMAP64), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* bitmap64 */ \ + { ZAP_LONG_DEFAULTS_INDEX(62), 0x00000004, 8, ZAP_TYPE(BITMAP64), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* bitmap64 */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000005, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int8u */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000006, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int16u */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000007, 3, ZAP_TYPE(INT24U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int24u */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000008, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int32u */ \ - { ZAP_LONG_DEFAULTS_INDEX(78), 0x00000009, 5, ZAP_TYPE(INT40U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int40u */ \ - { ZAP_LONG_DEFAULTS_INDEX(83), 0x0000000A, 6, ZAP_TYPE(INT48U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int48u */ \ - { ZAP_LONG_DEFAULTS_INDEX(89), 0x0000000B, 7, ZAP_TYPE(INT56U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int56u */ \ - { ZAP_LONG_DEFAULTS_INDEX(96), 0x0000000C, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int64u */ \ + { ZAP_LONG_DEFAULTS_INDEX(70), 0x00000009, 5, ZAP_TYPE(INT40U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int40u */ \ + { ZAP_LONG_DEFAULTS_INDEX(75), 0x0000000A, 6, ZAP_TYPE(INT48U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int48u */ \ + { ZAP_LONG_DEFAULTS_INDEX(81), 0x0000000B, 7, ZAP_TYPE(INT56U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int56u */ \ + { ZAP_LONG_DEFAULTS_INDEX(88), 0x0000000C, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int64u */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000000D, 1, ZAP_TYPE(INT8S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int8s */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000000E, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int16s */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000000F, 3, ZAP_TYPE(INT24S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int24s */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000010, 4, ZAP_TYPE(INT32S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int32s */ \ - { ZAP_LONG_DEFAULTS_INDEX(104), 0x00000011, 5, ZAP_TYPE(INT40S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int40s */ \ - { ZAP_LONG_DEFAULTS_INDEX(109), 0x00000012, 6, ZAP_TYPE(INT48S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int48s */ \ - { ZAP_LONG_DEFAULTS_INDEX(115), 0x00000013, 7, ZAP_TYPE(INT56S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int56s */ \ - { ZAP_LONG_DEFAULTS_INDEX(122), 0x00000014, 8, ZAP_TYPE(INT64S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int64s */ \ + { ZAP_LONG_DEFAULTS_INDEX(96), 0x00000011, 5, ZAP_TYPE(INT40S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int40s */ \ + { ZAP_LONG_DEFAULTS_INDEX(101), 0x00000012, 6, ZAP_TYPE(INT48S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int48s */ \ + { ZAP_LONG_DEFAULTS_INDEX(107), 0x00000013, 7, ZAP_TYPE(INT56S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int56s */ \ + { ZAP_LONG_DEFAULTS_INDEX(114), 0x00000014, 8, ZAP_TYPE(INT64S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* int64s */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000015, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* enum8 */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000016, 2, ZAP_TYPE(ENUM16), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* enum16 */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000017, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* float_single */ \ - { ZAP_LONG_DEFAULTS_INDEX(130), 0x00000018, 8, ZAP_TYPE(DOUBLE), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* float_double */ \ + { ZAP_LONG_DEFAULTS_INDEX(122), 0x00000018, 8, ZAP_TYPE(DOUBLE), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* float_double */ \ { ZAP_EMPTY_DEFAULT(), 0x00000019, 11, ZAP_TYPE(OCTET_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* octet_string */ \ { ZAP_EMPTY_DEFAULT(), 0x0000001A, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_int8u */ \ { ZAP_EMPTY_DEFAULT(), 0x0000001B, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_octet_string */ \ @@ -1481,16 +1159,16 @@ { ZAP_EMPTY_DEFAULT(), 0x0000001D, 1002, ZAP_TYPE(LONG_OCTET_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* long_octet_string */ \ { ZAP_EMPTY_DEFAULT(), 0x0000001E, 11, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* char_string */ \ { ZAP_EMPTY_DEFAULT(), 0x0000001F, 1002, ZAP_TYPE(LONG_CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* long_char_string */ \ - { ZAP_LONG_DEFAULTS_INDEX(138), 0x00000020, 8, ZAP_TYPE(EPOCH_US), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* epoch_us */ \ + { ZAP_LONG_DEFAULTS_INDEX(130), 0x00000020, 8, ZAP_TYPE(EPOCH_US), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* epoch_us */ \ { ZAP_EMPTY_DEFAULT(), 0x00000021, 4, ZAP_TYPE(EPOCH_S), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* epoch_s */ \ { ZAP_EMPTY_DEFAULT(), 0x00000022, 2, ZAP_TYPE(VENDOR_ID), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* vendor_id */ \ { ZAP_EMPTY_DEFAULT(), 0x00000023, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_nullables_and_optionals_struct */ \ { ZAP_EMPTY_DEFAULT(), 0x00000024, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* enum_attr */ \ { ZAP_EMPTY_DEFAULT(), 0x00000025, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* struct_attr */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(43), 0x00000026, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int8u */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(44), 0x00000027, 1, ZAP_TYPE(INT8S), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int8s */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(45), 0x00000028, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int16u */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(46), 0x00000029, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int16s */ \ + { ZAP_MIN_MAX_DEFAULTS_INDEX(39), 0x00000026, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int8u */ \ + { ZAP_MIN_MAX_DEFAULTS_INDEX(40), 0x00000027, 1, ZAP_TYPE(INT8S), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int8s */ \ + { ZAP_MIN_MAX_DEFAULTS_INDEX(41), 0x00000028, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int16u */ \ + { ZAP_MIN_MAX_DEFAULTS_INDEX(42), 0x00000029, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int16s */ \ { ZAP_EMPTY_DEFAULT(), 0x0000002A, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_long_octet_string */ \ { ZAP_EMPTY_DEFAULT(), 0x0000002B, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_fabric_scoped */ \ { ZAP_EMPTY_DEFAULT(), 0x00000030, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(MUST_USE_TIMED_WRITE) }, /* timed_write_boolean */ \ @@ -1500,35 +1178,35 @@ { ZAP_SIMPLE_DEFAULT(0), 0x00004001, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap8 */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00004002, 2, ZAP_TYPE(BITMAP16), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap16 */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00004003, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap32 */ \ - { ZAP_LONG_DEFAULTS_INDEX(146), 0x00004004, 8, ZAP_TYPE(BITMAP64), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap64 */ \ + { ZAP_LONG_DEFAULTS_INDEX(138), 0x00004004, 8, ZAP_TYPE(BITMAP64), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap64 */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00004005, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int8u */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00004006, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int16u */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00004007, 3, ZAP_TYPE(INT24U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int24u */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00004008, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int32u */ \ - { ZAP_LONG_DEFAULTS_INDEX(154), 0x00004009, 5, ZAP_TYPE(INT40U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int40u */ \ - { ZAP_LONG_DEFAULTS_INDEX(159), 0x0000400A, 6, ZAP_TYPE(INT48U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int48u */ \ - { ZAP_LONG_DEFAULTS_INDEX(165), 0x0000400B, 7, ZAP_TYPE(INT56U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int56u */ \ - { ZAP_LONG_DEFAULTS_INDEX(172), 0x0000400C, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int64u */ \ + { ZAP_LONG_DEFAULTS_INDEX(146), 0x00004009, 5, ZAP_TYPE(INT40U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int40u */ \ + { ZAP_LONG_DEFAULTS_INDEX(151), 0x0000400A, 6, ZAP_TYPE(INT48U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int48u */ \ + { ZAP_LONG_DEFAULTS_INDEX(157), 0x0000400B, 7, ZAP_TYPE(INT56U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int56u */ \ + { ZAP_LONG_DEFAULTS_INDEX(164), 0x0000400C, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int64u */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000400D, 1, ZAP_TYPE(INT8S), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int8s */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000400E, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int16s */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000400F, 3, ZAP_TYPE(INT24S), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int24s */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00004010, 4, ZAP_TYPE(INT32S), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int32s */ \ - { ZAP_LONG_DEFAULTS_INDEX(180), 0x00004011, 5, ZAP_TYPE(INT40S), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int40s */ \ - { ZAP_LONG_DEFAULTS_INDEX(185), 0x00004012, 6, ZAP_TYPE(INT48S), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int48s */ \ - { ZAP_LONG_DEFAULTS_INDEX(191), 0x00004013, 7, ZAP_TYPE(INT56S), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int56s */ \ - { ZAP_LONG_DEFAULTS_INDEX(198), 0x00004014, 8, ZAP_TYPE(INT64S), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int64s */ \ + { ZAP_LONG_DEFAULTS_INDEX(172), 0x00004011, 5, ZAP_TYPE(INT40S), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int40s */ \ + { ZAP_LONG_DEFAULTS_INDEX(177), 0x00004012, 6, ZAP_TYPE(INT48S), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int48s */ \ + { ZAP_LONG_DEFAULTS_INDEX(183), 0x00004013, 7, ZAP_TYPE(INT56S), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int56s */ \ + { ZAP_LONG_DEFAULTS_INDEX(190), 0x00004014, 8, ZAP_TYPE(INT64S), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int64s */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00004015, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_enum8 */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00004016, 2, ZAP_TYPE(ENUM16), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_enum16 */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00004017, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_float_single */ \ - { ZAP_LONG_DEFAULTS_INDEX(206), 0x00004018, 8, ZAP_TYPE(DOUBLE), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_float_double */ \ + { ZAP_LONG_DEFAULTS_INDEX(198), 0x00004018, 8, ZAP_TYPE(DOUBLE), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_float_double */ \ { ZAP_EMPTY_DEFAULT(), 0x00004019, 11, ZAP_TYPE(OCTET_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_octet_string */ \ { ZAP_EMPTY_DEFAULT(), 0x0000401E, 11, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_char_string */ \ { ZAP_EMPTY_DEFAULT(), 0x00004024, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_enum_attr */ \ { ZAP_EMPTY_DEFAULT(), 0x00004025, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_struct */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(47), 0x00004026, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int8u */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(48), 0x00004027, 1, ZAP_TYPE(INT8S), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int8s */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(49), 0x00004028, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int16u */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(50), 0x00004029, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int16s */ \ + { ZAP_MIN_MAX_DEFAULTS_INDEX(43), 0x00004026, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int8u */ \ + { ZAP_MIN_MAX_DEFAULTS_INDEX(44), 0x00004027, 1, ZAP_TYPE(INT8S), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int8s */ \ + { ZAP_MIN_MAX_DEFAULTS_INDEX(45), 0x00004028, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int16u */ \ + { ZAP_MIN_MAX_DEFAULTS_INDEX(46), 0x00004029, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int16s */ \ { ZAP_EMPTY_DEFAULT(), 0x0000402A, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* write_only_int8u */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ @@ -1543,7 +1221,7 @@ { ZAP_SIMPLE_DEFAULT(1), 0x00004000, 1, ZAP_TYPE(BOOLEAN), 0 }, /* GlobalSceneControl */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00004001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OnTime */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00004002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OffWaitTime */ \ - { ZAP_MIN_MAX_DEFAULTS_INDEX(51), 0x00004003, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpOnOff */ \ + { ZAP_MIN_MAX_DEFAULTS_INDEX(47), 0x00004003, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpOnOff */ \ { ZAP_SIMPLE_DEFAULT(0x0000), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ @@ -1558,7 +1236,7 @@ /* Endpoint: 2, Cluster: Power Source (server) */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8), 0 }, /* Status */ \ { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 1, ZAP_TYPE(INT8U), 0 }, /* Order */ \ - { ZAP_LONG_DEFAULTS_INDEX(214), 0x00000002, 61, ZAP_TYPE(CHAR_STRING), 0 }, /* Description */ \ + { ZAP_LONG_DEFAULTS_INDEX(206), 0x00000002, 61, ZAP_TYPE(CHAR_STRING), 0 }, /* Description */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000000E, 1, ZAP_TYPE(ENUM8), 0 }, /* BatChargeLevel */ \ { ZAP_EMPTY_DEFAULT(), 0x0000000F, 1, ZAP_TYPE(BOOLEAN), 0 }, /* BatReplacementNeeded */ \ { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(ENUM8), 0 }, /* BatReplaceability */ \ @@ -1596,7 +1274,7 @@ // clang-format off -#define GENERATED_EVENT_COUNT 46 +#define GENERATED_EVENT_COUNT 34 #define GENERATED_EVENTS { \ /* Endpoint: 0, Cluster: Access Control (server) */ \ /* EventList (index=0) */ \ @@ -1626,24 +1304,11 @@ 0x00000000, /* Disconnection */ \ 0x00000001, /* AssociationFailure */ \ 0x00000002, /* ConnectionStatus */ \ - /* Endpoint: 0, Cluster: Time Synchronization (server) */ \ - /* EventList (index=16) */ \ - 0x00000000, /* DSTTableEmpty */ \ - 0x00000001, /* DSTStatus */ \ - 0x00000002, /* TimeZoneStatus */ \ - 0x00000003, /* TimeFailure */ \ - 0x00000004, /* MissingTrustedTimeSource */ \ - /* Endpoint: 1, Cluster: Power Source (server) */ \ - /* EventList (index=21) */ \ - 0x00000001, /* BatFaultChange */ \ /* Endpoint: 1, Cluster: Switch (server) */ \ - /* EventList (index=22) */ \ + /* EventList (index=16) */ \ 0x00000000, /* SwitchLatched */ \ - /* Endpoint: 1, Cluster: Refrigerator Alarm (server) */ \ - /* EventList (index=23) */ \ - 0x00000000, /* Notify */ \ /* Endpoint: 1, Cluster: Smoke CO Alarm (server) */ \ - /* EventList (index=24) */ \ + /* EventList (index=17) */ \ 0x00000000, /* SmokeAlarm */ \ 0x00000001, /* COAlarm */ \ 0x00000002, /* LowBattery */ \ @@ -1655,25 +1320,14 @@ 0x00000008, /* InterconnectSmokeAlarm */ \ 0x00000009, /* InterconnectCOAlarm */ \ 0x0000000A, /* AllClear */ \ - /* Endpoint: 1, Cluster: Dishwasher Alarm (server) */ \ - /* EventList (index=35) */ \ - 0x00000000, /* Notify */ \ - /* Endpoint: 1, Cluster: Operational State (server) */ \ - /* EventList (index=36) */ \ - 0x00000000, /* OperationalError */ \ - 0x00000001, /* OperationCompletion */ \ - /* Endpoint: 1, Cluster: RVC Operational State (server) */ \ - /* EventList (index=38) */ \ - 0x00000000, /* OperationalError */ \ - 0x00000001, /* OperationCompletion */ \ /* Endpoint: 1, Cluster: Door Lock (server) */ \ - /* EventList (index=40) */ \ + /* EventList (index=28) */ \ 0x00000000, /* DoorLockAlarm */ \ 0x00000002, /* LockOperation */ \ 0x00000003, /* LockOperationError */ \ 0x00000004, /* LockUserChange */ \ /* Endpoint: 1, Cluster: Unit Testing (server) */ \ - /* EventList (index=44) */ \ + /* EventList (index=32) */ \ 0x00000001, /* TestEvent */ \ 0x00000002, /* TestFabricScopedEvent */ \ } @@ -1824,25 +1478,14 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ /* AcceptedCommandList (index=48) */ \ 0x00000000 /* ResetCounts */, \ chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 0, Cluster: Time Synchronization (server) */\ - /* AcceptedCommandList (index=50) */ \ - 0x00000000 /* SetUTCTime */, \ - 0x00000001 /* SetTrustedTimeSource */, \ - 0x00000002 /* SetTimeZone */, \ - 0x00000004 /* SetDSTOffset */, \ - 0x00000005 /* SetDefaultNTP */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=56)*/ \ - 0x00000003 /* SetTimeZoneResponse */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Administrator Commissioning (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=50) */ \ 0x00000000 /* OpenCommissioningWindow */, \ 0x00000001 /* OpenBasicCommissioningWindow */, \ 0x00000002 /* RevokeCommissioning */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Operational Credentials (server) */\ - /* AcceptedCommandList (index=62) */ \ + /* AcceptedCommandList (index=54) */ \ 0x00000000 /* AttestationRequest */, \ 0x00000002 /* CertificateChainRequest */, \ 0x00000004 /* CSRRequest */, \ @@ -1852,44 +1495,35 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=71)*/ \ + /* GeneratedCommandList (index=63)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=76) */ \ + /* AcceptedCommandList (index=68) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=81)*/ \ + /* GeneratedCommandList (index=73)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 0, Cluster: ICD Management (server) */\ - /* AcceptedCommandList (index=84) */ \ - 0x00000000 /* RegisterClient */, \ - 0x00000002 /* UnregisterClient */, \ - 0x00000003 /* StayActiveRequest */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=88)*/ \ - 0x00000001 /* RegisterClientResponse */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Fault Injection (server) */\ - /* AcceptedCommandList (index=90) */ \ + /* AcceptedCommandList (index=76) */ \ 0x00000000 /* FailAtFault */, \ 0x00000001 /* FailRandomlyAtFault */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=93) */ \ + /* AcceptedCommandList (index=79) */ \ 0x00000000 /* Identify */, \ 0x00000040 /* TriggerEffect */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=96) */ \ + /* AcceptedCommandList (index=82) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -1897,14 +1531,14 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=103)*/ \ + /* GeneratedCommandList (index=89)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Scenes (server) */\ - /* AcceptedCommandList (index=108) */ \ + /* AcceptedCommandList (index=94) */ \ 0x00000000 /* AddScene */, \ 0x00000001 /* ViewScene */, \ 0x00000002 /* RemoveScene */, \ @@ -1913,7 +1547,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x00000005 /* RecallScene */, \ 0x00000006 /* GetSceneMembership */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=116)*/ \ + /* GeneratedCommandList (index=102)*/ \ 0x00000000 /* AddSceneResponse */, \ 0x00000001 /* ViewSceneResponse */, \ 0x00000002 /* RemoveSceneResponse */, \ @@ -1922,7 +1556,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x00000006 /* GetSceneMembershipResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=123) */ \ + /* AcceptedCommandList (index=109) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ @@ -1931,7 +1565,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x00000042 /* OnWithTimedOff */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Level Control (server) */\ - /* AcceptedCommandList (index=130) */ \ + /* AcceptedCommandList (index=116) */ \ 0x00000000 /* MoveToLevel */, \ 0x00000001 /* Move */, \ 0x00000002 /* Step */, \ @@ -1942,85 +1576,15 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x00000007 /* StopWithOnOff */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Mode Select (server) */\ - /* AcceptedCommandList (index=139) */ \ - 0x00000000 /* ChangeToMode */, \ - chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: Laundry Washer Mode (server) */\ - /* AcceptedCommandList (index=141) */ \ - 0x00000000 /* ChangeToMode */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=143)*/ \ - 0x00000001 /* ChangeToModeResponse */, \ - chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: Refrigerator And Temperature Controlled Cabinet Mode (server) */\ - /* AcceptedCommandList (index=145) */ \ - 0x00000000 /* ChangeToMode */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=147)*/ \ - 0x00000001 /* ChangeToModeResponse */, \ - chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: RVC Run Mode (server) */\ - /* AcceptedCommandList (index=149) */ \ + /* AcceptedCommandList (index=125) */ \ 0x00000000 /* ChangeToMode */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=151)*/ \ - 0x00000001 /* ChangeToModeResponse */, \ - chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: RVC Clean Mode (server) */\ - /* AcceptedCommandList (index=153) */ \ - 0x00000000 /* ChangeToMode */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=155)*/ \ - 0x00000001 /* ChangeToModeResponse */, \ - chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: Temperature Control (server) */\ - /* AcceptedCommandList (index=157) */ \ - 0x00000000 /* SetTemperature */, \ - chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: Dishwasher Mode (server) */\ - /* AcceptedCommandList (index=159) */ \ - 0x00000000 /* ChangeToMode */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=161)*/ \ - 0x00000001 /* ChangeToModeResponse */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Smoke CO Alarm (server) */\ - /* AcceptedCommandList (index=163) */ \ + /* AcceptedCommandList (index=127) */ \ 0x00000000 /* SelfTestRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: Dishwasher Alarm (server) */\ - /* AcceptedCommandList (index=165) */ \ - 0x00000000 /* Reset */, \ - 0x00000001 /* ModifyEnabledAlarms */, \ - chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: Operational State (server) */\ - /* AcceptedCommandList (index=168) */ \ - 0x00000000 /* Pause */, \ - 0x00000001 /* Stop */, \ - 0x00000002 /* Start */, \ - 0x00000003 /* Resume */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=173)*/ \ - 0x00000004 /* OperationalCommandResponse */, \ - chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: RVC Operational State (server) */\ - /* AcceptedCommandList (index=175) */ \ - 0x00000000 /* Pause */, \ - 0x00000003 /* Resume */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=178)*/ \ - 0x00000004 /* OperationalCommandResponse */, \ - chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: HEPA Filter Monitoring (server) */\ - /* AcceptedCommandList (index=180) */ \ - 0x00000000 /* ResetCondition */, \ - chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: Activated Carbon Filter Monitoring (server) */\ - /* AcceptedCommandList (index=182) */ \ - 0x00000000 /* ResetCondition */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Door Lock (server) */\ - /* AcceptedCommandList (index=184) */ \ + /* AcceptedCommandList (index=129) */ \ 0x00000000 /* LockDoor */, \ 0x00000001 /* UnlockDoor */, \ 0x00000003 /* UnlockWithTimeout */, \ @@ -2035,9 +1599,8 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x00000022 /* SetCredential */, \ 0x00000024 /* GetCredentialStatus */, \ 0x00000026 /* ClearCredential */, \ - 0x00000027 /* UnboltDoor */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=200)*/ \ + /* GeneratedCommandList (index=144)*/ \ 0x0000000C /* GetWeekDayScheduleResponse */, \ 0x0000000F /* GetYearDayScheduleResponse */, \ 0x0000001C /* GetUserResponse */, \ @@ -2045,7 +1608,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x00000025 /* GetCredentialStatusResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Window Covering (server) */\ - /* AcceptedCommandList (index=206) */ \ + /* AcceptedCommandList (index=150) */ \ 0x00000000 /* UpOrOpen */, \ 0x00000001 /* DownOrClose */, \ 0x00000002 /* StopMotion */, \ @@ -2055,20 +1618,16 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x00000008 /* GoToTiltPercentage */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Barrier Control (server) */\ - /* AcceptedCommandList (index=214) */ \ + /* AcceptedCommandList (index=158) */ \ 0x00000000 /* BarrierControlGoToPercent */, \ 0x00000001 /* BarrierControlStop */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Thermostat (server) */\ - /* AcceptedCommandList (index=217) */ \ + /* AcceptedCommandList (index=161) */ \ 0x00000000 /* SetpointRaiseLower */, \ chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: Fan Control (server) */\ - /* AcceptedCommandList (index=219) */ \ - 0x00000000 /* Step */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Color Control (server) */\ - /* AcceptedCommandList (index=221) */ \ + /* AcceptedCommandList (index=163) */ \ 0x00000000 /* MoveToHue */, \ 0x00000001 /* MoveHue */, \ 0x00000002 /* StepHue */, \ @@ -2090,32 +1649,32 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x0000004C /* StepColorTemperature */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Target Navigator (server) */\ - /* AcceptedCommandList (index=241) */ \ + /* AcceptedCommandList (index=183) */ \ 0x00000000 /* NavigateTarget */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=243)*/ \ + /* GeneratedCommandList (index=185)*/ \ 0x00000001 /* NavigateTargetResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Media Input (server) */\ - /* AcceptedCommandList (index=245) */ \ + /* AcceptedCommandList (index=187) */ \ 0x00000000 /* SelectInput */, \ 0x00000001 /* ShowInputStatus */, \ 0x00000002 /* HideInputStatus */, \ 0x00000003 /* RenameInput */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Low Power (server) */\ - /* AcceptedCommandList (index=250) */ \ + /* AcceptedCommandList (index=192) */ \ 0x00000000 /* Sleep */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Keypad Input (server) */\ - /* AcceptedCommandList (index=252) */ \ + /* AcceptedCommandList (index=194) */ \ 0x00000000 /* SendKey */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=254)*/ \ + /* GeneratedCommandList (index=196)*/ \ 0x00000001 /* SendKeyResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Unit Testing (server) */\ - /* AcceptedCommandList (index=256) */ \ + /* AcceptedCommandList (index=198) */ \ 0x00000000 /* Test */, \ 0x00000001 /* TestNotHandled */, \ 0x00000002 /* TestSpecific */, \ @@ -2135,7 +1694,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x00000014 /* TestEmitTestEventRequest */, \ 0x00000015 /* TestEmitTestFabricScopedEventRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=275)*/ \ + /* GeneratedCommandList (index=217)*/ \ 0x00000000 /* TestSpecificResponse */, \ 0x00000001 /* TestAddArgumentsResponse */, \ 0x00000004 /* TestListInt8UReverseResponse */, \ @@ -2147,7 +1706,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x0000000B /* TestEmitTestFabricScopedEventResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=285) */ \ + /* AcceptedCommandList (index=227) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -2155,20 +1714,20 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=292)*/ \ + /* GeneratedCommandList (index=234)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=297) */ \ + /* AcceptedCommandList (index=239) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 65534, Cluster: Network Commissioning (server) */\ - /* AcceptedCommandList (index=301) */ \ + /* AcceptedCommandList (index=243) */ \ 0x00000000 /* ScanNetworks */, \ 0x00000002 /* AddOrUpdateWiFiNetwork */, \ 0x00000003 /* AddOrUpdateThreadNetwork */, \ @@ -2176,7 +1735,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ 0x00000006 /* ConnectNetwork */, \ 0x00000008 /* ReorderNetwork */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=308)*/ \ + /* GeneratedCommandList (index=250)*/ \ 0x00000001 /* ScanNetworksResponse */, \ 0x00000005 /* NetworkConfigResponse */, \ 0x00000007 /* ConnectNetworkResponse */, \ @@ -2186,7 +1745,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ // clang-format on // This is an array of EmberAfCluster structures. -#define GENERATED_CLUSTER_COUNT 106 +#define GENERATED_CLUSTER_COUNT 79 // clang-format off #define GENERATED_CLUSTERS { \ { \ @@ -2259,7 +1818,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ .clusterId = 0x00000028, \ .attributes = ZAP_ATTRIBUTE_INDEX(23), \ .attributeCount = 22, \ - .clusterSize = 40, \ + .clusterSize = 41, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = nullptr, \ @@ -2449,28 +2008,15 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ .eventList = nullptr, \ .eventCount = 0, \ },\ - { \ - /* Endpoint: 0, Cluster: Time Synchronization (server) */ \ - .clusterId = 0x00000038, \ - .attributes = ZAP_ATTRIBUTE_INDEX(199), \ - .attributeCount = 14, \ - .clusterSize = 9, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ), \ - .eventList = ZAP_GENERATED_EVENTS_INDEX( 16 ), \ - .eventCount = 5, \ - },\ { \ /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ .clusterId = 0x0000003C, \ - .attributes = ZAP_ATTRIBUTE_INDEX(213), \ + .attributes = ZAP_ATTRIBUTE_INDEX(199), \ .attributeCount = 5, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -2478,33 +2024,33 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ .clusterId = 0x0000003E, \ - .attributes = ZAP_ATTRIBUTE_INDEX(218), \ + .attributes = ZAP_ATTRIBUTE_INDEX(204), \ .attributeCount = 8, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ), \ + .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, \ - .attributes = ZAP_ATTRIBUTE_INDEX(226), \ + .attributes = ZAP_ATTRIBUTE_INDEX(212), \ .attributeCount = 6, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 81 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Fixed Label (server) */ \ .clusterId = 0x00000040, \ - .attributes = ZAP_ATTRIBUTE_INDEX(232), \ + .attributes = ZAP_ATTRIBUTE_INDEX(218), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2517,7 +2063,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 0, Cluster: User Label (server) */ \ .clusterId = 0x00000041, \ - .attributes = ZAP_ATTRIBUTE_INDEX(235), \ + .attributes = ZAP_ATTRIBUTE_INDEX(221), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2527,23 +2073,10 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ .eventList = nullptr, \ .eventCount = 0, \ },\ - { \ - /* Endpoint: 0, Cluster: ICD Management (server) */ \ - .clusterId = 0x00000046, \ - .attributes = ZAP_ATTRIBUTE_INDEX(238), \ - .attributeCount = 8, \ - .clusterSize = 6, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 84 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ), \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ { \ /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ .clusterId = 0x00000405, \ - .attributes = ZAP_ATTRIBUTE_INDEX(246), \ + .attributes = ZAP_ATTRIBUTE_INDEX(224), \ .attributeCount = 5, \ .clusterSize = 12, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2556,12 +2089,12 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 0, Cluster: Fault Injection (server) */ \ .clusterId = 0xFFF1FC06, \ - .attributes = ZAP_ATTRIBUTE_INDEX(251), \ + .attributes = ZAP_ATTRIBUTE_INDEX(229), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -2569,12 +2102,12 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Identify (server) */ \ .clusterId = 0x00000003, \ - .attributes = ZAP_ATTRIBUTE_INDEX(253), \ + .attributes = ZAP_ATTRIBUTE_INDEX(231), \ .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( 93 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -2582,51 +2115,38 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ .clusterId = 0x00000004, \ - .attributes = ZAP_ATTRIBUTE_INDEX(257), \ + .attributes = ZAP_ATTRIBUTE_INDEX(235), \ .attributeCount = 3, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 96 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 103 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 82 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Scenes (server) */ \ .clusterId = 0x00000005, \ - .attributes = ZAP_ATTRIBUTE_INDEX(260), \ - .attributeCount = 10, \ - .clusterSize = 21, \ + .attributes = ZAP_ATTRIBUTE_INDEX(238), \ + .attributeCount = 7, \ + .clusterSize = 11, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 108 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 116 ), \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: On/Off (client) */ \ - .clusterId = 0x00000006, \ - .attributes = ZAP_ATTRIBUTE_INDEX(270), \ - .attributeCount = 0, \ - .clusterSize = 0, \ - .mask = ZAP_CLUSTER_MASK(CLIENT), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 94 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 102 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: On/Off (server) */ \ .clusterId = 0x00000006, \ - .attributes = ZAP_ATTRIBUTE_INDEX(270), \ + .attributes = ZAP_ATTRIBUTE_INDEX(245), \ .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( 123 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 109 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -2634,7 +2154,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: On/off Switch Configuration (server) */ \ .clusterId = 0x00000007, \ - .attributes = ZAP_ATTRIBUTE_INDEX(277), \ + .attributes = ZAP_ATTRIBUTE_INDEX(252), \ .attributeCount = 4, \ .clusterSize = 8, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2647,12 +2167,12 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Level Control (server) */ \ .clusterId = 0x00000008, \ - .attributes = ZAP_ATTRIBUTE_INDEX(281), \ + .attributes = ZAP_ATTRIBUTE_INDEX(256), \ .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( 130 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 116 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -2660,7 +2180,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Binary Input (Basic) (server) */ \ .clusterId = 0x0000000F, \ - .attributes = ZAP_ATTRIBUTE_INDEX(297), \ + .attributes = ZAP_ATTRIBUTE_INDEX(272), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2673,7 +2193,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Descriptor (server) */ \ .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(302), \ + .attributes = ZAP_ATTRIBUTE_INDEX(277), \ .attributeCount = 6, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2686,7 +2206,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Binding (server) */ \ .clusterId = 0x0000001E, \ - .attributes = ZAP_ATTRIBUTE_INDEX(308), \ + .attributes = ZAP_ATTRIBUTE_INDEX(283), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2699,7 +2219,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Actions (server) */ \ .clusterId = 0x00000025, \ - .attributes = ZAP_ATTRIBUTE_INDEX(311), \ + .attributes = ZAP_ATTRIBUTE_INDEX(286), \ .attributeCount = 5, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2712,33 +2232,33 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Power Source (server) */ \ .clusterId = 0x0000002F, \ - .attributes = ZAP_ATTRIBUTE_INDEX(316), \ + .attributes = ZAP_ATTRIBUTE_INDEX(291), \ .attributeCount = 9, \ .clusterSize = 72, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = nullptr, \ .generatedCommandList = nullptr, \ - .eventList = ZAP_GENERATED_EVENTS_INDEX( 21 ), \ - .eventCount = 1, \ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Switch (server) */ \ .clusterId = 0x0000003B, \ - .attributes = ZAP_ATTRIBUTE_INDEX(325), \ + .attributes = ZAP_ATTRIBUTE_INDEX(300), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = nullptr, \ .generatedCommandList = nullptr, \ - .eventList = ZAP_GENERATED_EVENTS_INDEX( 22 ), \ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 16 ), \ .eventCount = 1, \ },\ { \ /* Endpoint: 1, Cluster: Fixed Label (server) */ \ .clusterId = 0x00000040, \ - .attributes = ZAP_ATTRIBUTE_INDEX(330), \ + .attributes = ZAP_ATTRIBUTE_INDEX(305), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2751,7 +2271,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: User Label (server) */ \ .clusterId = 0x00000041, \ - .attributes = ZAP_ATTRIBUTE_INDEX(333), \ + .attributes = ZAP_ATTRIBUTE_INDEX(308), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2764,7 +2284,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Boolean State (server) */ \ .clusterId = 0x00000045, \ - .attributes = ZAP_ATTRIBUTE_INDEX(336), \ + .attributes = ZAP_ATTRIBUTE_INDEX(311), \ .attributeCount = 3, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2777,116 +2297,12 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Mode Select (server) */ \ .clusterId = 0x00000050, \ - .attributes = ZAP_ATTRIBUTE_INDEX(339), \ + .attributes = ZAP_ATTRIBUTE_INDEX(314), \ .attributeCount = 9, \ .clusterSize = 77, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayModeSelectServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 139 ), \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Laundry Washer Mode (server) */ \ - .clusterId = 0x00000051, \ - .attributes = ZAP_ATTRIBUTE_INDEX(348), \ - .attributeCount = 6, \ - .clusterSize = 6, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 141 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 143 ), \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Refrigerator And Temperature Controlled Cabinet Mode (server) */ \ - .clusterId = 0x00000052, \ - .attributes = ZAP_ATTRIBUTE_INDEX(354), \ - .attributeCount = 6, \ - .clusterSize = 6, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 145 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 147 ), \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: RVC Run Mode (server) */ \ - .clusterId = 0x00000054, \ - .attributes = ZAP_ATTRIBUTE_INDEX(360), \ - .attributeCount = 6, \ - .clusterSize = 6, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 149 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 151 ), \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: RVC Clean Mode (server) */ \ - .clusterId = 0x00000055, \ - .attributes = ZAP_ATTRIBUTE_INDEX(366), \ - .attributeCount = 6, \ - .clusterSize = 6, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 153 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 155 ), \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Temperature Control (server) */ \ - .clusterId = 0x00000056, \ - .attributes = ZAP_ATTRIBUTE_INDEX(372), \ - .attributeCount = 4, \ - .clusterSize = 7, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 157 ), \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Refrigerator Alarm (server) */ \ - .clusterId = 0x00000057, \ - .attributes = ZAP_ATTRIBUTE_INDEX(376), \ - .attributeCount = 5, \ - .clusterSize = 18, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ - .eventList = ZAP_GENERATED_EVENTS_INDEX( 23 ), \ - .eventCount = 1, \ - },\ - { \ - /* Endpoint: 1, Cluster: Dishwasher Mode (server) */ \ - .clusterId = 0x00000059, \ - .attributes = ZAP_ATTRIBUTE_INDEX(381), \ - .attributeCount = 6, \ - .clusterSize = 6, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 159 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 161 ), \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Air Quality (server) */ \ - .clusterId = 0x0000005B, \ - .attributes = ZAP_ATTRIBUTE_INDEX(387), \ - .attributeCount = 3, \ - .clusterSize = 7, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 125 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -2894,103 +2310,38 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Smoke CO Alarm (server) */ \ .clusterId = 0x0000005C, \ - .attributes = ZAP_ATTRIBUTE_INDEX(390), \ + .attributes = ZAP_ATTRIBUTE_INDEX(323), \ .attributeCount = 15, \ .clusterSize = 22, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 163 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 127 ), \ .generatedCommandList = nullptr, \ - .eventList = ZAP_GENERATED_EVENTS_INDEX( 24 ), \ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 17 ), \ .eventCount = 11, \ },\ - { \ - /* Endpoint: 1, Cluster: Dishwasher Alarm (server) */ \ - .clusterId = 0x0000005D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(405), \ - .attributeCount = 6, \ - .clusterSize = 22, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 165 ), \ - .generatedCommandList = nullptr, \ - .eventList = ZAP_GENERATED_EVENTS_INDEX( 35 ), \ - .eventCount = 1, \ - },\ - { \ - /* Endpoint: 1, Cluster: Operational State (server) */ \ - .clusterId = 0x00000060, \ - .attributes = ZAP_ATTRIBUTE_INDEX(411), \ - .attributeCount = 8, \ - .clusterSize = 6, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 168 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 173 ), \ - .eventList = ZAP_GENERATED_EVENTS_INDEX( 36 ), \ - .eventCount = 2, \ - },\ - { \ - /* Endpoint: 1, Cluster: RVC Operational State (server) */ \ - .clusterId = 0x00000061, \ - .attributes = ZAP_ATTRIBUTE_INDEX(419), \ - .attributeCount = 8, \ - .clusterSize = 6, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 175 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 178 ), \ - .eventList = ZAP_GENERATED_EVENTS_INDEX( 38 ), \ - .eventCount = 2, \ - },\ - { \ - /* Endpoint: 1, Cluster: HEPA Filter Monitoring (server) */ \ - .clusterId = 0x00000071, \ - .attributes = ZAP_ATTRIBUTE_INDEX(427), \ - .attributeCount = 8, \ - .clusterSize = 6, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 180 ), \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Activated Carbon Filter Monitoring (server) */ \ - .clusterId = 0x00000072, \ - .attributes = ZAP_ATTRIBUTE_INDEX(435), \ - .attributeCount = 8, \ - .clusterSize = 6, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 182 ), \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ { \ /* Endpoint: 1, Cluster: Door Lock (server) */ \ .clusterId = 0x00000101, \ - .attributes = ZAP_ATTRIBUTE_INDEX(443), \ + .attributes = ZAP_ATTRIBUTE_INDEX(338), \ .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( 184 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 200 ), \ - .eventList = ZAP_GENERATED_EVENTS_INDEX( 40 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 129 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 144 ), \ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 28 ), \ .eventCount = 4, \ },\ { \ /* Endpoint: 1, Cluster: Window Covering (server) */ \ .clusterId = 0x00000102, \ - .attributes = ZAP_ATTRIBUTE_INDEX(476), \ + .attributes = ZAP_ATTRIBUTE_INDEX(371), \ .attributeCount = 24, \ .clusterSize = 43, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayWindowCoveringServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 206 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 150 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -2998,12 +2349,12 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Barrier Control (server) */ \ .clusterId = 0x00000103, \ - .attributes = ZAP_ATTRIBUTE_INDEX(500), \ + .attributes = ZAP_ATTRIBUTE_INDEX(395), \ .attributeCount = 6, \ .clusterSize = 11, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayBarrierControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 214 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 158 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -3011,7 +2362,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \ .clusterId = 0x00000200, \ - .attributes = ZAP_ATTRIBUTE_INDEX(506), \ + .attributes = ZAP_ATTRIBUTE_INDEX(401), \ .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), \ @@ -3024,12 +2375,12 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Thermostat (server) */ \ .clusterId = 0x00000201, \ - .attributes = ZAP_ATTRIBUTE_INDEX(531), \ + .attributes = ZAP_ATTRIBUTE_INDEX(426), \ .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( 217 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 161 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -3037,12 +2388,12 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Fan Control (server) */ \ .clusterId = 0x00000202, \ - .attributes = ZAP_ATTRIBUTE_INDEX(547), \ - .attributeCount = 14, \ - .clusterSize = 18, \ + .attributes = ZAP_ATTRIBUTE_INDEX(442), \ + .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 = ZAP_GENERATED_COMMANDS_INDEX( 219 ), \ + .acceptedCommandList = nullptr, \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -3050,7 +2401,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ .clusterId = 0x00000204, \ - .attributes = ZAP_ATTRIBUTE_INDEX(561), \ + .attributes = ZAP_ATTRIBUTE_INDEX(455), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ @@ -3063,25 +2414,12 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Color Control (server) */ \ .clusterId = 0x00000300, \ - .attributes = ZAP_ATTRIBUTE_INDEX(566), \ + .attributes = ZAP_ATTRIBUTE_INDEX(460), \ .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( 221 ), \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Ballast Configuration (server) */ \ - .clusterId = 0x00000301, \ - .attributes = ZAP_ATTRIBUTE_INDEX(620), \ - .attributeCount = 16, \ - .clusterSize = 58, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 163 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -3089,7 +2427,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \ .clusterId = 0x00000400, \ - .attributes = ZAP_ATTRIBUTE_INDEX(636), \ + .attributes = ZAP_ATTRIBUTE_INDEX(514), \ .attributeCount = 7, \ .clusterSize = 15, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3102,7 +2440,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \ .clusterId = 0x00000402, \ - .attributes = ZAP_ATTRIBUTE_INDEX(643), \ + .attributes = ZAP_ATTRIBUTE_INDEX(521), \ .attributeCount = 6, \ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3115,7 +2453,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \ .clusterId = 0x00000403, \ - .attributes = ZAP_ATTRIBUTE_INDEX(649), \ + .attributes = ZAP_ATTRIBUTE_INDEX(527), \ .attributeCount = 5, \ .clusterSize = 12, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3128,7 +2466,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ .clusterId = 0x00000404, \ - .attributes = ZAP_ATTRIBUTE_INDEX(654), \ + .attributes = ZAP_ATTRIBUTE_INDEX(532), \ .attributeCount = 6, \ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3141,7 +2479,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \ .clusterId = 0x00000405, \ - .attributes = ZAP_ATTRIBUTE_INDEX(660), \ + .attributes = ZAP_ATTRIBUTE_INDEX(538), \ .attributeCount = 6, \ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3154,7 +2492,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ .clusterId = 0x00000406, \ - .attributes = ZAP_ATTRIBUTE_INDEX(666), \ + .attributes = ZAP_ATTRIBUTE_INDEX(544), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ @@ -3164,140 +2502,10 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ .eventList = nullptr, \ .eventCount = 0, \ },\ - { \ - /* Endpoint: 1, Cluster: Carbon Monoxide Concentration Measurement (server) */ \ - .clusterId = 0x0000040C, \ - .attributes = ZAP_ATTRIBUTE_INDEX(671), \ - .attributeCount = 13, \ - .clusterSize = 41, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Carbon Dioxide Concentration Measurement (server) */ \ - .clusterId = 0x0000040D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(684), \ - .attributeCount = 13, \ - .clusterSize = 41, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Nitrogen Dioxide Concentration Measurement (server) */ \ - .clusterId = 0x00000413, \ - .attributes = ZAP_ATTRIBUTE_INDEX(697), \ - .attributeCount = 13, \ - .clusterSize = 41, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Ozone Concentration Measurement (server) */ \ - .clusterId = 0x00000415, \ - .attributes = ZAP_ATTRIBUTE_INDEX(710), \ - .attributeCount = 13, \ - .clusterSize = 41, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: PM2.5 Concentration Measurement (server) */ \ - .clusterId = 0x0000042A, \ - .attributes = ZAP_ATTRIBUTE_INDEX(723), \ - .attributeCount = 13, \ - .clusterSize = 41, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Formaldehyde Concentration Measurement (server) */ \ - .clusterId = 0x0000042B, \ - .attributes = ZAP_ATTRIBUTE_INDEX(736), \ - .attributeCount = 13, \ - .clusterSize = 41, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: PM1 Concentration Measurement (server) */ \ - .clusterId = 0x0000042C, \ - .attributes = ZAP_ATTRIBUTE_INDEX(749), \ - .attributeCount = 13, \ - .clusterSize = 41, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: PM10 Concentration Measurement (server) */ \ - .clusterId = 0x0000042D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(762), \ - .attributeCount = 13, \ - .clusterSize = 41, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Total Volatile Organic Compounds Concentration Measurement (server) */ \ - .clusterId = 0x0000042E, \ - .attributes = ZAP_ATTRIBUTE_INDEX(775), \ - .attributeCount = 13, \ - .clusterSize = 41, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: Radon Concentration Measurement (server) */ \ - .clusterId = 0x0000042F, \ - .attributes = ZAP_ATTRIBUTE_INDEX(788), \ - .attributeCount = 13, \ - .clusterSize = 41, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ { \ /* Endpoint: 1, Cluster: Wake on LAN (server) */ \ .clusterId = 0x00000503, \ - .attributes = ZAP_ATTRIBUTE_INDEX(801), \ + .attributes = ZAP_ATTRIBUTE_INDEX(549), \ .attributeCount = 3, \ .clusterSize = 39, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3310,7 +2518,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Channel (server) */ \ .clusterId = 0x00000504, \ - .attributes = ZAP_ATTRIBUTE_INDEX(804), \ + .attributes = ZAP_ATTRIBUTE_INDEX(552), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3323,20 +2531,20 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Target Navigator (server) */ \ .clusterId = 0x00000505, \ - .attributes = ZAP_ATTRIBUTE_INDEX(807), \ + .attributes = ZAP_ATTRIBUTE_INDEX(555), \ .attributeCount = 4, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 241 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 243 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 183 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 185 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Media Playback (server) */ \ .clusterId = 0x00000506, \ - .attributes = ZAP_ATTRIBUTE_INDEX(811), \ + .attributes = ZAP_ATTRIBUTE_INDEX(559), \ .attributeCount = 8, \ .clusterSize = 43, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3349,12 +2557,12 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Media Input (server) */ \ .clusterId = 0x00000507, \ - .attributes = ZAP_ATTRIBUTE_INDEX(819), \ + .attributes = ZAP_ATTRIBUTE_INDEX(567), \ .attributeCount = 4, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 245 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 187 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -3362,12 +2570,12 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Low Power (server) */ \ .clusterId = 0x00000508, \ - .attributes = ZAP_ATTRIBUTE_INDEX(823), \ + .attributes = ZAP_ATTRIBUTE_INDEX(571), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 250 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 192 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -3375,20 +2583,20 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Keypad Input (server) */ \ .clusterId = 0x00000509, \ - .attributes = ZAP_ATTRIBUTE_INDEX(825), \ + .attributes = ZAP_ATTRIBUTE_INDEX(573), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 252 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 254 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 194 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 196 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Content Launcher (server) */ \ .clusterId = 0x0000050A, \ - .attributes = ZAP_ATTRIBUTE_INDEX(827), \ + .attributes = ZAP_ATTRIBUTE_INDEX(575), \ .attributeCount = 4, \ .clusterSize = 10, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3401,7 +2609,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Audio Output (server) */ \ .clusterId = 0x0000050B, \ - .attributes = ZAP_ATTRIBUTE_INDEX(831), \ + .attributes = ZAP_ATTRIBUTE_INDEX(579), \ .attributeCount = 4, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3414,7 +2622,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Application Launcher (server) */ \ .clusterId = 0x0000050C, \ - .attributes = ZAP_ATTRIBUTE_INDEX(835), \ + .attributes = ZAP_ATTRIBUTE_INDEX(583), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3427,7 +2635,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Application Basic (server) */ \ .clusterId = 0x0000050D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(838), \ + .attributes = ZAP_ATTRIBUTE_INDEX(586), \ .attributeCount = 9, \ .clusterSize = 110, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3440,7 +2648,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Account Login (server) */ \ .clusterId = 0x0000050E, \ - .attributes = ZAP_ATTRIBUTE_INDEX(847), \ + .attributes = ZAP_ATTRIBUTE_INDEX(595), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3453,7 +2661,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \ .clusterId = 0x00000B04, \ - .attributes = ZAP_ATTRIBUTE_INDEX(849), \ + .attributes = ZAP_ATTRIBUTE_INDEX(597), \ .attributeCount = 13, \ .clusterSize = 32, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3466,38 +2674,38 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 1, Cluster: Unit Testing (server) */ \ .clusterId = 0xFFF1FC05, \ - .attributes = ZAP_ATTRIBUTE_INDEX(862), \ + .attributes = ZAP_ATTRIBUTE_INDEX(610), \ .attributeCount = 83, \ .clusterSize = 2289, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 256 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 275 ), \ - .eventList = ZAP_GENERATED_EVENTS_INDEX( 44 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 198 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 217 ), \ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 32 ), \ .eventCount = 2, \ },\ { \ /* Endpoint: 2, Cluster: Groups (server) */ \ .clusterId = 0x00000004, \ - .attributes = ZAP_ATTRIBUTE_INDEX(945), \ + .attributes = ZAP_ATTRIBUTE_INDEX(693), \ .attributeCount = 3, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 285 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 292 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 227 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 234 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 2, Cluster: On/Off (server) */ \ .clusterId = 0x00000006, \ - .attributes = ZAP_ATTRIBUTE_INDEX(948), \ + .attributes = ZAP_ATTRIBUTE_INDEX(696), \ .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( 297 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 239 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -3505,7 +2713,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 2, Cluster: Descriptor (server) */ \ .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(955), \ + .attributes = ZAP_ATTRIBUTE_INDEX(703), \ .attributeCount = 6, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3518,7 +2726,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 2, Cluster: Power Source (server) */ \ .clusterId = 0x0000002F, \ - .attributes = ZAP_ATTRIBUTE_INDEX(961), \ + .attributes = ZAP_ATTRIBUTE_INDEX(709), \ .attributeCount = 9, \ .clusterSize = 72, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3531,7 +2739,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \ .clusterId = 0x00000406, \ - .attributes = ZAP_ATTRIBUTE_INDEX(970), \ + .attributes = ZAP_ATTRIBUTE_INDEX(718), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ @@ -3544,7 +2752,7 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 65534, Cluster: Descriptor (server) */ \ .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(975), \ + .attributes = ZAP_ATTRIBUTE_INDEX(723), \ .attributeCount = 6, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -3557,13 +2765,13 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ { \ /* Endpoint: 65534, Cluster: Network Commissioning (server) */ \ .clusterId = 0x00000031, \ - .attributes = ZAP_ATTRIBUTE_INDEX(981), \ + .attributes = ZAP_ATTRIBUTE_INDEX(729), \ .attributeCount = 10, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 301 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 308 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 243 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 250 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -3571,14 +2779,14 @@ const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\ // clang-format on -#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 104 +#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 78 // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES { \ - { ZAP_CLUSTER_INDEX(0), 29, 369 }, \ - { ZAP_CLUSTER_INDEX(29), 70, 4099 }, \ - { ZAP_CLUSTER_INDEX(99), 5, 105 }, \ - { ZAP_CLUSTER_INDEX(104), 2, 4 }, \ + { ZAP_CLUSTER_INDEX(0), 27, 355 }, \ + { ZAP_CLUSTER_INDEX(27), 45, 3512 }, \ + { ZAP_CLUSTER_INDEX(72), 5, 105 }, \ + { ZAP_CLUSTER_INDEX(77), 2, 4 }, \ } @@ -3590,10 +2798,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, "ATTRIBUTE_LARGEST larger than expected"); // Total size of singleton attributes -#define ATTRIBUTE_SINGLETONS_SIZE (36) +#define ATTRIBUTE_SINGLETONS_SIZE (37) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (4577) +#define ATTRIBUTE_MAX_SIZE (3976) // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (4) diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h index 9fd4f923c77116..6100f5dba4c5e4 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h @@ -24,7 +24,6 @@ #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (3) #define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -48,7 +47,6 @@ #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TIME_SYNCHRONIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -56,22 +54,8 @@ #define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_ICD_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_LAUNDRY_WASHER_MODE_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_RVC_RUN_MODE_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_RVC_CLEAN_MODE_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_REFRIGERATOR_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_DISHWASHER_MODE_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_AIR_QUALITY_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_SMOKE_CO_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_DISHWASHER_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OPERATIONAL_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OPERATIONAL_STATE_RVC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_HEPA_FILTER_MONITORING_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BARRIER_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -80,23 +64,12 @@ #define EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_BALLAST_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_PM2_5_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_PM1_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_PM10_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TVOC_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_RADON_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -145,11 +118,6 @@ #define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK) -// Use this macro to check if the client side of the On/Off cluster is included -#define ZCL_USING_ON_OFF_CLUSTER_CLIENT -#define EMBER_AF_PLUGIN_ON_OFF_CLIENT - - // Use this macro to check if the server side of the On/Off cluster is included #define ZCL_USING_ON_OFF_CLUSTER_SERVER #define EMBER_AF_PLUGIN_ON_OFF_SERVER @@ -291,12 +259,6 @@ #define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS -// Use this macro to check if the server side of the Time Synchronization cluster is included -#define ZCL_USING_TIME_SYNCHRONIZATION_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_TIME_SYNCHRONIZATION_SERVER -#define EMBER_AF_PLUGIN_TIME_SYNCHRONIZATION - - // Use this macro to check if the server side of the Switch cluster is included #define ZCL_USING_SWITCH_CLUSTER_SERVER #define EMBER_AF_PLUGIN_SWITCH_SERVER @@ -339,102 +301,18 @@ #define EMBER_AF_PLUGIN_BOOLEAN_STATE -// Use this macro to check if the server side of the ICD Management cluster is included -#define ZCL_USING_ICD_MANAGEMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ICD_MANAGEMENT_SERVER -#define EMBER_AF_PLUGIN_ICD_MANAGEMENT - - // Use this macro to check if the server side of the Mode Select cluster is included #define ZCL_USING_MODE_SELECT_CLUSTER_SERVER #define EMBER_AF_PLUGIN_MODE_SELECT_SERVER #define EMBER_AF_PLUGIN_MODE_SELECT -// Use this macro to check if the server side of the Laundry Washer Mode cluster is included -#define ZCL_USING_LAUNDRY_WASHER_MODE_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_LAUNDRY_WASHER_MODE_SERVER -#define EMBER_AF_PLUGIN_LAUNDRY_WASHER_MODE - - -// Use this macro to check if the server side of the Refrigerator And Temperature Controlled Cabinet Mode cluster is included -#define ZCL_USING_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SERVER -#define EMBER_AF_PLUGIN_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE - - -// Use this macro to check if the server side of the RVC Run Mode cluster is included -#define ZCL_USING_RVC_RUN_MODE_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_RVC_RUN_MODE_SERVER -#define EMBER_AF_PLUGIN_RVC_RUN_MODE - - -// Use this macro to check if the server side of the RVC Clean Mode cluster is included -#define ZCL_USING_RVC_CLEAN_MODE_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_RVC_CLEAN_MODE_SERVER -#define EMBER_AF_PLUGIN_RVC_CLEAN_MODE - - -// Use this macro to check if the server side of the Temperature Control cluster is included -#define ZCL_USING_TEMPERATURE_CONTROL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_TEMPERATURE_CONTROL_SERVER -#define EMBER_AF_PLUGIN_TEMPERATURE_CONTROL - - -// Use this macro to check if the server side of the Refrigerator Alarm cluster is included -#define ZCL_USING_REFRIGERATOR_ALARM_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_REFRIGERATOR_ALARM_SERVER -#define EMBER_AF_PLUGIN_REFRIGERATOR_ALARM - - -// Use this macro to check if the server side of the Dishwasher Mode cluster is included -#define ZCL_USING_DISHWASHER_MODE_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_DISHWASHER_MODE_SERVER -#define EMBER_AF_PLUGIN_DISHWASHER_MODE - - -// Use this macro to check if the server side of the Air Quality cluster is included -#define ZCL_USING_AIR_QUALITY_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_AIR_QUALITY_SERVER -#define EMBER_AF_PLUGIN_AIR_QUALITY - - // Use this macro to check if the server side of the Smoke CO Alarm cluster is included #define ZCL_USING_SMOKE_CO_ALARM_CLUSTER_SERVER #define EMBER_AF_PLUGIN_SMOKE_CO_ALARM_SERVER #define EMBER_AF_PLUGIN_SMOKE_CO_ALARM -// Use this macro to check if the server side of the Dishwasher Alarm cluster is included -#define ZCL_USING_DISHWASHER_ALARM_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_DISHWASHER_ALARM_SERVER -#define EMBER_AF_PLUGIN_DISHWASHER_ALARM - - -// Use this macro to check if the server side of the Operational State cluster is included -#define ZCL_USING_OPERATIONAL_STATE_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_OPERATIONAL_STATE_SERVER -#define EMBER_AF_PLUGIN_OPERATIONAL_STATE - - -// Use this macro to check if the server side of the RVC Operational State cluster is included -#define ZCL_USING_OPERATIONAL_STATE_RVC_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_RVC_OPERATIONAL_STATE_SERVER -#define EMBER_AF_PLUGIN_RVC_OPERATIONAL_STATE - - -// Use this macro to check if the server side of the HEPA Filter Monitoring cluster is included -#define ZCL_USING_HEPA_FILTER_MONITORING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_HEPA_FILTER_MONITORING_SERVER -#define EMBER_AF_PLUGIN_HEPA_FILTER_MONITORING - - -// Use this macro to check if the server side of the Activated Carbon Filter Monitoring cluster is included -#define ZCL_USING_ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ACTIVATED_CARBON_FILTER_MONITORING_SERVER -#define EMBER_AF_PLUGIN_ACTIVATED_CARBON_FILTER_MONITORING - - // Use this macro to check if the server side of the Door Lock cluster is included #define ZCL_USING_DOOR_LOCK_CLUSTER_SERVER #define EMBER_AF_PLUGIN_DOOR_LOCK_SERVER @@ -487,12 +365,6 @@ #define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV -// Use this macro to check if the server side of the Ballast Configuration cluster is included -#define ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_BALLAST_CONFIGURATION_SERVER -#define EMBER_AF_PLUGIN_BALLAST_CONFIGURATION - - // Use this macro to check if the server side of the Illuminance Measurement cluster is included #define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER #define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_SERVER @@ -529,66 +401,6 @@ #define EMBER_AF_PLUGIN_OCCUPANCY_SENSING -// Use this macro to check if the server side of the Carbon Monoxide Concentration Measurement cluster is included -#define ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT - - -// Use this macro to check if the server side of the Carbon Dioxide Concentration Measurement cluster is included -#define ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT - - -// Use this macro to check if the server side of the Nitrogen Dioxide Concentration Measurement cluster is included -#define ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT - - -// Use this macro to check if the server side of the Ozone Concentration Measurement cluster is included -#define ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT - - -// Use this macro to check if the server side of the PM2.5 Concentration Measurement cluster is included -#define ZCL_USING_PM2_5_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT - - -// Use this macro to check if the server side of the Formaldehyde Concentration Measurement cluster is included -#define ZCL_USING_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT - - -// Use this macro to check if the server side of the PM1 Concentration Measurement cluster is included -#define ZCL_USING_PM1_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_PM1_CONCENTRATION_MEASUREMENT - - -// Use this macro to check if the server side of the PM10 Concentration Measurement cluster is included -#define ZCL_USING_PM10_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_PM10_CONCENTRATION_MEASUREMENT - - -// Use this macro to check if the server side of the Total Volatile Organic Compounds Concentration Measurement cluster is included -#define ZCL_USING_TVOC_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT - - -// Use this macro to check if the server side of the Radon Concentration Measurement cluster is included -#define ZCL_USING_RADON_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_RADON_CONCENTRATION_MEASUREMENT - - // Use this macro to check if the server side of the Wake on LAN cluster is included #define ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER #define EMBER_AF_PLUGIN_WAKE_ON_LAN_SERVER