From 1266f1cb3e5f668e2e14d86e1e362d67b6511209 Mon Sep 17 00:00:00 2001 From: "Ethan.Z" Date: Thu, 24 Oct 2024 13:02:12 -0400 Subject: [PATCH 1/2] Revert "Revert "Generate Conformance Data with Alchemy (#36186)" (#36220)" This reverts commit a4a911c70bc3258077ce8a584ff55856d3e21dc5. --- .../chip/access-control-cluster.xml | 50 +- .../data-model/chip/account-login-cluster.xml | 11 +- .../zcl/data-model/chip/actions-cluster.xml | 33 +- .../administrator-commissioning-cluster.xml | 22 +- .../data-model/chip/air-quality-cluster.xml | 5 +- .../chip/application-basic-cluster.xml | 42 +- .../chip/application-launcher-cluster.xml | 18 +- .../data-model/chip/audio-output-cluster.xml | 16 +- .../chip/ballast-configuration-cluster.xml | 80 +- .../chip/basic-information-cluster.xml | 110 +- .../zcl/data-model/chip/binding-cluster.xml | 7 +- .../data-model/chip/boolean-state-cluster.xml | 8 +- .../boolean-state-configuration-cluster.xml | 81 +- .../zcl/data-model/chip/channel-cluster.xml | 53 +- .../data-model/chip/color-control-cluster.xml | 455 ++++- .../chip/commissioner-control-cluster.xml | 5 + .../concentration-measurement-cluster.xml | 1184 +++++++++---- .../chip/content-app-observer-cluster.xml | 2 + .../chip/content-control-cluster.xml | 86 +- .../chip/content-launch-cluster.xml | 30 +- .../data-model/chip/descriptor-cluster.xml | 29 +- .../chip/device-energy-management-cluster.xml | 95 +- .../device-energy-management-mode-cluster.xml | 12 +- .../chip/diagnostic-logs-cluster.xml | 86 +- .../chip/dishwasher-alarm-cluster.xml | 45 +- .../chip/dishwasher-mode-cluster.xml | 14 +- .../zcl/data-model/chip/door-lock-cluster.xml | 1514 ++++++++++------- .../zcl/data-model/chip/drlc-cluster.xml | 39 +- .../electrical-energy-measurement-cluster.xml | 58 +- .../electrical-power-measurement-cluster.xml | 122 +- .../data-model/chip/energy-evse-cluster.xml | 151 +- .../chip/energy-evse-mode-cluster.xml | 12 +- .../chip/energy-preference-cluster.xml | 35 +- .../ethernet-network-diagnostics-cluster.xml | 73 +- .../data-model/chip/fixed-label-cluster.xml | 5 +- .../chip/flow-measurement-cluster.xml | 20 +- .../chip/general-commissioning-cluster.xml | 71 +- .../chip/general-diagnostics-cluster.xml | 60 +- .../chip/group-key-mgmt-cluster.xml | 26 +- .../zcl/data-model/chip/groups-cluster.xml | 17 +- .../chip/icd-management-cluster.xml | 260 +-- .../zcl/data-model/chip/identify-cluster.xml | 16 +- .../chip/illuminance-measurement-cluster.xml | 41 +- .../data-model/chip/keypad-input-cluster.xml | 2 + .../chip/laundry-dryer-controls-cluster.xml | 16 +- .../chip/laundry-washer-mode-cluster.xml | 14 +- .../data-model/chip/level-control-cluster.xml | 95 +- .../localization-configuration-cluster.xml | 6 +- .../zcl/data-model/chip/low-power-cluster.xml | 1 + .../data-model/chip/media-input-cluster.xml | 16 +- .../chip/media-playback-cluster.xml | 103 +- .../zcl/data-model/chip/messages-cluster.xml | 17 +- .../chip/microwave-oven-control-cluster.xml | 73 +- .../chip/microwave-oven-mode-cluster.xml | 10 +- .../data-model/chip/mode-select-cluster.xml | 34 +- .../chip/network-commissioning-cluster.xml | 261 ++- .../chip/occupancy-sensing-cluster.xml | 228 ++- .../zcl/data-model/chip/onoff-cluster.xml | 53 +- .../chip/operational-credentials-cluster.xml | 40 +- .../chip/operational-state-cluster.xml | 71 +- .../chip/operational-state-oven-cluster.xml | 53 +- .../chip/operational-state-rvc-cluster.xml | 74 +- .../zcl/data-model/chip/oven-mode-cluster.xml | 14 +- .../data-model/chip/power-source-cluster.xml | 234 ++- .../power-source-configuration-cluster.xml | 5 +- .../chip/power-topology-cluster.xml | 14 +- .../chip/pressure-measurement-cluster.xml | 57 +- ...pump-configuration-and-control-cluster.xml | 188 +- .../data-model/chip/refrigerator-alarm.xml | 28 +- ...rature-controlled-cabinet-mode-cluster.xml | 14 +- .../relative-humidity-measurement-cluster.xml | 20 +- .../chip/resource-monitoring-cluster.xml | 78 +- .../chip/rvc-clean-mode-cluster.xml | 12 +- .../data-model/chip/rvc-run-mode-cluster.xml | 12 +- .../zcl/data-model/chip/scene.xml | 34 +- .../data-model/chip/service-area-cluster.xml | 42 +- .../chip/smoke-co-alarm-cluster.xml | 91 +- .../chip/software-diagnostics-cluster.xml | 28 +- .../zcl/data-model/chip/switch-cluster.xml | 45 +- .../chip/target-navigator-cluster.xml | 15 +- .../chip/temperature-control-cluster.xml | 49 +- .../chip/temperature-measurement-cluster.xml | 20 +- .../data-model/chip/thermostat-cluster.xml | 310 +++- ...t-user-interface-configuration-cluster.xml | 11 +- ...hread-border-router-management-cluster.xml | 51 +- .../thread-network-diagnostics-cluster.xml | 408 ++++- .../chip/thread-network-directory-cluster.xml | 109 +- .../chip/time-format-localization-cluster.xml | 21 +- .../chip/time-synchronization-cluster.xml | 118 +- .../chip/unit-localization-cluster.xml | 7 +- .../data-model/chip/user-label-cluster.xml | 1 + ...alve-configuration-and-control-cluster.xml | 71 +- .../data-model/chip/wake-on-lan-cluster.xml | 12 +- .../chip/washer-controls-cluster.xml | 30 +- .../chip/water-heater-management-cluster.xml | 40 +- .../chip/water-heater-mode-cluster.xml | 12 +- .../chip/wifi-network-diagnostics-cluster.xml | 87 +- .../chip/wifi-network-management-cluster.xml | 8 +- .../zcl/data-model/chip/window-covering.xml | 230 ++- 99 files changed, 6759 insertions(+), 2033 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml index edf1b65e941ad0..831cc5b49361b0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml @@ -113,29 +113,58 @@ limitations under the License. ACL + Extension + + + - SubjectsPerAccessControlEntry - TargetsPerAccessControlEntry - AccessControlEntriesPerFabric - CommissioningARL - ARL - + + SubjectsPerAccessControlEntry + + + + TargetsPerAccessControlEntry + + + + AccessControlEntriesPerFabric + + + + CommissioningARL + + + + + + ARL + + + + + This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. - + + + + Returns the review token for the request, which can be used to correlate with a FabricRestrictionReviewUpdate event. + + + @@ -145,6 +174,7 @@ limitations under the License. + @@ -154,6 +184,9 @@ limitations under the License. + + + @@ -162,6 +195,9 @@ limitations under the License. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml index baf74dc3c2e1da..38fcbcaaf9c5e4 100644 --- a/src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml @@ -28,31 +28,36 @@ limitations under the License. Upon receipt, the Content App checks if the account associated with the client Temp Account Identifier Rotating ID is the same acount that is active on the given Content App. If the accounts are the same, then the Content App includes the Setup PIN in the GetSetupPIN Response. - + + Upon receipt, the Content App checks if the account associated with the client’s Temp Account Identifier (Rotating ID) has a current active Setup PIN with the given value. If the Setup PIN is valid for the user account associated with the Temp Account Identifier, then the Content App MAY make that user account active. - + - + + The purpose of this command is to instruct the Content App to clear the current user account. This command SHOULD be used by clients of a Content App to indicate the end of a user session. + This message is sent in response to the GetSetupPIN Request, and contains the Setup PIN code, or null when the accounts identified in the request does not match the active account of the running Content App. + This event can be used by the Content App to indicate that the current user has logged out. In response to this event, the Fabric Admin SHALL remove access to this Content App by the specified Node. If no Node is provided, then the Fabric Admin SHALL remove access to all non-Admin Nodes. + diff --git a/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml index acf28b88e46414..bed60efdf50c65 100644 --- a/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml @@ -89,11 +89,20 @@ limitations under the License. 0x0025 ACTIONS_CLUSTER This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. - - ActionList - EndpointLists - SetupURL - + + + ActionList + + + + EndpointLists + + + + SetupURL + + + This command triggers an action (state change) on the involved endpoints. @@ -173,17 +182,19 @@ limitations under the License. This event SHALL be generated when there is a change in the Status of an ActionID. - - + + + This event SHALL be generated when there is some error which prevents the action from its normal planned execution. - - - - + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml index 3532c89b931880..55a8310f0fa7ac 100644 --- a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml @@ -43,10 +43,19 @@ limitations under the License. - WindowStatus - AdminFabricIndex - AdminVendorId - + + WindowStatus + + + + AdminFabricIndex + + + + AdminVendorId + + + This command is used by a current Administrator to instruct a Node to go into commissioning mode using enhanced commissioning method. @@ -55,17 +64,22 @@ limitations under the License. + This command is used by a current Administrator to instruct a Node to go into commissioning mode using basic commissioning method, if the node supports it. + + + This command is used by a current Administrator to instruct a Node to revoke any active Open Commissioning Window or Open Basic Commissioning Window command. + diff --git a/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml index bbc57510e85dce..6b91830856441c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml @@ -41,7 +41,10 @@ limitations under the License. - AirQuality + + AirQuality + + diff --git a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml index e6331f698fd423..ea6be51e9bcb28 100644 --- a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml @@ -24,16 +24,38 @@ limitations under the License. true true This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. - VendorName - VendorID - ApplicationName - ProductID - Application - Status - ApplicationVersion - - AllowedVendorList - + + VendorName + + + + VendorID + + + + ApplicationName + + + + ProductID + + + + Application + + + + Status + + + + ApplicationVersion + + + + AllowedVendorList + + diff --git a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml index 50b715e138a744..34eb73fde5b351 100644 --- a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml @@ -31,29 +31,41 @@ limitations under the License. - CatalogList - CurrentApp - + + CatalogList + + + + + + CurrentApp + + + Upon receipt, this SHALL launch the specified app with optional data. The TV Device SHALL launch and bring to foreground the identified application in the command if the application is not already launched and in foreground. The TV Device SHALL update state attribute on the Application Basic cluster of the Endpoint corresponding to the launched application. This command returns a Launch Response. + Upon receipt on a Video Player endpoint this SHALL stop the specified application if it is running. + Upon receipt on a Video Player endpoint this SHALL hide the specified application if it is running and visible. + This command SHALL be generated in response to LaunchApp commands. + diff --git a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml index acaa9deadb6a3b..0de5d0e3301de5 100644 --- a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml @@ -31,12 +31,19 @@ limitations under the License. - OutputList - CurrentOutput - + + OutputList + + + + CurrentOutput + + + Upon receipt, this SHALL change the output on the media device to the output at a specific index in the Output List. + @@ -44,6 +51,9 @@ limitations under the License. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml index 32450208914a6d..29ec1cd38108f3 100644 --- a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml @@ -41,53 +41,75 @@ limitations under the License. - PhysicalMinLevel - PhysicalMaxLevel - BallastStatus + + PhysicalMinLevel + + + + PhysicalMaxLevel + + + + BallastStatus + + - - MinLevel - + + MinLevel + + - - MaxLevel - + + MaxLevel + + - IntrinsicBallastFactor - + IntrinsicBallastFactor + + - - BallastFactorAdjustment - + + BallastFactorAdjustment + + - LampQuantity + + LampQuantity + + - LampType - + LampType + + - LampManufacturer - + LampManufacturer + + - - LampRatedHours - + + LampRatedHours + + - LampBurnHours - + LampBurnHours + + - LampAlarmMode - + LampAlarmMode + + - - LampBurnHoursTripPoint - + + LampBurnHoursTripPoint + + diff --git a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml index 7f6320a5880dc9..288c82f950b8ab 100644 --- a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml @@ -74,52 +74,118 @@ limitations under the License. which apply to the whole Node. Also allows setting user device information such as location. - DataModelRevision - VendorName - VendorID - ProductName - ProductID - + + DataModelRevision + + + + VendorName + + + + VendorID + + + + ProductName + + + + ProductID + + + NodeLabel + Location + + + + HardwareVersion + + + + HardwareVersionString + + + + SoftwareVersion + + + + SoftwareVersionString + + + + ManufacturingDate + - HardwareVersion - HardwareVersionString - SoftwareVersion - SoftwareVersionString - ManufacturingDate - PartNumber - ProductURL - ProductLabel - SerialNumber - + + PartNumber + + + + ProductURL + + + + ProductLabel + + + + SerialNumber + + + LocalConfigDisabled + + + + Reachable + + + + UniqueID + + + + CapabilityMinima + + + + ProductAppearance + + + + SpecificationVersion + + + + MaxPathsPerInvoke + - Reachable - UniqueID - CapabilityMinima - ProductAppearance - SpecificationVersion - MaxPathsPerInvoke The StartUp event SHALL be emitted by a Node as soon as reasonable after completing a boot or reboot process. + The ShutDown event SHOULD be emitted by a Node prior to any orderly shutdown sequence on a best-effort basis. + The Leave event SHOULD be emitted by a Node prior to permanently leaving the Fabric. + This event (when supported) SHALL be generated when there is a change in the Reachable attribute. diff --git a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml index 741a5a9372edc0..0b1cbd0c560091 100644 --- a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml @@ -31,9 +31,10 @@ limitations under the License. 0x001e BINDING_CLUSTER The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. - - Binding - + + Binding + + diff --git a/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml index 0dee692affacee..30a16e16bcc0b0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml @@ -26,11 +26,15 @@ limitations under the License. true true - StateValue - + + StateValue + + + This event SHALL be generated when the StateValue attribute changes. + diff --git a/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml index 4fb33dd9749a0e..85705e6a03050e 100644 --- a/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml @@ -58,34 +58,97 @@ limitations under the License. - CurrentSensitivityLevel - SupportedSensitivityLevels - DefaultSensitivityLevel - AlarmsActive - AlarmsSuppressed - AlarmsEnabled - AlarmsSupported - SensorFault - + + CurrentSensitivityLevel + + + + + + SupportedSensitivityLevels + + + + + + DefaultSensitivityLevel + + + + + + AlarmsActive + + + + + + + + + AlarmsSuppressed + + + + + + AlarmsEnabled + + + + + + + + + AlarmsSupported + + + + + + + + + SensorFault + + + This command is used to suppress the specified alarm mode. + + + This command is used to enable or disable the specified alarm mode. + + + + + + This event SHALL be generated when any bits in the AlarmsActive and/or AlarmsSuppressed attributes change. + + + + + + This event SHALL be generated when the device registers or clears a fault. + diff --git a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml index 25ec7b7062f97a..c3a08ab084359b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml @@ -41,30 +41,57 @@ limitations under the License. - ChannelList - Lineup - CurrentChannel - + + ChannelList + + + + + + Lineup + + + + + + CurrentChannel + + + Change the channel on the media player to the channel case-insensitive exact matching the value passed as an argument. + + + + + + Change the channel on the media plaeyer to the channel with the given Number in the ChannelList attribute. + This command provides channel up and channel down functionality, but allows channel index jumps of size Count. When the value of the increase or decrease is larger than the number of channels remaining in the given direction, then the behavior SHALL be to return to the beginning (or end) of the channel list and continue. For example, if the current channel is at index 0 and count value of -1 is given, then the current channel should change to the last channel. + Upon receipt, this SHALL display the active status of the input list on screen. + + + + + + @@ -76,12 +103,18 @@ limitations under the License. + + + This command is a response to the GetProgramGuide command. + + + @@ -90,6 +123,12 @@ limitations under the License. + + + + + + @@ -98,6 +137,12 @@ limitations under the License. + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml index 3623ce1ccf925c..a479da36375e4f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml @@ -127,135 +127,401 @@ limitations under the License. - CurrentHue + + CurrentHue + + + + - CurrentSaturation + + CurrentSaturation + + + + - RemainingTime + + RemainingTime + + - CurrentX + + CurrentX + + + + - CurrentY + + CurrentY + + + + - DriftCompensation + + DriftCompensation + + - CompensationText + + CompensationText + + - ColorTemperatureMireds + + ColorTemperatureMireds + + + + - ColorMode + + ColorMode + + - Options + + Options + + - NumberOfPrimaries + + NumberOfPrimaries + + - Primary1X + + Primary1X + + + + + + + + + + - Primary1Y + + Primary1Y + + + + + + + + + + - Primary1Intensity + + Primary1Intensity + + + + + + + + + + - Primary2X + + Primary2X + + + + + + + + + + - Primary2Y + + Primary2Y + + + + + + + + + + - Primary2Intensity + + Primary2Intensity + + + + + + + + + + - Primary3X + + Primary3X + + + + + + + + + + - Primary3Y + + Primary3Y + + + + + + + + + + - Primary3Intensity + + Primary3Intensity + + + + + + + + + + - Primary4X + + Primary4X + + + + + + + + + + - Primary4Y + + Primary4Y + + + + + + + + + + - Primary4Intensity + + Primary4Intensity + + + + + + + + + + - Primary5X + + Primary5X + + + + + + + + + + - Primary5Y + + Primary5Y + + + + + + + + + + - Primary5Intensity + + Primary5Intensity + + + + + + + + + + - Primary6X + + Primary6X + + + + + + + + + + - Primary6Y + + Primary6Y + + + + + + + + + + - Primary6Intensity + + Primary6Intensity + + + + + + + + + + WhitePointX + WhitePointY + ColorPointRX + ColorPointRY + ColorPointRIntensity + ColorPointGX + ColorPointGY + ColorPointGIntensity + ColorPointBX + ColorPointBY + ColorPointBIntensity + - CoupleColorTempToLevelMinMireds - + + CoupleColorTempToLevelMinMireds + + + + + + + + StartUpColorTemperatureMireds + + + + + + @@ -267,6 +533,9 @@ limitations under the License. + + + @@ -277,6 +546,9 @@ limitations under the License. + + + @@ -288,6 +560,9 @@ limitations under the License. + + + @@ -298,6 +573,9 @@ limitations under the License. + + + @@ -308,6 +586,9 @@ limitations under the License. + + + @@ -319,6 +600,9 @@ limitations under the License. + + + @@ -330,6 +614,9 @@ limitations under the License. + + + @@ -341,6 +628,9 @@ limitations under the License. + + + @@ -351,6 +641,9 @@ limitations under the License. + + + @@ -362,6 +655,9 @@ limitations under the License. + + + @@ -372,20 +668,69 @@ limitations under the License. + + + - EnhancedCurrentHue - EnhancedColorMode - ColorLoopActive - ColorLoopDirection - ColorLoopTime - ColorLoopStartEnhancedHue - ColorLoopStoredEnhancedHue - ColorCapabilities - ColorTempPhysicalMinMireds - ColorTempPhysicalMaxMireds + + EnhancedCurrentHue + + + + + + EnhancedColorMode + + + + ColorLoopActive + + + + + + ColorLoopDirection + + + + + + ColorLoopTime + + + + + + ColorLoopStartEnhancedHue + + + + + + ColorLoopStoredEnhancedHue + + + + + + ColorCapabilities + + + + ColorTempPhysicalMinMireds + + + + + + ColorTempPhysicalMaxMireds + + + + @@ -396,6 +741,9 @@ limitations under the License. + + + @@ -406,6 +754,9 @@ limitations under the License. + + + @@ -417,6 +768,9 @@ limitations under the License. + + + @@ -428,6 +782,9 @@ limitations under the License. + + + @@ -441,6 +798,9 @@ limitations under the License. + + + @@ -449,6 +809,13 @@ limitations under the License. + + + + + + + @@ -461,6 +828,9 @@ limitations under the License. + + + @@ -474,6 +844,9 @@ limitations under the License. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml index dcfb1dfa7096b8..33f26e3689e5f4 100644 --- a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml @@ -35,6 +35,7 @@ limitations under the License. SupportedDeviceCategories + @@ -44,6 +45,7 @@ limitations under the License. + @@ -51,6 +53,7 @@ limitations under the License. + @@ -60,6 +63,7 @@ limitations under the License. + @@ -68,6 +72,7 @@ limitations under the License. + diff --git a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml index 4d03c539103970..e2116fc03cc80c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml @@ -58,17 +58,70 @@ limitations under the License. - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -113,17 +166,70 @@ limitations under the License. - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -139,45 +245,98 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -193,45 +352,98 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -247,45 +459,98 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -301,45 +566,98 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -355,45 +673,98 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -409,45 +780,98 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -463,45 +887,98 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -517,45 +994,98 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/content-app-observer-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-app-observer-cluster.xml index 6e241c7b5c3cd0..0f5a99b6ba9266 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-app-observer-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-app-observer-cluster.xml @@ -29,6 +29,7 @@ limitations under the License. Upon receipt, the data field MAY be parsed and interpreted. Message encoding is specific to the Content App. A Content App MAY when possible read attributes from the Basic Information Cluster on the Observer and use this to determine the Message encoding. + @@ -36,6 +37,7 @@ limitations under the License. + diff --git a/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml index 06468c114c42dc..e42967b581fac6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml @@ -43,69 +43,139 @@ limitations under the License. - Enabled - OnDemandRatings - OnDemandRatingThreshold - ScheduledContentRatings - ScheduledContentRatingThreshold - ScreenDailyTime - RemainingScreenTime - BlockUnrated + + Enabled + + + + OnDemandRatings + + + + + + OnDemandRatingThreshold + + + + + + ScheduledContentRatings + + + + + + ScheduledContentRatingThreshold + + + + + + ScreenDailyTime + + + + + + RemainingScreenTime + + + + + + BlockUnrated + + + + The purpose of this command is to update the PIN used for protecting configuration of the content control settings. Upon success, the old PIN SHALL no longer work. The PIN is used to ensure that only the Node (or User) with the PIN code can make changes to the Content Control settings, for example, turn off Content Controls or modify the ScreenDailyTime. The PIN is composed of a numeric string of up to 6 human readable characters (displayable) . Upon receipt of this command, the media device SHALL check if the OldPIN field of this command is the same as the current PIN. If the PINs are the same, then the PIN code SHALL be set to NewPIN. Otherwise a response with InvalidPINCode error status SHALL be returned. The media device MAY provide a default PIN to the User via an out of band mechanism. For security reasons, it is recommended that a client encourage the user to update the PIN from its default value when performing configuration of the Content Control settings exposed by this cluster. The ResetPIN command can also be used to obtain the default PIN. + + + The purpose of this command is to reset the PIN. If this command is executed successfully, a ResetPINResponse command with a new PIN SHALL be returned. + + + This command SHALL be generated in response to a ResetPIN command. The data for this command SHALL be as follows: + + + The purpose of this command is to turn on the Content Control feature on a media device. On receipt of the Enable command, the media device SHALL set the Enabled attribute to TRUE. + The purpose of this command is to turn off the Content Control feature on a media device. On receipt of the Disable command, the media device SHALL set the Enabled attribute to FALSE. + The purpose of this command is to add the extra screen time for the user. If a client with Operate privilege invokes this command, the media device SHALL check whether the PINCode passed in the command matches the current PINCode value. If these match, then the RemainingScreenTime attribute SHALL be increased by the specified BonusTime value. If the PINs do not match, then a response with InvalidPINCode error status SHALL be returned, and no changes SHALL be made to RemainingScreenTime. If a client with Manage privilege or greater invokes this command, the media device SHALL ignore the PINCode field and directly increase the RemainingScreenTime attribute by the specified BonusTime value. A server that does not support the PM feature SHALL respond with InvalidPINCode to clients that only have Operate privilege unless: It has been provided with the PIN value to expect via an out of band mechanism, and The client has provided a PINCode that matches the expected PIN value. + + + The purpose of this command is to set the ScreenDailyTime attribute. On receipt of the SetScreenDailyTime command, the media device SHALL set the ScreenDailyTime attribute to the ScreenTime value. + + + The purpose of this command is to specify whether programs with no Content rating must be blocked by this media device. On receipt of the BlockUnratedContent command, the media device SHALL set the BlockUnrated attribute to TRUE. + + + The purpose of this command is to specify whether programs with no Content rating must be blocked by this media device. On receipt of the UnblockUnratedContent command, the media device SHALL set the BlockUnrated attribute to FALSE. + + + The purpose of this command is to set the OnDemandRatingThreshold attribute. On receipt of the SetOnDemandRatingThreshold command, the media device SHALL check if the Rating field is one of values present in the OnDemandRatings attribute. If not, then a response with InvalidRating error status SHALL be returned. + + + The purpose of this command is to set ScheduledContentRatingThreshold attribute. On receipt of the SetScheduledContentRatingThreshold command, the media device SHALL check if the Rating field is one of values present in the ScheduledContentRatings attribute. If not, then a response with InvalidRating error status SHALL be returned. + + + This event SHALL be generated when the RemainingScreenTime equals 0. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml index 7058f969799087..31ad15a48b93ac 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml @@ -25,10 +25,20 @@ limitations under the License. true This cluster provides an interface for launching content on a media player device such as a TV or Speaker. - - AcceptHeader - SupportedStreamingProtocols - + + + AcceptHeader + + + + + + SupportedStreamingProtocols + + + + + Upon receipt, this SHALL launch the specified content with optional search criteria. @@ -36,6 +46,9 @@ limitations under the License. + + + @@ -43,12 +56,21 @@ limitations under the License. + + + This command SHALL be generated in response to LaunchContent command. + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml index d63dbeb05ca11a..f34d705a2486da 100644 --- a/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml @@ -44,11 +44,28 @@ limitations under the License. - - DeviceTypeList - ServerList - ClientList - PartsList - TagList + + + DeviceTypeList + + + + ServerList + + + + ClientList + + + + PartsList + + + + TagList + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml index 3550dd0301be99..250e3546ea8805 100644 --- a/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml @@ -74,41 +74,95 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - ESAType - ESACanGenerate - ESAState - AbsMinPower - AbsMaxPower + + ESAType + + + + ESACanGenerate + + + + ESAState + + + + AbsMinPower + + + + AbsMaxPower + + - PowerAdjustmentCapability + + PowerAdjustmentCapability + + + + - Forecast - OptOutState + + Forecast + + + + + + + + + OptOutState + + + + + + + + + + Allows a client to request an adjustment in the power consumption of an ESA for a specified duration. + + + Allows a client to cancel an ongoing PowerAdjustmentRequest operation. + + + Allows a client to adjust the start time of a Forecast sequence that has not yet started operation (i.e. where the current Forecast StartTime is in the future). + + + Allows a client to temporarily pause an operation and reduce the ESAs energy demand. + + + Allows a client to cancel the PauseRequest command and enable earlier resumption of operation. + + + @@ -116,20 +170,36 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 + + + Allows a client to ask the ESA to recompute its Forecast based on power and time constraints. + + + Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command. + + + + + + + This event SHALL be generated when the Power Adjustment session is started. + + + @@ -137,15 +207,24 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 + + + This event SHALL be generated when the ESA enters the Paused state. + + + This event SHALL be generated when the ESA leaves the Paused state and resumes operation. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml index c3440adebef3f6..470040b5c4f476 100644 --- a/src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml @@ -59,18 +59,26 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - SupportedModes - CurrentMode + + SupportedModes + + + + CurrentMode + + This command is used to change device modes. + This command is sent by the device on receipt of the ChangeToMode command. + diff --git a/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml index 27162f66e5e6db..4140fd18a0eaec 100644 --- a/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml @@ -15,46 +15,48 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - Diagnostic Logs - CHIP - The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. - 0x0032 - DIAGNOSTIC_LOGS_CLUSTER - true - true - - Retrieving diagnostic logs from a Node - - - - - - Response to the RetrieveLogsRequest - - - - - - + + + + + + + + + + + + + + + + + + + + + + Diagnostic Logs + CHIP + The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. + 0x0032 + DIAGNOSTIC_LOGS_CLUSTER + true + true + + Retrieving diagnostic logs from a Node + + + + + + + Response to the RetrieveLogsRequest + + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml index 7e41a7a1c03f99..a8cf1e166219e2 100644 --- a/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml @@ -43,27 +43,46 @@ limitations under the License. - Mask - Latch - State - Supported + + Mask + + + + Latch + + + + + + State + + + + Supported + + - Reset alarm - + Reset alarm + + + + - Modify enabled alarms - + Modify enabled alarms + + - Notify - - - - + Notify + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml index 7c7dec635f3b6c..7cc15557f0c5a1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml @@ -57,11 +57,17 @@ limitations under the License. - SupportedModes - CurrentMode + + SupportedModes + + + + CurrentMode + + StartUpMode OnMode - + @@ -69,6 +75,7 @@ limitations under the License. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. + @@ -77,6 +84,7 @@ limitations under the License. + diff --git a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml index b25cd549d90091..f16bbbf28bbbba 100644 --- a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml @@ -131,659 +131,901 @@ limitations under the License. 3. Everything that depends on a certain feature is optional because we have no way of setting up the dependencies here. Dependencies would be probably resolved in the cluster itself. Those attributes/commands are marked with a special comment. --> + + + + LockState + + + + LockType + + + + ActuatorEnabled + + + + + DoorState + + + + + + + DoorOpenEvents + + + + + + + + + DoorClosedEvents + + + + + + + + + OpenPeriod + + + + + + + + + NumberOfTotalUsersSupported + + + + + + + NumberOfPINUsersSupported + + + + + + + NumberOfRFIDUsersSupported + + + + + + + NumberOfWeekDaySchedulesSupportedPerUser + + + + + + + NumberOfYearDaySchedulesSupportedPerUser + + + + + + + NumberOfHolidaySchedulesSupported + + + + + + + MaxPINCodeLength + + + + + + + MinPINCodeLength + + + + + + + MaxRFIDCodeLength + + + + + + + MinRFIDCodeLength + + + + + + + CredentialRulesSupport + + + + + + + NumberOfCredentialsSupportedPerUser + + + + + + Language + + + + + + LEDSettings + + + + + + AutoRelockTime + + + + + + SoundVolume + + + + + + OperatingMode + + + + + + SupportedOperatingModes + + + + DefaultConfigurationRegister + + + + EnableLocalProgramming + + + + + + EnableOneTouchLocking + + + + + + EnableInsideStatusLED + + + + + + EnablePrivacyModeButton + + + + + + LocalProgrammingFeatures + + + + + + + WrongCodeEntryLimit + + + + + + + + + + + + UserCodeTemporaryDisableTime + + + + + + + + + + + + SendPINOverTheAir + + + + + + + + + + + + + + RequirePINforRemoteOperation + + + + + + + + + + + + + ExpiringUserTimeout + + + + + + + + + AliroReaderVerificationKey + + + + + + + + AliroReaderGroupIdentifier + + + + + + + + AliroReaderGroupSubIdentifier + + + + + + + + AliroExpeditedTransactionSupportedProtocolVersions + + + + + + + + AliroGroupResolvingKey + + + + + + + + AliroSupportedBLEUWBProtocolVersions + + + + + + + + AliroBLEAdvertisingVersion + + + + + + + + NumberOfAliroCredentialIssuerKeysSupported + + + + + + + NumberOfAliroEndpointKeysSupported + + + + + + + This command causes the lock device to lock the door. + + + + + + This command causes the lock device to unlock the door. + + + + + + + This command causes the lock device to unlock the door with a timeout parameter. + + + + + + + + Set a weekly repeating schedule for a specified user. + + + + + + + + + + + + + + + Retrieve the specific weekly schedule for the specific user. + + + + + + + + + + Returns the weekly repeating schedule data for the specified schedule index. + + + + + + + + + + + + + + + Clear the specific weekly schedule or all weekly schedules for the specific user. + + + + + + + + + + Set a time-specific schedule ID for a specified user. + + + + + + + + + + + + Returns the year day schedule data for the specified schedule and user indexes. + + + + + + + + + + Returns the year day schedule data for the specified schedule and user indexes. + + + + + + + + + + + + Clears the specific year day schedule or all year day schedules for the specific user. + + + + + + + + + + Set the holiday Schedule by specifying local start time and local end time with respect to any Lock Operating Mode. + + + + + + + + + + + + Get the holiday schedule for the specified index. + + + + + + + + + Returns the Holiday Schedule Entry for the specified Holiday ID. + + + + + + + + + + + + Clears the holiday schedule or all holiday schedules. + + + + + + + + + Set User into the lock. + + + + + + + + + + + + + + + Retrieve User. + + + + + + + + + Returns the User for the specified UserIndex. + + + + + + + + + + + + + + + + + Clears a User or all Users. + + + + + + + + + Set a credential (e.g. PIN, RFID, Fingerprint, etc.) into the lock for a new user, existing user, or ProgrammingUser. + + + + + + + + + + + + + + Returns the status for setting the specified credential. + + + + + + + + + + Retrieve the status of a particular credential (e.g. PIN, RFID, Fingerprint, etc.) by index. + + + + + + + + + Returns the status for the specified credential. + + + + + + + + + + + + + Clear one, one type, or all credentials except ProgrammingPIN credential. + + + + + + + + This command causes the lock device to unlock the door without pulling the latch. + + + + + + + + This command communicates an Aliro Reader configuration to the lock. + + + + + + + + + + + This command clears an existing Aliro Reader configuration for the lock. + + + + + - - LockState - LockType - ActuatorEnabled - - DoorState - - - DoorOpenEvents - - - - - - DoorClosedEvents - - - - - - OpenPeriod - - - - - NumberOfTotalUsersSupported - - NumberOfPINUsersSupported - - NumberOfRFIDUsersSupported - - NumberOfWeekDaySchedulesSupportedPerUser - - NumberOfYearDaySchedulesSupportedPerUser - - NumberOfHolidaySchedulesSupported - - MaxPINCodeLength - - MinPINCodeLength - - MaxRFIDCodeLength - - MinRFIDCodeLength - - CredentialRulesSupport - - NumberOfCredentialsSupportedPerUser - - Language - - - - - LEDSettings - - - - - AutoRelockTime - - - - - SoundVolume - - - - - OperatingMode - - - - SupportedOperatingModes - DefaultConfigurationRegister - - EnableLocalProgramming - - - - - EnableOneTouchLocking - - - - - EnableInsideStatusLED - - - - - EnablePrivacyModeButton - - - - - LocalProgrammingFeatures - - - - - - WrongCodeEntryLimit - - - - - - UserCodeTemporaryDisableTime - - - - - - SendPINOverTheAir - - - - - - RequirePINforRemoteOperation - - - - - - - ExpiringUserTimeout - - - - - - AliroReaderVerificationKey - - - - - AliroReaderGroupIdentifier - - - - - AliroReaderGroupSubIdentifier - - - - - AliroExpeditedTransactionSupportedProtocolVersions - - - - - AliroGroupResolvingKey - - - - - AliroSupportedBLEUWBProtocolVersions - - - - - AliroBLEAdvertisingVersion - - - - NumberOfAliroCredentialIssuerKeysSupported - - NumberOfAliroEndpointKeysSupported - - - - This command causes the lock device to lock the door. - - - - - This command causes the lock device to unlock the door. - - - - - - This command causes the lock device to unlock the door with a timeout parameter. - - - - - - - Set a weekly repeating schedule for a specified user. - - - - - - - - - - - - Retrieve the specific weekly schedule for the specific user. - - - - - - - Returns the weekly repeating schedule data for the specified schedule index. - - - - - - - - - - - - Clear the specific weekly schedule or all weekly schedules for the specific user. - - - - - - - Set a time-specific schedule ID for a specified user. - - - - - - - - - Returns the year day schedule data for the specified schedule and user indexes. - - - - - - - Returns the year day schedule data for the specified schedule and user indexes. - - - - - - - - - Clears the specific year day schedule or all year day schedules for the specific user. - - - - - - - Set the holiday Schedule by specifying local start time and local end time with respect to any Lock Operating Mode. - - - - - - - - - Get the holiday schedule for the specified index. - - - - - - Returns the Holiday Schedule Entry for the specified Holiday ID. - - - - - - - - - Clears the holiday schedule or all holiday schedules. - - - - - - Set User into the lock. - - - - - - - - - - - - Retrieve User. - - - - - - Returns the User for the specified UserIndex. - - - - - - - - - - - - - - Clears a User or all Users. - - - - - - Set a credential (e.g. PIN, RFID, Fingerprint, etc.) into the lock for a new user, existing user, or ProgrammingUser. - - - - - - - - - - - Returns the status for setting the specified credential. - - - - - - - Retrieve the status of a particular credential (e.g. PIN, RFID, Fingerprint, etc.) by index. - - - - - - Returns the status for the specified credential. - - - - - - - - - - Clear one, one type, or all credentials except ProgrammingPIN credential. - - - - - This command causes the lock device to unlock the door without pulling the latch. - - - - - This command communicates an Aliro Reader configuration to the lock. - - - - - - - - This command clears an existing Aliro Reader configuration for the lock. - - - - - - - The door lock cluster provides several alarms which can be sent when there is a critical state on the door lock. - - - - - The door lock server sends out a DoorStateChange event when the door lock door state changes. - - - - The door lock server sends out a LockOperation event when the event is triggered by the various lock operation sources. - - - - - - - - - - The door lock server sends out a LockOperationError event when a lock operation fails for various reasons. - - - - - - - - - - - The door lock server sends out a LockUserChange event when a lock user, schedule, or credential change has occurred. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + The door lock cluster provides several alarms which can be sent when there is a critical state on the door lock. + + + + + + The door lock server sends out a DoorStateChange event when the door lock door state changes. + + + + + + + The door lock server sends out a LockOperation event when the event is triggered by the various lock operation sources. + + + + + + + + + + + The door lock server sends out a LockOperationError event when a lock operation fails for various reasons. + + + + + + + + + + + + The door lock server sends out a LockUserChange event when a lock user, schedule, or credential change has occurred. + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -796,7 +1038,7 @@ limitations under the License. - + @@ -808,7 +1050,7 @@ limitations under the License. - + @@ -824,7 +1066,7 @@ limitations under the License. - + @@ -836,7 +1078,7 @@ limitations under the License. - + @@ -846,7 +1088,7 @@ limitations under the License. - + @@ -858,7 +1100,7 @@ limitations under the License. - + diff --git a/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml index d64bce1c85b7f6..d7e04ccf464668 100644 --- a/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml @@ -199,21 +199,41 @@ limitations under the License. - LoadControlPrograms - NumberOfLoadControlPrograms - Events - ActiveEvents - NumberOfEventsPerProgram - NumberOfTransitions - + + LoadControlPrograms + + + + NumberOfLoadControlPrograms + + + + Events + + + + ActiveEvents + + + + NumberOfEventsPerProgram + + + + NumberOfTransitions + + + DefaultRandomStart + DefaultRandomDuration + @@ -221,18 +241,21 @@ limitations under the License. Upon receipt, this SHALL insert a new LoadControlProgramStruct into LoadControlPrograms, or if the ProgramID matches an existing LoadControlProgramStruct, then the provider SHALL be updated with the provided values. + Upon receipt, this SHALL remove a the LoadControlProgramStruct from LoadControlPrograms with the matching ProgramID. + On receipt of the AddLoadControlEventsRequest command, the server SHALL add a load control event. + @@ -240,6 +263,7 @@ limitations under the License. + + diff --git a/src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml index eb05052538d2de..3fbd9e984fc2a0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml @@ -42,25 +42,71 @@ limitations under the License. - Accuracy - CumulativeEnergyImported + + Accuracy + + + + CumulativeEnergyImported + + + + + + + - CumulativeEnergyExported + + CumulativeEnergyExported + + + + + + + - PeriodicEnergyImported + + PeriodicEnergyImported + + + + + + + - PeriodicEnergyExported - CumulativeEnergyReset + + PeriodicEnergyExported + + + + + + + + + CumulativeEnergyReset + + + + CumulativeEnergyMeasured + + + PeriodicEnergyMeasured + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml index 7f49a643d1b1f9..18ee20bad30481 100644 --- a/src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml @@ -51,40 +51,124 @@ limitations under the License. - PowerMode - NumberOfMeasurementTypes - Accuracy - Ranges - Voltage + + PowerMode + + + + NumberOfMeasurementTypes + + + + Accuracy + + + + Ranges + + + + Voltage + + - ActiveCurrent + + ActiveCurrent + + - ReactiveCurrent - ApparentCurrent + + ReactiveCurrent + + + + + + ApparentCurrent + + + + - ActivePower + + ActivePower + + - ReactivePower + + ReactivePower + + + + - ApparentPower + + ApparentPower + + + + - RMSVoltage + + RMSVoltage + + + + - RMSCurrent + + RMSCurrent + + + + - RMSPower + + RMSPower + + + + - Frequency + + Frequency + + + + - HarmonicCurrents + + HarmonicCurrents + + + + - HarmonicPhases + + HarmonicPhases + + + + - PowerFactor - NeutralCurrent + + PowerFactor + + + + + + NeutralCurrent + + + + MeasurementPeriodRanges + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml index 7a4a40d2e39966..97709d706abf4d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml @@ -128,53 +128,139 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - State - SupplyState - FaultState - ChargingEnabledUntil + + State + + + + SupplyState + + + + FaultState + + + + ChargingEnabledUntil + + - DischargingEnabledUntil - CircuitCapacity - MinimumChargeCurrent - MaximumChargeCurrent + + DischargingEnabledUntil + + + + + + CircuitCapacity + + + + MinimumChargeCurrent + + + + MaximumChargeCurrent + + - MaximumDischargeCurrent + + MaximumDischargeCurrent + + + + UserMaximumChargeCurrent + RandomizationDelayWindow + - NextChargeStartTime + + NextChargeStartTime + + + + - NextChargeTargetTime + + NextChargeTargetTime + + + + - NextChargeRequiredEnergy + + NextChargeRequiredEnergy + + + + - NextChargeTargetSoC + + NextChargeTargetSoC + + + + ApproximateEVEfficiency + + + - StateOfCharge + + StateOfCharge + + + + - BatteryCapacity + + BatteryCapacity + + + + - VehicleID - SessionID - SessionDuration - SessionEnergyCharged + + VehicleID + + + + + + SessionID + + + + SessionDuration + + + + SessionEnergyCharged + + - SessionEnergyDischarged + + SessionEnergyDischarged + + + + Allows a client to disable the EVSE from charging and discharging. + @@ -182,39 +268,57 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 This command allows a client to enable the EVSE to charge an EV, and to provide or update the maximum and minimum charge current. + Upon receipt, this SHALL allow a client to enable the discharge of an EV, and to provide or update the maximum discharge current. + + + Allows a client to put the EVSE into a self-diagnostics mode. + Allows a client to set the user specified charging targets. + + + Allows a client to retrieve the current set of charging targets. + + + Allows a client to clear all stored charging targets. + + + The GetTargetsResponse is sent in response to the GetTargets Command. + + + This event SHALL be generated when the EV is plugged in. + @@ -224,6 +328,7 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 + @@ -232,6 +337,7 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 + @@ -241,6 +347,7 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 + @@ -249,11 +356,15 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 + This event SHALL be generated when a RFID card has been read. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml index b28daf8899636c..7c4ddac9f6f09b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml @@ -59,18 +59,26 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - SupportedModes - CurrentMode + + SupportedModes + + + + CurrentMode + + This command is used to change device modes. + This command is sent by the device on receipt of the ChangeToMode command. + diff --git a/src/app/zap-templates/zcl/data-model/chip/energy-preference-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/energy-preference-cluster.xml index a5e1ea8e950ae1..cf646ab0197be5 100644 --- a/src/app/zap-templates/zcl/data-model/chip/energy-preference-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/energy-preference-cluster.xml @@ -34,26 +34,47 @@ limitations under the License. - EnergyBalances - + + EnergyBalances + + + + + - + + CurrentEnergyBalance - CurrentEnergyBalance + + + - EnergyPriorities + + EnergyPriorities + + + + - LowPowerModeSensitivities + + LowPowerModeSensitivities + + + + - + CurrentLowPowerModeSensitivity + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml index f2cf3173c68b29..d84f017f5eea00 100644 --- a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml @@ -37,26 +37,69 @@ limitations under the License. The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. - + + + + + + + + + + PHYRate - - + + + FullDuplex - - - - PHYRate - FullDuplex - PacketRxCount - PacketTxCount - TxErrCount - CollisionCount - OverrunCount - CarrierDetect - TimeSinceReset + + + PacketRxCount + + + + + + PacketTxCount + + + + + + TxErrCount + + + + + + CollisionCount + + + + + + OverrunCount + + + + + + CarrierDetect + + + + TimeSinceReset + + Reception of this command SHALL reset the attributes: PacketRxCount, PacketTxCount, TxErrCount, CollisionCount, OverrunCount to 0 + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml index 96e420f01902de..5e4b1734efb46e 100644 --- a/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml @@ -31,6 +31,9 @@ limitations under the License. FIXED_LABEL_CLUSTER The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only labels. - LabelList + + LabelList + + diff --git a/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml index 3e546e968514ea..b5336b50ad6406 100644 --- a/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml @@ -24,10 +24,22 @@ limitations under the License. FLOW_MEASUREMENT_CLUSTER true true - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - Tolerance + + MeasuredValue + + + + MinMeasuredValue + + + + MaxMeasuredValue + + + + Tolerance + + diff --git a/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml index 167f7d13e322af..e8877b5c1cc9d9 100644 --- a/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml @@ -56,41 +56,86 @@ limitations under the License. Breadcrumb + - BasicCommissioningInfo - RegulatoryConfig - LocationCapability - SupportsConcurrentConnection - + + BasicCommissioningInfo + + + + RegulatoryConfig + + + + LocationCapability + + + + SupportsConcurrentConnection + + + TCAcceptedVersion + + + + + + TCMinRequiredVersion + + + + + + TCAcknowledgements + + + + + + TCAcknowledgementsRequired + + + + + + TCUpdateDeadline + + + + + + Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock + Success/failure response for ArmFailSafe command + Set the regulatory configuration to be used during commissioning @@ -98,30 +143,46 @@ limitations under the License. + Success/failure response for SetRegulatoryConfig command + Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. + Indicates to client whether CommissioningComplete command succeeded + This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. + + + + + + This command is used to convey the result from SetTCAcknowledgements. + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml index 26f0e5708dd280..9383517eb95a5b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml @@ -92,17 +92,44 @@ limitations under the License. - NetworkInterfaces - RebootCount + + NetworkInterfaces + + + + RebootCount + + - UpTime - TotalOperationalHours - BootReason - ActiveHardwareFaults - ActiveRadioFaults - ActiveNetworkFaults - TestEventTriggersEnabled + + UpTime + + + + TotalOperationalHours + + + + BootReason + + + + ActiveHardwareFaults + + + + ActiveRadioFaults + + + + ActiveNetworkFaults + + + + TestEventTriggersEnabled + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -> -> -> -> -> - - - - - - IdleModeDuration - ActiveModeDuration - ActiveModeThreshold - - RegisteredClients - - - - ICDCounter - - - ClientsSupportedPerFabric - UserActiveModeTriggerHint - UserActiveModeTriggerInstruction - OperatingMode - MaximumCheckInBackOff - - - Register a client to the end device - - - - - - - - - - RegisterClient response command - - - - - Unregister a client from an end device - - - - - - - Request the end device to stay in Active Mode for an additional ActiveModeThreshold - - - - - - StayActiveRequest response command - - - + + General + ICD Management + 0x0046 + ICD_MANAGEMENT_CLUSTER + Allows servers to ensure that listed clients are notified when a server is available for communication. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IdleModeDuration + + + + ActiveModeDuration + + + + ActiveModeThreshold + + + + RegisteredClients + + + + + + + ICDCounter + + + + + + + ClientsSupportedPerFabric + + + + + + UserActiveModeTriggerHint + + + + + + + + + UserActiveModeTriggerInstruction + + + + OperatingMode + + + + + + + + + MaximumCheckInBackOff + + + + + + + Register a client to the end device + + + + + + + + + + + + + RegisterClient response command + + + + + + + + Unregister a client from an end device + + + + + + + + + + Request the end device to stay in Active Mode for an additional ActiveModeThreshold + + + + + + + + + + + + StayActiveRequest response command + + + + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml index b64eb7702f1517..27b94701fc3d07 100644 --- a/src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml @@ -51,16 +51,23 @@ limitations under the License. true true - - IdentifyTime - IdentifyType - + + + IdentifyTime + + + + IdentifyType + + + Command description for Identify + @@ -69,6 +76,7 @@ limitations under the License. + diff --git a/src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml index b744964ca0a9aa..22dcca9d5775fe 100644 --- a/src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml @@ -18,19 +18,34 @@ limitations under the License. - Illuminance Measurement - Measurement & Sensing - Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. - 0x0400 - ILLUMINANCE_MEASUREMENT_CLUSTER - true - true - - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - Tolerance - LightSensorType + Illuminance Measurement + Measurement & Sensing + Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. + 0x0400 + ILLUMINANCE_MEASUREMENT_CLUSTER + true + true + + + MeasuredValue + + + + MinMeasuredValue + + + + MaxMeasuredValue + + + + Tolerance + + + + LightSensorType + + diff --git a/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml index b43ace5c0c8383..c21a58ca0f0fbf 100644 --- a/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml @@ -40,11 +40,13 @@ limitations under the License. Upon receipt, this SHALL process a keycode as input to the media device. + This command SHALL be generated in response to a SendKey Request command. + diff --git a/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml index f126d8836f720c..171eb5cb91ee44 100644 --- a/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml @@ -36,9 +36,15 @@ limitations under the License. This cluster provides a way to access options associated with the operation of a laundry dryer device type. - - - SupportedDrynessLevels - SelectedDrynessLevel - + + + + SupportedDrynessLevels + + + + SelectedDrynessLevel + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml index b8afd87d76665c..e3778d2d938b60 100644 --- a/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml @@ -58,11 +58,17 @@ limitations under the License. - SupportedModes - CurrentMode + + SupportedModes + + + + CurrentMode + + StartUpMode OnMode - + @@ -70,6 +76,7 @@ limitations under the License. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. + @@ -78,6 +85,7 @@ limitations under the License. + diff --git a/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml index 4d0e67ddbd1b47..8d2326e01fb278 100644 --- a/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml @@ -61,25 +61,77 @@ limitations under the License. - - CurrentLevel - RemainingTime - MinLevel - MaxLevel - CurrentFrequency - MinFrequency - MaxFrequency - - OnOffTransitionTime - OnLevel - OnTransitionTime - OffTransitionTime - DefaultMoveRate - Options - + + CurrentLevel + + + + RemainingTime + + + + + + MinLevel + + + + + + + + MaxLevel + + + + CurrentFrequency + + + + + + MinFrequency + + + + + + MaxFrequency + + + + + + OnOffTransitionTime + + + + OnLevel + + + + OnTransitionTime + + + + OffTransitionTime + + + + DefaultMoveRate + + + + Options + + + StartUpCurrentLevel + + + @@ -90,6 +142,7 @@ limitations under the License. + @@ -100,6 +153,7 @@ limitations under the License. + @@ -111,6 +165,7 @@ limitations under the License. + @@ -119,6 +174,7 @@ limitations under the License. + @@ -129,6 +185,7 @@ limitations under the License. + @@ -139,6 +196,7 @@ limitations under the License. + @@ -150,6 +208,7 @@ limitations under the License. + @@ -158,6 +217,7 @@ limitations under the License. + @@ -166,6 +226,9 @@ limitations under the License. approximation if the exact provided one is not possible. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml index 9bdededd0fcd6e..34e81bbb445d0e 100644 --- a/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml @@ -31,7 +31,11 @@ limitations under the License. ActiveLocale + + + + SupportedLocales + - SupportedLocales diff --git a/src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml index c1cc5b38ede202..4b9ea09104994e 100644 --- a/src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml @@ -26,6 +26,7 @@ limitations under the License. This cluster provides an interface for managing low power mode on a device. This command shall put the device into low power mode. + diff --git a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml index 597b285cc1b5dd..57fdda3bc7cb7f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml @@ -32,20 +32,29 @@ limitations under the License. - InputList - CurrentInput + + InputList + + + + CurrentInput + + Upon receipt, this SHALL change the input on the media device to the input at a specific index in the Input List. + Upon receipt, this SHALL display the active status of the input list on screen. + Upon receipt, this SHALL hide the input list from the screen. + @@ -53,6 +62,9 @@ limitations under the License. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml index a77b8fa4befb4c..1c4f2e37c8e42b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml @@ -46,87 +46,167 @@ limitations under the License. - CurrentState - StartTime - Duration - SampledPosition - PlaybackSpeed - SeekRangeEnd - SeekRangeStart - ActiveAudioTrack - AvailableAudioTracks - ActiveTextTrack - AvailableTextTracks + + CurrentState + + + + StartTime + + + + + + Duration + + + + + + SampledPosition + + + + + + PlaybackSpeed + + + + + + SeekRangeEnd + + + + + + SeekRangeStart + + + + + + ActiveAudioTrack + + + + + + AvailableAudioTracks + + + + + + ActiveTextTrack + + + + + + AvailableTextTracks + + + + Upon receipt, this SHALL play media. + Upon receipt, this SHALL pause media. + Upon receipt, this SHALL stop media. User experience is context-specific. This will often navigate the user back to the location where media was originally launched. + Upon receipt, this SHALL Start Over with the current media playback item. + Upon receipt, this SHALL cause the handler to be invoked for "Previous". User experience is context-specific. This will often Go back to the previous media playback item. + Upon receipt, this SHALL cause the handler to be invoked for "Next". User experience is context-specific. This will often Go forward to the next media playback item. + Upon receipt, this SHALL Rewind through media. Different Rewind speeds can be used on the TV based upon the number of sequential calls to this function. This is to avoid needing to define every speed now (multiple fast, slow motion, etc). + + + Upon receipt, this SHALL Advance through media. Different FF speeds can be used on the TV based upon the number of sequential calls to this function. This is to avoid needing to define every speed now (multiple fast, slow motion, etc). + + + Upon receipt, this SHALL Skip forward in the media by the given number of seconds, using the data as follows: + Upon receipt, this SHALL Skip backward in the media by the given number of seconds, using the data as follows: + Upon receipt, this SHALL Skip backward in the media by the given number of seconds, using the data as follows: + + + This command SHALL be generated in response to various Playback Request commands. + Upon receipt, the server SHALL set the active Audio Track to the one identified by the TrackID in the Track catalog for the streaming media. If the TrackID does not exist in the Track catalog, OR does not correspond to the streaming media OR no media is being streamed at the time of receipt of this command, the server will return an error status of INVALID_ARGUMENT. + + + Upon receipt, the server SHALL set the active Text Track to the one identified by the TrackID in the Track catalog for the streaming media. If the TrackID does not exist in the Track catalog, OR does not correspond to the streaming media OR no media is being streamed at the time of receipt of this command, the server SHALL return an error status of INVALID_ARGUMENT. + + + If a Text Track is active (i.e. being displayed), upon receipt of this command, the server SHALL stop displaying it. + + + @@ -140,6 +220,7 @@ limitations under the License. + diff --git a/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml index 741ba801f5c092..901e63703eee1f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml @@ -91,8 +91,14 @@ limitations under the License. - Messages - ActiveMessageIDs + + Messages + + + + ActiveMessageIDs + + Command for requesting messages be presented @@ -104,20 +110,24 @@ limitations under the License. + Command for cancelling message present requests + This event SHALL be generated when the message is confirmed by the user, or when the expiration date of the message is reached. + This event SHALL be generated when the message is presented to the user. + This event SHALL be generated when the message is confirmed by the user, or when the expiration date of the message is reached. @@ -125,6 +135,7 @@ limitations under the License. + - \ No newline at end of file + diff --git a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml index 954bd898b6aa00..fd44e47c2ca767 100644 --- a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml @@ -41,27 +41,74 @@ limitations under the License. - CookTime - MaxCookTime - PowerSetting - MinPower - MaxPower - PowerStep - SupportedWatts - SelectedWattIndex - WattRating - + + CookTime + + + + MaxCookTime + + + + PowerSetting + + + + + + MinPower + + + + + + MaxPower + + + + + + PowerStep + + + + + + SupportedWatts + + + + + + + + + SelectedWattIndex + + + + + + + + + WattRating + + + - Set Cooking Parameters + Set Cooking Parameters + - Add More Cooking Time - + Add More Cooking Time + + diff --git a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml index 856fde36da15ee..393354fb4ca461 100644 --- a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml @@ -55,7 +55,13 @@ limitations under the License. - SupportedModes - CurrentMode + + SupportedModes + + + + CurrentMode + + diff --git a/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml index 443acb1c955c36..80e0267155496b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml @@ -48,19 +48,39 @@ limitations under the License. Attributes and commands for selecting a mode from a list of supported options. - Description - StandardNamespace - SupportedModes - CurrentMode - StartUpMode - OnMode - + + Description + + + + StandardNamespace + + + + SupportedModes + + + + CurrentMode + + + + StartUpMode + + + + OnMode + + + + On receipt of this command, if the NewMode field matches the Mode field in an entry of the SupportedModes list, the server SHALL set the CurrentMode attribute to the NewMode value, otherwise, the server SHALL respond with an INVALID_COMMAND status response. + diff --git a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml index 964923be4f2dfa..02fcb28ee2e14b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml @@ -107,120 +107,207 @@ limitations under the License. - - + + + + - + MaxNetworks + - + Networks + + + + ScanMaxTimeSeconds + + + + + + - ScanMaxTimeSeconds - ConnectMaxTimeSeconds - + + ConnectMaxTimeSeconds + + + + + + + + InterfaceEnabled + - + LastNetworkingStatus + - + LastNetworkID + - + LastConnectErrorValue + - + SupportedWiFiBands + + + - + SupportedThreadFeatures + + + - + ThreadVersion + + + - - Detemine the set of networks the device sees as available. - - - - - - Relay the set of networks the device sees as available back to the client. - - - - - - - Add or update the credentials for a given Wi-Fi network. - - - - - - - - - - Add or update the credentials for a given Thread network. - - - - - - Remove the definition of a given network (including its credentials). - - - - - - Response command for various commands that add/remove/modify network credentials. - - - - - - - - Connect to the specified network, using previously-defined credentials. - - - - - - Command that indicates whether we have succcessfully connected to a network. - - - - - - Modify the order in which networks will be presented in the Networks attribute. - - - - - - - Retrieve details about and optionally proof of possession of a network client identity. - - - - - - Command that contains details about a network client identity and optionally a proof of possession. - - - - + + Detemine the set of networks the device sees as available. + + + + + + + + + + + + Relay the set of networks the device sees as available back to the client. + + + + + + + + + + + + + Add or update the credentials for a given Wi-Fi network. + + + + + + + + + + + + + Add or update the credentials for a given Thread network. + + + + + + + + + Remove the definition of a given network (including its credentials). + + + + + + + + + + + + Response command for various commands that add/remove/modify network credentials. + + + + + + + + + + + + + + Connect to the specified network, using previously-defined credentials. + + + + + + + + + + + + Command that indicates whether we have succcessfully connected to a network. + + + + + + + + + + + + Modify the order in which networks will be presented in the Networks attribute. + + + + + + + + + + + + + Retrieve details about and optionally proof of possession of a network client identity. + + + + + + + + + Command that contains details about a network client identity and optionally a proof of possession. + + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml index 0141a7542f4d78..90f1a6a9f497a7 100644 --- a/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml @@ -83,74 +83,288 @@ limitations under the License. - Occupancy - OccupancySensorType - OccupancySensorTypeBitmap + + Occupancy + + + + OccupancySensorType + + + + + + + OccupancySensorTypeBitmap + + + + + - HoldTime - + HoldTime + + - HoldTimeLimits - + + HoldTimeLimits + + + + + PIROccupiedToUnoccupiedDelay + + + + + + + + + + + + + + + + + + + + + + PIRUnoccupiedToOccupiedDelay + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PIRUnoccupiedToOccupiedThreshold + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UltrasonicOccupiedToUnoccupiedDelay + + + + + + + + + UltrasonicUnoccupiedToOccupiedDelay + + + + + + + + + + + + + + + + UltrasonicUnoccupiedToOccupiedThreshold + + + + + + + + + + + + + + + + PhysicalContactOccupiedToUnoccupiedDelay + + + + + + + + + PhysicalContactUnoccupiedToOccupiedDelay + + + + + + + + + + + + + + + + PhysicalContactUnoccupiedToOccupiedThreshold + + + + + + + + + + + + + + + + If this event is supported, it SHALL be generated when the Occupancy attribute changes. + diff --git a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml index 04dcfed83766e8..c1e87fd1ceb37d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml @@ -81,37 +81,75 @@ limitations under the License. - - OnOff - GlobalSceneControl - OnTime - OffWaitTime - + + + OnOff + + + + GlobalSceneControl + + + + + + OnTime + + + + + + OffWaitTime + + + + + StartUpOnOff + + + On receipt of this command, a device SHALL enter its ‘Off’ state. This state is device dependent, but it is recommended that it is used for power off or similar functions. On receipt of the Off command, the OnTime attribute SHALL be set to 0. + On receipt of this command, a device SHALL enter its ‘On’ state. This state is device dependent, but it is recommended that it is used for power on or similar functions. On receipt of the On command, if the value of the OnTime attribute is equal to 0, the device SHALL set the OffWaitTime attribute to 0. + + + + + On receipt of this command, if a device is in its ‘Off’ state it SHALL enter its ‘On’ state. Otherwise, if it is in its ‘On’ state it SHALL enter its ‘Off’ state. On receipt of the Toggle command, if the value of the OnOff attribute is equal to FALSE and if the value of the OnTime attribute is equal to 0, the device SHALL set the OffWaitTime attribute to 0. If the value of the OnOff attribute is equal to TRUE, the OnTime attribute SHALL be set to 0. + + + + + The OffWithEffect command allows devices to be turned off using enhanced ways of fading. + + + The OnWithRecallGlobalScene command allows the recall of the settings when the device was turned off. + + + @@ -119,6 +157,9 @@ limitations under the License. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml index 5b06c93e0ab7fd..8be3ce077a2732 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml @@ -62,34 +62,54 @@ limitations under the License. NOCs + + + + Fabrics + + + + SupportedFabrics + + + + CommissionedFabrics + + + + TrustedRootCertificates + + + + CurrentFabricIndex + - Fabrics - SupportedFabrics - CommissionedFabrics - TrustedRootCertificates - CurrentFabricIndex Sender is requesting attestation information from the receiver. + An attestation information confirmation from the server. + Sender is requesting a device attestation certificate from the receiver. + A device attestation certificate (DAC) or product attestation intermediate (PAI) certificate from the server. + @@ -97,6 +117,7 @@ limitations under the License. + @@ -104,6 +125,7 @@ limitations under the License. A certificate signing request (CSR) from the server. + @@ -114,6 +136,7 @@ limitations under the License. + @@ -121,31 +144,36 @@ limitations under the License. + - + Response to AddNOC or UpdateNOC commands. + This command SHALL be used by an Administrative Node to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. + This command is used by Administrative Nodes to remove a given fabric index and delete all associated fabric-scoped data. + This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml index 53b9c73cad6b3e..9bc60ae2f73fef 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml @@ -58,47 +58,94 @@ limitations under the License. true true This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. - - - - PhaseList - CurrentPhase - CountdownTime - OperationalStateList - OperationalState - OperationalError - + + + + + PhaseList + + + + CurrentPhase + + + + CountdownTime + + + + OperationalStateList + + + + OperationalState + + + + OperationalError + + + Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server. + + + + + + Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted. + + + + + + Upon receipt, the device SHALL start its operation if it is safe to do so and the device is in an operational state from which it can be started. + Upon receipt, the device SHALL resume its operation from the point it was at when it received the Pause command, or from the point when it was paused by means outside of this cluster (for example by manual button press). + + + + + + This command SHALL be generated in response to any of the Start, Stop, Pause, or Resume commands. + + + + + + + + OperationalError - + + OperationCompletion - + + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml index fd52204b02fe85..800506d73c6079 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml @@ -53,13 +53,31 @@ limitations under the License. This cluster supports remotely monitoring and, where supported, changing the operational state of an Oven. - - PhaseList - CurrentPhase - CountdownTime - OperationalStateList - OperationalState - OperationalError + + + PhaseList + + + + CurrentPhase + + + + CountdownTime + + + + OperationalStateList + + + + OperationalState + + + + OperationalError + + Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server. @@ -67,10 +85,17 @@ limitations under the License. Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted. + + + + + + Upon receipt, the device SHALL start its operation if it is safe to do so and the device is in an operational state from which it can be started. + @@ -80,18 +105,28 @@ limitations under the License. This command SHALL be generated in response to any of the Start, Stop, Pause, or Resume commands. + + + + + + + + OperationalError - + + OperationCompletion - + + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml index e3b054fe3fedce..3c762879309e5c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml @@ -64,24 +64,48 @@ limitations under the License. true true This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. - - - - PhaseList - CurrentPhase - CountdownTime - OperationalStateList - - - OperationalState - OperationalError + + OperationalState + + + + OperationalError + + Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server. + + + + + + @@ -90,27 +114,47 @@ both values from this cluster and from the base cluster. Upon receipt, the device SHALL resume its operation from the point it was at when it received the Pause command, or from the point when it was paused by means outside of this cluster (for example by manual button press). + + + + + + This command SHALL be generated in response to any of the Start, Stop, Pause, or Resume commands. + + + + + + + + On receipt of this command, the device SHALL start seeking the charging dock, if possible in the current state of the device. + + + + OperationalError - + + - + OperationCompletion - - + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml index 0faa1b037eb318..8a54783445013f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml @@ -62,11 +62,17 @@ limitations under the License. - SupportedModes - CurrentMode + + SupportedModes + + + + CurrentMode + + StartUpMode OnMode - + @@ -74,6 +80,7 @@ limitations under the License. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. + @@ -82,6 +89,7 @@ limitations under the License. + diff --git a/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml index 5701dc6ec61e65..8bbfe444227f1d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml @@ -43,58 +43,222 @@ limitations under the License. - - Status - Order - Description - - WiredAssessedInputVoltage - WiredAssessedInputFrequency - WiredCurrentType - WiredAssessedCurrent - WiredNominalVoltage - WiredMaximumCurrent - WiredPresent - ActiveWiredFaults - - BatVoltage - BatPercentRemaining - BatTimeRemaining - BatChargeLevel - BatReplacementNeeded - BatReplaceability - BatPresent - ActiveBatFaults - BatReplacementDescription - BatCommonDesignation - BatANSIDesignation - BatIECDesignation - BatApprovedChemistry - BatCapacity - BatQuantity - BatChargeState - BatTimeToFullCharge - BatFunctionalWhileCharging - BatChargingCurrent - ActiveBatChargeFaults - EndpointList + + Status + + + + Order + + + + Description + + + + + WiredAssessedInputVoltage + + + + + + WiredAssessedInputFrequency + + + + + + WiredCurrentType + + + + + + WiredAssessedCurrent + + + + + + WiredNominalVoltage + + + + + + WiredMaximumCurrent + + + + + + WiredPresent + + + + + + ActiveWiredFaults + + + + + + + BatVoltage + + + + + + BatPercentRemaining + + + + + + BatTimeRemaining + + + + + + BatChargeLevel + + + + + + BatReplacementNeeded + + + + + + BatReplaceability + + + + + + BatPresent + + + + + + ActiveBatFaults + + + + + + BatReplacementDescription + + + + + + BatCommonDesignation + + + + + + BatANSIDesignation + + + + + + BatIECDesignation + + + + + + BatApprovedChemistry + + + + + + BatCapacity + + + + + + + + + BatQuantity + + + + + + BatChargeState + + + + + + BatTimeToFullCharge + + + + + + BatFunctionalWhileCharging + + + + + + BatChargingCurrent + + + + + + ActiveBatChargeFaults + + + + + + EndpointList + + + The WiredFaultChange Event SHALL indicate a change in the set of wired faults currently detected by the Node on this wired power source. + + + The BatFaultChange Event SHALL indicate a change in the set of battery faults currently detected by the Node on this battery power source. + + + The BatChargeFaultChange Event SHALL indicate a change in the set of charge faults currently detected by the Node on this battery power source. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml index 04a7cdb121c775..ba97841d3492e0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml @@ -26,6 +26,9 @@ limitations under the License. true true - Sources + + Sources + + diff --git a/src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml index 3bca0bd43ee8af..c686115edcb8cb 100644 --- a/src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml @@ -44,7 +44,17 @@ limitations under the License. - AvailableEndpoints - ActiveEndpoints + + AvailableEndpoints + + + + + + ActiveEndpoints + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml index f9487af7f3a9e2..04100e82379f2d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml @@ -31,16 +31,53 @@ limitations under the License. - - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - Tolerance - ScaledValue - MinScaledValue - MaxScaledValue - ScaledTolerance - Scale + + + MeasuredValue + + + + MinMeasuredValue + + + + MaxMeasuredValue + + + + Tolerance + + + + ScaledValue + + + + + + MinScaledValue + + + + + + MaxScaledValue + + + + + + ScaledTolerance + + + + + + Scale + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml index 74416092e7c7f8..b23ad516515b11 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml @@ -49,97 +49,245 @@ limitations under the License. - - MaxPressure - MaxSpeed - MaxFlow - MinConstPressure - MaxConstPressure - MinCompPressure - MaxCompPressure - MinConstSpeed - MaxConstSpeed - MinConstFlow - MaxConstFlow - MinConstTemp - MaxConstTemp - PumpStatus - EffectiveOperationMode - EffectiveControlMode - Capacity - Speed + + + MaxPressure + + + + MaxSpeed + + + + MaxFlow + + + + MinConstPressure + + + + + + + + + + + MaxConstPressure + + + + + + + + + + + MinCompPressure + + + + + + + + + + + MaxCompPressure + + + + + + + + + + + MinConstSpeed + + + + + + + + + + + MaxConstSpeed + + + + + + + + + + + MinConstFlow + + + + + + + + + + + MaxConstFlow + + + + + + + + + + + MinConstTemp + + + + + + + + + + + MaxConstTemp + + + + + + + + + + + PumpStatus + + + + EffectiveOperationMode + + + + EffectiveControlMode + + + + Capacity + + + + Speed + + LifetimeRunningHours + + + + Power + - Power LifetimeEnergyConsumed + OperationMode + ControlMode + SupplyVoltageLow + SupplyVoltageHigh + PowerMissingPhase + SystemPressureLow + SystemPressureHigh + DryRunning + MotorTemperatureHigh + PumpMotorFatalFailure + ElectronicTemperatureHigh + PumpBlocked + SensorFailure + ElectronicNonFatalFailure + ElectronicFatalFailure + GeneralFault + Leakage + AirDetection + TurbineOperation + diff --git a/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml b/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml index 58fa70163f65ea..deeb16b4dae3d7 100644 --- a/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml +++ b/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml @@ -28,17 +28,27 @@ limitations under the License. REFRIGERATOR_ALARM_CLUSTER true true - - Mask - State - Supported + + + Mask + + + + State + + + + Supported + + - Notify - - - - + Notify + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml index e29080ce4a43cb..a4fe78bc225d65 100644 --- a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml @@ -56,11 +56,17 @@ limitations under the License. - SupportedModes - CurrentMode + + SupportedModes + + + + CurrentMode + + StartUpMode OnMode - + @@ -68,6 +74,7 @@ limitations under the License. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. + @@ -76,6 +83,7 @@ limitations under the License. + diff --git a/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml index e309b75dcc46bd..7f8157572a4270 100644 --- a/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml @@ -25,9 +25,21 @@ limitations under the License. true true - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - Tolerance + + MeasuredValue + + + + MinMeasuredValue + + + + MaxMeasuredValue + + + + Tolerance + + diff --git a/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml index 66de9ee66cbebd..25e586226f0d82 100644 --- a/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml @@ -38,16 +38,41 @@ limitations under the License. - Condition - DegradationDirection - ChangeIndication - InPlaceIndicator - LastChangedTime - ReplacementProductList - + + Condition + + + + + + DegradationDirection + + + + + + ChangeIndication + + + + InPlaceIndicator + + + + LastChangedTime + + + + ReplacementProductList + + + + + Reset the condition of the replaceable to the non degraded state + @@ -73,16 +98,41 @@ limitations under the License. - Condition - DegradationDirection - ChangeIndication - InPlaceIndicator - LastChangedTime - ReplacementProductList - + + Condition + + + + + + DegradationDirection + + + + + + ChangeIndication + + + + InPlaceIndicator + + + + LastChangedTime + + + + ReplacementProductList + + + + + Reset the condition of the replaceable to the non degraded state + diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml index 65c2f17a3e8e75..a1fe4809ee1e17 100644 --- a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml @@ -67,8 +67,14 @@ limitations under the License. - SupportedModes - CurrentMode + + SupportedModes + + + + CurrentMode + + @@ -78,6 +84,7 @@ limitations under the License. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. + @@ -86,6 +93,7 @@ limitations under the License. + diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml index ce835576396bb8..6cd765db7fab84 100644 --- a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml @@ -73,8 +73,14 @@ limitations under the License. - SupportedModes - CurrentMode + + SupportedModes + + + + CurrentMode + + @@ -84,6 +90,7 @@ limitations under the License. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. + @@ -92,6 +99,7 @@ limitations under the License. + diff --git a/src/app/zap-templates/zcl/data-model/chip/scene.xml b/src/app/zap-templates/zcl/data-model/chip/scene.xml index b6315bdc1287c1..dcc929fa47e872 100644 --- a/src/app/zap-templates/zcl/data-model/chip/scene.xml +++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml @@ -80,10 +80,19 @@ limitations under the License. - - LastConfiguredBy - SceneTableSize - FabricSceneInfo + + LastConfiguredBy + + + + SceneTableSize + + + + FabricSceneInfo + + + Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' @@ -94,6 +103,7 @@ limitations under the License. + @@ -102,6 +112,7 @@ limitations under the License. + @@ -111,6 +122,7 @@ limitations under the License. + @@ -119,6 +131,7 @@ limitations under the License. + @@ -128,6 +141,7 @@ limitations under the License. + @@ -137,6 +151,7 @@ limitations under the License. + @@ -144,6 +159,7 @@ limitations under the License. Get an unused scene identifier when no commissioning tool is in the network, or for a commissioning tool to get the used scene identifiers within a certain group + @@ -155,6 +171,7 @@ limitations under the License. + @@ -164,6 +181,7 @@ limitations under the License. + @@ -176,6 +194,7 @@ limitations under the License. + @@ -185,6 +204,7 @@ limitations under the License. + @@ -193,6 +213,7 @@ limitations under the License. + @@ -202,6 +223,7 @@ limitations under the License. + @@ -212,6 +234,7 @@ limitations under the License. + @@ -221,6 +244,9 @@ limitations under the License. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml index 8c2ba832c85604..c442136d46aa0a 100644 --- a/src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml @@ -96,19 +96,43 @@ limitations under the License. - SupportedAreas - SupportedMaps - SelectedAreas - CurrentArea - EstimatedEndTime - Progress - + + SupportedAreas + + + + SupportedMaps + + + + + + SelectedAreas + + + + CurrentArea + + + EstimatedEndTime + + + + + + Progress + + + + + Command used to select a set of device areas, where the device is to operate. + @@ -117,6 +141,7 @@ limitations under the License. + @@ -132,6 +157,9 @@ limitations under the License. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml index 31ae0bba9e7d99..a0543e04373dd5 100644 --- a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml @@ -46,66 +46,131 @@ limitations under the License. - ExpressedState - SmokeState - COState - BatteryAlert - DeviceMuted - TestInProgress - HardwareFaultAlert - EndOfServiceAlert - InterconnectSmokeAlarm - InterconnectCOAlarm - ContaminationState + + ExpressedState + + + + SmokeState + + + + + + COState + + + + + + BatteryAlert + + + + DeviceMuted + + + + TestInProgress + + + + HardwareFaultAlert + + + + EndOfServiceAlert + + + + InterconnectSmokeAlarm + + + + InterconnectCOAlarm + + + + ContaminationState + + + + SmokeSensitivityLevel + + + - ExpiryDate - + + ExpiryDate + + + This command SHALL initiate a device self-test. + This event SHALL be generated when SmokeState attribute changes to either Warning or Critical state. + + + This event SHALL be generated when COState attribute changes to either Warning or Critical state. + + + This event SHALL be generated when BatteryAlert attribute changes to either Warning or Critical state. + This event SHALL be generated when the device detects a hardware fault that leads to setting HardwareFaultAlert to True. + This event SHALL be generated when the EndOfServiceAlert is set to Expired. + This event SHALL be generated when the SelfTest completes, and the attribute TestInProgress changes to False. + This event SHALL be generated when the DeviceMuted attribute changes to Muted. + This event SHALL be generated when DeviceMuted attribute changes to NotMuted. + This event SHALL be generated when the device hosting the server receives a smoke alarm from an interconnected sensor. + + + This event SHALL be generated when the device hosting the server receives a smoke alarm from an interconnected sensor. + + + This event SHALL be generated when ExpressedState attribute returns to Normal state. + diff --git a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml index 3ac2ba42e8e22e..d0973998fa98d6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml @@ -37,20 +37,38 @@ limitations under the License. - ThreadMetrics - CurrentHeapFree - CurrentHeapUsed - CurrentHeapHighWatermark + + ThreadMetrics + + + + CurrentHeapFree + + + + CurrentHeapUsed + + + + CurrentHeapHighWatermark + + + + Reception of this command SHALL reset the values: The StackFreeMinimum field of the ThreadMetrics attribute, CurrentHeapHighWaterMark attribute. + + + Indicate the last software fault that has taken place on the Node. - + + diff --git a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml index 176163fae7fce6..90f61cdedcfbc8 100644 --- a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml @@ -78,38 +78,75 @@ Interactions with the switch device are exposed as attributes (for the latching - NumberOfPositions - CurrentPosition - MultiPressMax + + NumberOfPositions + + + + CurrentPosition + + + + MultiPressMax + + + + SwitchLatched + + + InitialPress + + + LongPress + + + ShortRelease + + + LongRelease + + + MultiPressOngoing + + + + + + + + MultiPressComplete - + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml index bc665905df1eb2..c7d516bcdc7416 100644 --- a/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml @@ -25,19 +25,27 @@ limitations under the License. true This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. - TargetList - CurrentTarget - + + TargetList + + + + CurrentTarget + + + Upon receipt, this SHALL navigation the UX to the target identified. + This command SHALL be generated in response to NavigateTarget commands. + @@ -45,6 +53,7 @@ limitations under the License. + diff --git a/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml index da0c0bcee983bb..2c7c173c6af8ff 100644 --- a/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml @@ -40,17 +40,48 @@ limitations under the License. - TemperatureSetpoint - MinTemperature - MaxTemperature - Step - SelectedTemperatureLevel - SupportedTemperatureLevels + + TemperatureSetpoint + + + + + + MinTemperature + + + + + + MaxTemperature + + + + + + Step + + + + + + SelectedTemperatureLevel + + + + + + SupportedTemperatureLevels + + + + - Set Temperature - - + Set Temperature + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml index d141743fafde56..45317b7b433894 100644 --- a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml @@ -24,9 +24,21 @@ limitations under the License. TEMPERATURE_MEASUREMENT_CLUSTER true true - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - Tolerance + + MeasuredValue + + + + MinMeasuredValue + + + + MaxMeasuredValue + + + + Tolerance + + diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml index 6f75aa45e985f6..9a409b7a89c1bd 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml @@ -312,146 +312,368 @@ limitations under the License. - LocalTemperature - OutdoorTemperature - Occupancy - AbsMinHeatSetpointLimit - AbsMaxHeatSetpointLimit - AbsMinCoolSetpointLimit - AbsMaxCoolSetpointLimit - PICoolingDemand - PIHeatingDemand + + LocalTemperature + + + + OutdoorTemperature + + + + Occupancy + + + + + + AbsMinHeatSetpointLimit + + + + + + AbsMaxHeatSetpointLimit + + + + + + AbsMinCoolSetpointLimit + + + + + + AbsMaxCoolSetpointLimit + + + + + + PICoolingDemand + + + + + + PIHeatingDemand + + + + HVACSystemTypeConfiguration + LocalTemperatureCalibration + + + + + + + + OccupiedCoolingSetpoint + + + + + + OccupiedHeatingSetpoint + + + + + + UnoccupiedCoolingSetpoint + + + + + + + + + UnoccupiedHeatingSetpoint + + + + + + - OccupiedCoolingSetpoint - OccupiedHeatingSetpoint - UnoccupiedCoolingSetpoint - UnoccupiedHeatingSetpoint MinHeatSetpointLimit + + + MaxHeatSetpointLimit + + + MinCoolSetpointLimit + + + MaxCoolSetpointLimit + + + MinSetpointDeadBand + + + RemoteSensing + ControlSequenceOfOperation + SystemMode + + + + ThermostatRunningMode + + + + + + StartOfWeek + + + + + + NumberOfWeeklyTransitions + + + + + + NumberOfDailyTransitions + + + - ThermostatRunningMode - StartOfWeek - NumberOfWeeklyTransitions - NumberOfDailyTransitions TemperatureSetpointHold + TemperatureSetpointHoldDuration + ThermostatProgrammingOperationMode + + + + ThermostatRunningState + + + + SetpointChangeSource + + + + SetpointChangeAmount + + + + SetpointChangeSourceTimestamp + - ThermostatRunningState - SetpointChangeSource - SetpointChangeAmount - SetpointChangeSourceTimestamp OccupiedSetback + + + + + + OccupiedSetbackMin + + + + + + OccupiedSetbackMax + + + - OccupiedSetbackMin - OccupiedSetbackMax UnoccupiedSetback + + + + + + + + + UnoccupiedSetbackMin + + + + + + + + + UnoccupiedSetbackMax + + + + + + - UnoccupiedSetbackMin - UnoccupiedSetbackMax EmergencyHeatDelta + ACType + ACCapacity + ACRefrigerantType + ACCompressorType + ACErrorCode + ACLouverPosition + + + + ACCoilTemperature + - ACCoilTemperature ACCapacityformat + + + + PresetTypes + + + + + + ScheduleTypes + + + + + + NumberOfPresets + + + + + + NumberOfSchedules + + + + + + NumberOfScheduleTransitions + + + + + + NumberOfScheduleTransitionPerDay + + + + + + ActivePresetHandle + + + + + + ActiveScheduleHandle + + + - PresetTypes - ScheduleTypes - NumberOfPresets - NumberOfSchedules - NumberOfScheduleTransitions - NumberOfScheduleTransitionPerDay - ActivePresetHandle - ActiveScheduleHandle Presets + + + Schedules + + + + + + SetpointHoldExpiryTimestamp + - SetpointHoldExpiryTimestamp Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. + @@ -461,27 +683,42 @@ limitations under the License. + + + The Current Weekly Schedule Command is sent from the server in response to the Get Weekly Schedule Command. + + + This command is used to clear the weekly schedule. + + + Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. + + + ID + + + @@ -491,6 +728,9 @@ limitations under the License. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml index cd3491cc079024..a95a9a31f32d9e 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml @@ -29,18 +29,23 @@ limitations under the License. - TemperatureDisplayMode - - + + TemperatureDisplayMode + + + + KeypadLockout + ScheduleProgrammingVisibility + diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml index d05ce70c34aca3..84132e495cf4c0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml @@ -33,31 +33,52 @@ limitations under the License. - BorderRouterName - - BorderAgentID - - ThreadVersion - - InterfaceEnabled - - ActiveDatasetTimestamp - - PendingDatasetTimestamp - + + BorderRouterName + + + + + BorderAgentID + + + + + ThreadVersion + + + + + InterfaceEnabled + + + + + ActiveDatasetTimestamp + + + + + PendingDatasetTimestamp + + + Command to request the active operational dataset of the Thread network to which the border router is connected. This command must be sent over a valid CASE session + Command to request the pending dataset of the Thread network to which the border router is connected. This command must be sent over a valid CASE session + - + Generated response to GetActiveDatasetRequest or GetPendingDatasetRequest commands. + @@ -65,12 +86,16 @@ limitations under the License. + Command set or update the pending Dataset of the Thread network to which the Border Router is connected. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml index 77ec8699615156..8804d64e30c7c1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml @@ -107,82 +107,362 @@ limitations under the License. - - Channel - RoutingRole - NetworkName - PanId - ExtendedPanId - MeshLocalPrefix - OverrunCount - NeighborTable - RouteTable - PartitionId - Weighting - DataVersion - StableDataVersion - LeaderRouterId - DetachedRoleCount - ChildRoleCount - RouterRoleCount - LeaderRoleCount - AttachAttemptCount - PartitionIdChangeCount - BetterPartitionAttachAttemptCount - ParentChangeCount - TxTotalCount - TxUnicastCount - TxBroadcastCount - TxAckRequestedCount - TxAckedCount - TxNoAckRequestedCount - TxDataCount - TxDataPollCount - TxBeaconCount - TxBeaconRequestCount - TxOtherCount - TxRetryCount - TxDirectMaxRetryExpiryCount - TxIndirectMaxRetryExpiryCount - TxErrCcaCount - TxErrAbortCount - TxErrBusyChannelCount - RxTotalCount - RxUnicastCount - RxBroadcastCount - RxDataCount - RxDataPollCount - RxBeaconCount - RxBeaconRequestCount - RxOtherCount - RxAddressFilteredCount - RxDestAddrFilteredCount - RxDuplicatedCount - RxErrNoFrameCount - RxErrUnknownNeighborCount - RxErrInvalidSrcAddrCount - RxErrSecCount - RxErrFcsCount - RxErrOtherCount - ActiveTimestamp - PendingTimestamp - Delay - SecurityPolicy - ChannelPage0Mask - OperationalDatasetComponents - ActiveNetworkFaultsList + + + Channel + + + + RoutingRole + + + + NetworkName + + + + PanId + + + + ExtendedPanId + + + + MeshLocalPrefix + + + + OverrunCount + + + + + + NeighborTable + + + + RouteTable + + + + PartitionId + + + + Weighting + + + + DataVersion + + + + StableDataVersion + + + + LeaderRouterId + + + + DetachedRoleCount + + + + + + ChildRoleCount + + + + + + RouterRoleCount + + + + + + LeaderRoleCount + + + + + + AttachAttemptCount + + + + + + PartitionIdChangeCount + + + + + + BetterPartitionAttachAttemptCount + + + + + + ParentChangeCount + + + + + + TxTotalCount + + + + + + TxUnicastCount + + + + + + TxBroadcastCount + + + + + + TxAckRequestedCount + + + + + + TxAckedCount + + + + + + TxNoAckRequestedCount + + + + + + TxDataCount + + + + + + TxDataPollCount + + + + + + TxBeaconCount + + + + + + TxBeaconRequestCount + + + + + + TxOtherCount + + + + + + TxRetryCount + + + + + + TxDirectMaxRetryExpiryCount + + + + + + TxIndirectMaxRetryExpiryCount + + + + + + TxErrCcaCount + + + + + + TxErrAbortCount + + + + + + TxErrBusyChannelCount + + + + + + RxTotalCount + + + + + + RxUnicastCount + + + + + + RxBroadcastCount + + + + + + RxDataCount + + + + + + RxDataPollCount + + + + + + RxBeaconCount + + + + + + RxBeaconRequestCount + + + + + + RxOtherCount + + + + + + RxAddressFilteredCount + + + + + + RxDestAddrFilteredCount + + + + + + RxDuplicatedCount + + + + + + RxErrNoFrameCount + + + + + + RxErrUnknownNeighborCount + + + + + + RxErrInvalidSrcAddrCount + + + + + + RxErrSecCount + + + + + + RxErrFcsCount + + + + + + RxErrOtherCount + + + + + + ActiveTimestamp + + + + PendingTimestamp + + + + Delay + + + + SecurityPolicy + + + + ChannelPage0Mask + + + + OperationalDatasetComponents + + + + ActiveNetworkFaultsList + + Reception of this command SHALL reset the OverrunCount attributes to 0 + + + Indicate that a Node’s connection status to a Thread network has changed + Indicate a change in the set of network faults currently detected by the Node + diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml index 3a6445b15bbad3..8f997cebc46d2f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml @@ -15,58 +15,67 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + + + + + + + + - - - - - - - + + Network Infrastructure + Thread Network Directory + 0x0453 + THREAD_NETWORK_DIRECTORY_CLUSTER + Manages the names and credentials of Thread networks visible to the user. - - Network Infrastructure - Thread Network Directory - 0x0453 - THREAD_NETWORK_DIRECTORY_CLUSTER - Manages the names and credentials of Thread networks visible to the user. + true + true - true - true + + + + + PreferredExtendedPanID + + + + + + ThreadNetworks + + + + + ThreadNetworkTableSize + + - - - - - PreferredExtendedPanID - - - - - ThreadNetworks - - - ThreadNetworkTableSize - - - Adds an entry to the ThreadNetworks list. - - - - - Removes an entry from the ThreadNetworks list. - - - - - Retrieves a Thread Operational Dataset from the ThreadNetworks list. - - - - - This is the response to a GetOperationalDataset request. - - - + + Adds an entry to the ThreadNetworks list. + + + + + + Removes an entry from the ThreadNetworks list. + + + + + + Retrieves a Thread Operational Dataset from the ThreadNetworks list. + + + + + + This is the response to a GetOperationalDataset request. + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml index 6ade7abe2e446c..bfc2222ef35a4a 100644 --- a/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml @@ -58,14 +58,23 @@ limitations under the License. - - HourFormat - + + HourFormat + + - ActiveCalendarType - + ActiveCalendarType + + + + + + + SupportedCalendarTypes + + + - SupportedCalendarTypes diff --git a/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml index 9336a6a944735e..201f71a201e523 100644 --- a/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml @@ -114,78 +114,166 @@ limitations under the License. - UTCTime - Granularity - TimeSource - TrustedTimeSource - DefaultNTP - TimeZone - DSTOffset - LocalTime - TimeZoneDatabase - NTPServerAvailable - TimeZoneListMaxSize - DSTOffsetListMaxSize - SupportsDNSResolve - + + UTCTime + + + + Granularity + + + + TimeSource + + + + TrustedTimeSource + + + + + + DefaultNTP + + + + + + TimeZone + + + + + + DSTOffset + + + + + + LocalTime + + + + + + TimeZoneDatabase + + + + + + NTPServerAvailable + + + + + + TimeZoneListMaxSize + + + + + + DSTOffsetListMaxSize + + + + + + SupportsDNSResolve + + + + + This command MAY be issued by Administrator to set the time. + This command SHALL set TrustedTimeSource. + + + This command SHALL set TimeZone. + + + Response to SetTimeZone. + + + This command SHALL set DSTOffset. + + + This command is used to set DefaultNTP. + + + This event SHALL be generated when the server stops applying the current DSTOffset and there are no entries in the list with a larger ValidStarting time. + + + This event SHALL be generated when the server starts or stops applying a DST offset. - + + + + This event SHALL be generated when the server changes its time zone offset or name. + + + This event SHALL be generated if the node has attempted to update its time, but was unable to find a good time from any source. + This event SHALL be generated if the node attempts to update its time and finds that the TrustedTimeSource is null, or the specified peer cannot be reached. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml index fb6238add46a4f..0deb6225eedab9 100644 --- a/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml @@ -43,8 +43,11 @@ limitations under the License. - TemperatureUnit - + TemperatureUnit + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml index 24260b78307bd3..14ffa15b70bd11 100644 --- a/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml @@ -27,6 +27,7 @@ limitations under the License. LabelList + diff --git a/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml index 80c1cdb60c8ccc..052a08108a69da 100644 --- a/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml @@ -59,39 +59,86 @@ limitations under the License. - OpenDuration + + OpenDuration + + - DefaultOpenDuration - AutoCloseTime - RemainingDuration - CurrentState - TargetState - CurrentLevel - TargetLevel - DefaultOpenLevel - ValveFault - LevelStep - + + DefaultOpenDuration + + + + AutoCloseTime + + + + + + RemainingDuration + + + + CurrentState + + + + TargetState + + + + CurrentLevel + + + + + + TargetLevel + + + + + + DefaultOpenLevel + + + + + + ValveFault + + + + LevelStep + + + + + This command is used to set the valve to its open position. + This command is used to set the valve to its closed position. + This event SHALL be generated when the valve state changed. + This event SHALL be generated when the valve registers or clears a fault. + diff --git a/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml index 90bd18b5b7baaa..50c88a02726515 100644 --- a/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml @@ -27,8 +27,14 @@ limitations under the License. - - MACAddress - LinkLocalAddress + + + MACAddress + + + + LinkLocalAddress + + diff --git a/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml index 2dc01920ae3e37..663f13dfcc1271 100644 --- a/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml @@ -45,11 +45,31 @@ limitations under the License. - - SpinSpeeds - SpinSpeedCurrent - NumberOfRinses - SupportedRinses + + + SpinSpeeds + + + + + + SpinSpeedCurrent + + + + + + NumberOfRinses + + + + + + SupportedRinses + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml index beeaf277b77d2e..6e5c56e21f9670 100644 --- a/src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml @@ -64,30 +64,58 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 true - HeaterTypes - HeatDemand - TankVolume - EstimatedHeatRequired - TankPercentage - BoostState + + HeaterTypes + + + + HeatDemand + + + + TankVolume + + + + + + EstimatedHeatRequired + + + + + + TankPercentage + + + + + + BoostState + + Allows a client to request that the water heater is put into a Boost state. + Allows a client to cancel an ongoing Boost operation. + This event SHALL be generated whenever a Boost command is accepted. + This event SHALL be generated whenever the BoostState transitions from Active to Inactive. + diff --git a/src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml index d9211e808467fb..89d8b78436337c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml @@ -58,18 +58,26 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - SupportedModes - CurrentMode + + SupportedModes + + + + CurrentMode + + This command is used to change device modes. + This command is sent by the device on receipt of the ChangeToMode command. + diff --git a/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml index 7fb35aab255ed7..f2a68e977bf965 100644 --- a/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml @@ -63,35 +63,94 @@ limitations under the License. - - BSSID - SecurityType - WiFiVersion - ChannelNumber - RSSI - BeaconLostCount - BeaconRxCount - PacketMulticastRxCount - PacketMulticastTxCount - PacketUnicastRxCount - PacketUnicastTxCount - CurrentMaxRate - OverrunCount + + + BSSID + + + + SecurityType + + + + WiFiVersion + + + + ChannelNumber + + + + RSSI + + + + BeaconLostCount + + + + + + BeaconRxCount + + + + + + PacketMulticastRxCount + + + + + + PacketMulticastTxCount + + + + + + PacketUnicastRxCount + + + + + + PacketUnicastTxCount + + + + + + CurrentMaxRate + + + + OverrunCount + + + + Reception of this command SHALL reset the Breacon and Packet related count attributes to 0 + + + Indicate that a Node’s Wi-Fi connection has been disconnected as a result of de-authenticated or dis-association and indicates the reason. + Indicate that a Node has failed to connect, or reconnect, to a Wi-Fi access point. + Indicate that a Node’s connection status to a Wi-Fi network has changed. + diff --git a/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml index 8c8b4d40c3abdd..c5246f6acddfc2 100644 --- a/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml @@ -30,19 +30,25 @@ limitations under the License. - SSID + + SSID + + PassphraseSurrogate + Request the current WPA-Personal passphrase or PSK associated with the managed Wi-Fi network. + This is the response to a NetworkPassphraseRequest. + diff --git a/src/app/zap-templates/zcl/data-model/chip/window-covering.xml b/src/app/zap-templates/zcl/data-model/chip/window-covering.xml index 0e1c97a4d45040..1363b5c8aa4c9d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/window-covering.xml +++ b/src/app/zap-templates/zcl/data-model/chip/window-covering.xml @@ -57,45 +57,186 @@ limitations under the License. - Type + + Type + + - PhysicalClosedLimitLift + + PhysicalClosedLimitLift + + + + + + + + - PhysicalClosedLimitTilt + + PhysicalClosedLimitTilt + + + + + + + + - CurrentPositionLift + + CurrentPositionLift + + + + + + + + - CurrentPositionTilt + + CurrentPositionTilt + + + + + + + + - NumberOfActuationsLift + + NumberOfActuationsLift + + + + - NumberOfActuationsTilt + + NumberOfActuationsTilt + + + + - ConfigStatus + + ConfigStatus + + - CurrentPositionLiftPercentage + + CurrentPositionLiftPercentage + + + + + + + - CurrentPositionTiltPercentage + + CurrentPositionTiltPercentage + + + + + + + - OperationalStatus + + OperationalStatus + + - TargetPositionLiftPercent100ths + + TargetPositionLiftPercent100ths + + + + + + + - TargetPositionTiltPercent100ths + + TargetPositionTiltPercent100ths + + + + + + + - EndProductType + + EndProductType + + - CurrentPositionLiftPercent100ths + + CurrentPositionLiftPercent100ths + + + + + + + - CurrentPositionTiltPercent100ths - + + CurrentPositionTiltPercent100ths + + + + + + + - InstalledOpenLimitLift - InstalledClosedLimitLift + + InstalledOpenLimitLift + + + + + + + + + + InstalledClosedLimitLift + + + + + + + + - InstalledOpenLimitTilt - InstalledClosedLimitTilt + + InstalledOpenLimitTilt + + + + + + + + + + InstalledClosedLimitTilt + + + + + + + + @@ -104,44 +245,85 @@ limitations under the License. Mode - + + - SafetyStatus - + + SafetyStatus + + + Moves window covering to InstalledOpenLimitLift and InstalledOpenLimitTilt + Moves window covering to InstalledClosedLimitLift and InstalledCloseLimitTilt + Stop any adjusting of window covering + Go to lift value specified + + + + + + Go to lift percentage specified + + + + + + + + + + + Go to tilt value specified + + + + + + Go to tilt percentage specified + + + + + + + + + + + From 883bdbadd712146ee635905efebada8fee5de92f Mon Sep 17 00:00:00 2001 From: "Ethan.Z" Date: Thu, 24 Oct 2024 13:12:27 -0400 Subject: [PATCH 2/2] move attribute name - move attribute name from description to name inside attribute tag --- .../chip/access-control-cluster.xml | 21 +- .../zcl/data-model/chip/actions-cluster.xml | 9 +- .../administrator-commissioning-cluster.xml | 9 +- .../data-model/chip/air-quality-cluster.xml | 3 +- .../chip/application-basic-cluster.xml | 24 +- .../chip/application-launcher-cluster.xml | 6 +- .../data-model/chip/audio-output-cluster.xml | 6 +- .../chip/ballast-configuration-cluster.xml | 42 +-- .../chip/basic-information-cluster.xml | 69 ++-- .../zcl/data-model/chip/binding-cluster.xml | 3 +- .../data-model/chip/boolean-state-cluster.xml | 3 +- .../boolean-state-configuration-cluster.xml | 24 +- .../camera-av-stream-management-cluster.xml | 63 ++-- .../zcl/data-model/chip/channel-cluster.xml | 9 +- .../zcl/data-model/chip/chip-ota.xml | 3 +- .../data-model/chip/color-control-cluster.xml | 156 +++------ .../chip/commissioner-control-cluster.xml | 3 +- .../concentration-measurement-cluster.xml | 330 ++++++------------ .../chip/content-control-cluster.xml | 24 +- .../chip/content-launch-cluster.xml | 6 +- .../data-model/chip/descriptor-cluster.xml | 15 +- .../chip/device-energy-management-cluster.xml | 24 +- .../device-energy-management-mode-cluster.xml | 6 +- .../chip/dishwasher-alarm-cluster.xml | 12 +- .../chip/dishwasher-mode-cluster.xml | 6 +- .../zcl/data-model/chip/door-lock-cluster.xml | 135 +++---- .../zcl/data-model/chip/drlc-cluster.xml | 24 +- .../chip/ecosystem-information-cluster.xml | 6 +- .../electrical-energy-measurement-cluster.xml | 18 +- .../electrical-power-measurement-cluster.xml | 57 +-- .../data-model/chip/energy-evse-cluster.xml | 60 ++-- .../chip/energy-evse-mode-cluster.xml | 6 +- .../chip/energy-preference-cluster.xml | 12 +- .../ethernet-network-diagnostics-cluster.xml | 27 +- .../data-model/chip/fixed-label-cluster.xml | 3 +- .../chip/flow-measurement-cluster.xml | 12 +- .../chip/general-commissioning-cluster.xml | 30 +- .../chip/general-diagnostics-cluster.xml | 27 +- .../chip/group-key-mgmt-cluster.xml | 12 +- .../zcl/data-model/chip/groups-cluster.xml | 3 +- .../chip/icd-management-cluster.xml | 30 +- .../zcl/data-model/chip/identify-cluster.xml | 6 +- .../chip/illuminance-measurement-cluster.xml | 15 +- .../chip/laundry-dryer-controls-cluster.xml | 6 +- .../chip/laundry-washer-mode-cluster.xml | 6 +- .../data-model/chip/level-control-cluster.xml | 42 +-- .../localization-configuration-cluster.xml | 6 +- .../data-model/chip/media-input-cluster.xml | 6 +- .../chip/media-playback-cluster.xml | 33 +- .../zcl/data-model/chip/messages-cluster.xml | 6 +- .../chip/microwave-oven-control-cluster.xml | 27 +- .../chip/microwave-oven-mode-cluster.xml | 6 +- .../data-model/chip/mode-select-cluster.xml | 18 +- .../chip/network-commissioning-cluster.xml | 35 +- .../chip/occupancy-sensing-cluster.xml | 42 +-- .../zcl/data-model/chip/onoff-cluster.xml | 15 +- .../chip/operational-credentials-cluster.xml | 18 +- .../chip/operational-state-cluster.xml | 18 +- .../chip/operational-state-oven-cluster.xml | 18 +- .../chip/operational-state-rvc-cluster.xml | 18 +- .../zcl/data-model/chip/oven-mode-cluster.xml | 6 +- .../data-model/chip/power-source-cluster.xml | 96 ++--- .../power-source-configuration-cluster.xml | 3 +- .../chip/power-topology-cluster.xml | 6 +- .../chip/pressure-measurement-cluster.xml | 27 +- ...pump-configuration-and-control-cluster.xml | 69 ++-- .../data-model/chip/refrigerator-alarm.xml | 9 +- ...rature-controlled-cabinet-mode-cluster.xml | 6 +- .../relative-humidity-measurement-cluster.xml | 12 +- .../chip/resource-monitoring-cluster.xml | 36 +- .../chip/rvc-clean-mode-cluster.xml | 6 +- .../data-model/chip/rvc-run-mode-cluster.xml | 6 +- .../zcl/data-model/chip/scene.xml | 9 +- .../data-model/chip/service-area-cluster.xml | 18 +- .../chip/smoke-co-alarm-cluster.xml | 39 +-- .../chip/software-diagnostics-cluster.xml | 12 +- .../zcl/data-model/chip/switch-cluster.xml | 9 +- .../chip/target-navigator-cluster.xml | 6 +- .../chip/temperature-control-cluster.xml | 18 +- .../chip/temperature-measurement-cluster.xml | 12 +- .../data-model/chip/thermostat-cluster.xml | 180 ++++------ ...t-user-interface-configuration-cluster.xml | 9 +- ...hread-border-router-management-cluster.xml | 18 +- .../thread-network-diagnostics-cluster.xml | 189 ++++------ .../chip/thread-network-directory-cluster.xml | 9 +- .../chip/time-format-localization-cluster.xml | 9 +- .../chip/time-synchronization-cluster.xml | 39 +-- .../chip/unit-localization-cluster.xml | 3 +- .../data-model/chip/user-label-cluster.xml | 3 +- ...alve-configuration-and-control-cluster.xml | 33 +- .../data-model/chip/wake-on-lan-cluster.xml | 6 +- .../chip/washer-controls-cluster.xml | 12 +- .../chip/water-heater-management-cluster.xml | 18 +- .../chip/water-heater-mode-cluster.xml | 6 +- .../chip/wifi-network-diagnostics-cluster.xml | 39 +-- .../chip/wifi-network-management-cluster.xml | 6 +- .../zcl/data-model/chip/window-covering.xml | 66 ++-- 97 files changed, 910 insertions(+), 1819 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml index 831cc5b49361b0..67a919eac1df0d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml @@ -109,15 +109,13 @@ limitations under the License. and enforce Access Control for the Node's endpoints and their associated cluster instances. - - ACL + - - Extension + @@ -125,26 +123,21 @@ limitations under the License. - - SubjectsPerAccessControlEntry + - - TargetsPerAccessControlEntry + - - AccessControlEntriesPerFabric + - - CommissioningARL + - - ARL + diff --git a/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml index bed60efdf50c65..73c38134ed8150 100644 --- a/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml @@ -90,16 +90,13 @@ limitations under the License. ACTIONS_CLUSTER This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. - - ActionList + - - EndpointLists + - - SetupURL + diff --git a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml index 55a8310f0fa7ac..ba6b7fd266f4ce 100644 --- a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml @@ -43,16 +43,13 @@ limitations under the License. - - WindowStatus + - - AdminFabricIndex + - - AdminVendorId + diff --git a/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml index 6b91830856441c..1b5d34b7bacb02 100644 --- a/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml @@ -41,8 +41,7 @@ limitations under the License. - - AirQuality + diff --git a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml index ea6be51e9bcb28..704b8cadbea19c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml @@ -24,36 +24,28 @@ limitations under the License. true true This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. - - VendorName + - - VendorID + - - ApplicationName + - - ProductID + - - Application + - - Status + - - ApplicationVersion + - - AllowedVendorList + diff --git a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml index 34eb73fde5b351..d69437a298f85e 100644 --- a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml @@ -31,14 +31,12 @@ limitations under the License. - - CatalogList + - - CurrentApp + diff --git a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml index 0de5d0e3301de5..d24b34f40235c2 100644 --- a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml @@ -31,12 +31,10 @@ limitations under the License. - - OutputList + - - CurrentOutput + diff --git a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml index 29ec1cd38108f3..80119e8ec0a006 100644 --- a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml @@ -41,73 +41,59 @@ limitations under the License. - - PhysicalMinLevel + - - PhysicalMaxLevel + - - BallastStatus + - - MinLevel + - - MaxLevel + - - IntrinsicBallastFactor + - - BallastFactorAdjustment + - - LampQuantity + - - LampType + - - LampManufacturer + - - LampRatedHours + - - LampBurnHours + - - LampAlarmMode + - - LampBurnHoursTripPoint + diff --git a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml index 288c82f950b8ab..f08d9dc2be7d2b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml @@ -74,102 +74,79 @@ limitations under the License. which apply to the whole Node. Also allows setting user device information such as location. - - DataModelRevision + - - VendorName + - - VendorID + - - ProductName + - - ProductID + - - NodeLabel + - - Location + - - HardwareVersion + - - HardwareVersionString + - - SoftwareVersion + - - SoftwareVersionString + - - ManufacturingDate + - - PartNumber + - - ProductURL + - - ProductLabel + - - SerialNumber + - - LocalConfigDisabled + - - Reachable + - - UniqueID + - - CapabilityMinima + - - ProductAppearance + - - SpecificationVersion + - - MaxPathsPerInvoke + diff --git a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml index 0b1cbd0c560091..19f2b0933c82c1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml @@ -31,8 +31,7 @@ limitations under the License. 0x001e BINDING_CLUSTER The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. - - Binding + diff --git a/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml index 30a16e16bcc0b0..292067d12aa456 100644 --- a/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml @@ -26,8 +26,7 @@ limitations under the License. true true - - StateValue + diff --git a/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml index 85705e6a03050e..a301b4eacf066b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml @@ -58,26 +58,22 @@ limitations under the License. - - CurrentSensitivityLevel + - - SupportedSensitivityLevels + - - DefaultSensitivityLevel + - - AlarmsActive + @@ -85,14 +81,12 @@ limitations under the License. - - AlarmsSuppressed + - - AlarmsEnabled + @@ -100,8 +94,7 @@ limitations under the License. - - AlarmsSupported + @@ -109,8 +102,7 @@ limitations under the License. - - SensorFault + diff --git a/src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml index 5cbf1d28ec89d3..13d1f7a9e77be2 100644 --- a/src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml @@ -194,8 +194,7 @@ Git: 0.9-fall2024-411-g9835b5cd7 SupportedSnapshotParams MaxNetworkBandwidth CurrentFrameRate - - HDRModeEnabled + @@ -205,110 +204,90 @@ Git: 0.9-fall2024-411-g9835b5cd7 AllocatedVideoStreams AllocatedAudioStreams AllocatedSnapshotStreams - - RankedVideoStreamPrioritiesList + SoftRecordingPrivacyModeEnabled SoftLivestreamPrivacyModeEnabled HardPrivacyModeOn - - NightVision + - - NightVisionIllum + - - AWBEnabled + - - AutoShutterSpeedEnabled + - - AutoISOEnabled + Viewport - - SpeakerMuted + - - SpeakerVolumeLevel + - - SpeakerMaxLevel + - - SpeakerMinLevel + - - MicrophoneMuted + - - MicrophoneVolumeLevel + - - MicrophoneMaxLevel + - - MicrophoneMinLevel + - - MicrophoneAGCEnabled + ImageRotation ImageFlipHorizontal ImageFlipVertical - - LocalVideoRecordingEnabled + - - LocalSnapshotRecordingEnabled + - - StatusLightEnabled + - - StatusLightBrightness + - - DepthSensorStatus + diff --git a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml index c3a08ab084359b..cb4bcd9adb5ab1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml @@ -41,20 +41,17 @@ limitations under the License. - - ChannelList + - - Lineup + - - CurrentChannel + diff --git a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml index 04fa27436383b2..14767f6429d6c5 100644 --- a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml +++ b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml @@ -121,8 +121,7 @@ limitations under the License. OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER true true - - DefaultOTAProviders + diff --git a/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml index a479da36375e4f..b3be97a2176d3c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml @@ -127,73 +127,61 @@ limitations under the License. - - CurrentHue + - - CurrentSaturation + - - RemainingTime + - - CurrentX + - - CurrentY + - - DriftCompensation + - - CompensationText + - - ColorTemperatureMireds + - - ColorMode + - - Options + - - NumberOfPrimaries + - - Primary1X + @@ -205,8 +193,7 @@ limitations under the License. - - Primary1Y + @@ -218,8 +205,7 @@ limitations under the License. - - Primary1Intensity + @@ -231,8 +217,7 @@ limitations under the License. - - Primary2X + @@ -244,8 +229,7 @@ limitations under the License. - - Primary2Y + @@ -257,8 +241,7 @@ limitations under the License. - - Primary2Intensity + @@ -270,8 +253,7 @@ limitations under the License. - - Primary3X + @@ -283,8 +265,7 @@ limitations under the License. - - Primary3Y + @@ -296,8 +277,7 @@ limitations under the License. - - Primary3Intensity + @@ -309,8 +289,7 @@ limitations under the License. - - Primary4X + @@ -322,8 +301,7 @@ limitations under the License. - - Primary4Y + @@ -335,8 +313,7 @@ limitations under the License. - - Primary4Intensity + @@ -348,8 +325,7 @@ limitations under the License. - - Primary5X + @@ -361,8 +337,7 @@ limitations under the License. - - Primary5Y + @@ -374,8 +349,7 @@ limitations under the License. - - Primary5Intensity + @@ -387,8 +361,7 @@ limitations under the License. - - Primary6X + @@ -400,8 +373,7 @@ limitations under the License. - - Primary6Y + @@ -413,8 +385,7 @@ limitations under the License. - - Primary6Intensity + @@ -426,85 +397,73 @@ limitations under the License. - - WhitePointX + - - WhitePointY + - - ColorPointRX + - - ColorPointRY + - - ColorPointRIntensity + - - ColorPointGX + - - ColorPointGY + - - ColorPointGIntensity + - - ColorPointBX + - - ColorPointBY + - - ColorPointBIntensity + - - CoupleColorTempToLevelMinMireds + @@ -512,8 +471,7 @@ limitations under the License. - - StartUpColorTemperatureMireds + @@ -675,58 +633,48 @@ limitations under the License. - - EnhancedCurrentHue + - - EnhancedColorMode + - - ColorLoopActive + - - ColorLoopDirection + - - ColorLoopTime + - - ColorLoopStartEnhancedHue + - - ColorLoopStoredEnhancedHue + - - ColorCapabilities + - - ColorTempPhysicalMinMireds + - - ColorTempPhysicalMaxMireds + diff --git a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml index 33f26e3689e5f4..1422733cc0af76 100644 --- a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml @@ -32,8 +32,7 @@ limitations under the License. - - SupportedDeviceCategories + diff --git a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml index e2116fc03cc80c..27b298ae25d14c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml @@ -58,66 +58,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -166,66 +155,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -273,66 +251,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -380,66 +347,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -487,66 +443,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -594,66 +539,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -701,66 +635,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -808,66 +731,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -915,66 +827,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -1022,66 +923,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + diff --git a/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml index e42967b581fac6..d628663fccaca4 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml @@ -43,48 +43,40 @@ limitations under the License. - - Enabled + - - OnDemandRatings + - - OnDemandRatingThreshold + - - ScheduledContentRatings + - - ScheduledContentRatingThreshold + - - ScreenDailyTime + - - RemainingScreenTime + - - BlockUnrated + diff --git a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml index 31ad15a48b93ac..4d96173013856f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml @@ -26,14 +26,12 @@ limitations under the License. This cluster provides an interface for launching content on a media player device such as a TV or Speaker. - - AcceptHeader + - - SupportedStreamingProtocols + diff --git a/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml index f34d705a2486da..b7495d2d84302d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml @@ -45,24 +45,19 @@ limitations under the License. - - DeviceTypeList + - - ServerList + - - ClientList + - - PartsList + - - TagList + diff --git a/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml index 250e3546ea8805..2d551a2d428121 100644 --- a/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml @@ -74,36 +74,29 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - - ESAType + - - ESACanGenerate + - - ESAState + - - AbsMinPower + - - AbsMaxPower + - - PowerAdjustmentCapability + - - Forecast + @@ -111,8 +104,7 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - - OptOutState + diff --git a/src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml index 470040b5c4f476..bad3b92e06179c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml @@ -59,12 +59,10 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - - SupportedModes + - - CurrentMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml index a8cf1e166219e2..f460f42a1971ae 100644 --- a/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml @@ -43,22 +43,18 @@ limitations under the License. - - Mask + - - Latch + - - State + - - Supported + diff --git a/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml index 7cc15557f0c5a1..49403ab54716be 100644 --- a/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml @@ -57,12 +57,10 @@ limitations under the License. - - SupportedModes + - - CurrentMode + StartUpMode diff --git a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml index f16bbbf28bbbba..03042ad346ff2d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml @@ -133,28 +133,23 @@ limitations under the License. cluster itself. Those attributes/commands are marked with a special comment. --> - - LockState + - - LockType + - - ActuatorEnabled + - - DoorState + - - DoorOpenEvents + @@ -162,8 +157,7 @@ limitations under the License. - - DoorClosedEvents + @@ -171,8 +165,7 @@ limitations under the License. - - OpenPeriod + @@ -180,160 +173,135 @@ limitations under the License. - - NumberOfTotalUsersSupported + - - NumberOfPINUsersSupported + - - NumberOfRFIDUsersSupported + - - NumberOfWeekDaySchedulesSupportedPerUser + - - NumberOfYearDaySchedulesSupportedPerUser + - - NumberOfHolidaySchedulesSupported + - - MaxPINCodeLength + - - MinPINCodeLength + - - MaxRFIDCodeLength + - - MinRFIDCodeLength + - - CredentialRulesSupport + - - NumberOfCredentialsSupportedPerUser + - - Language + - - LEDSettings + - - AutoRelockTime + - - SoundVolume + - - OperatingMode + - - SupportedOperatingModes + - - DefaultConfigurationRegister + - - EnableLocalProgramming + - - EnableOneTouchLocking + - - EnableInsideStatusLED + - - EnablePrivacyModeButton + - - LocalProgrammingFeatures + - - WrongCodeEntryLimit + @@ -344,8 +312,7 @@ limitations under the License. - - UserCodeTemporaryDisableTime + @@ -356,8 +323,7 @@ limitations under the License. - - SendPINOverTheAir + @@ -370,8 +336,7 @@ limitations under the License. - - RequirePINforRemoteOperation + @@ -383,8 +348,7 @@ limitations under the License. - - ExpiringUserTimeout + @@ -392,71 +356,62 @@ limitations under the License. - - AliroReaderVerificationKey + - - AliroReaderGroupIdentifier + - - AliroReaderGroupSubIdentifier + - - AliroExpeditedTransactionSupportedProtocolVersions + - - AliroGroupResolvingKey + - - AliroSupportedBLEUWBProtocolVersions + - - AliroBLEAdvertisingVersion + - - NumberOfAliroCredentialIssuerKeysSupported + - - NumberOfAliroEndpointKeysSupported + diff --git a/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml index d7e04ccf464668..752a917fd33ff6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml @@ -199,38 +199,30 @@ limitations under the License. - - LoadControlPrograms + - - NumberOfLoadControlPrograms + - - Events + - - ActiveEvents + - - NumberOfEventsPerProgram + - - NumberOfTransitions + - - DefaultRandomStart + - - DefaultRandomDuration + diff --git a/src/app/zap-templates/zcl/data-model/chip/ecosystem-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ecosystem-information-cluster.xml index 73ae522365f410..06f931ef0783d2 100644 --- a/src/app/zap-templates/zcl/data-model/chip/ecosystem-information-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/ecosystem-information-cluster.xml @@ -44,12 +44,10 @@ limitations under the License. true - - DeviceDirectory + - - LocationDirectory + diff --git a/src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml index 3fbd9e984fc2a0..c8501c412c19d5 100644 --- a/src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml @@ -42,12 +42,10 @@ limitations under the License. - - Accuracy + - - CumulativeEnergyImported + @@ -56,8 +54,7 @@ limitations under the License. - - CumulativeEnergyExported + @@ -66,8 +63,7 @@ limitations under the License. - - PeriodicEnergyImported + @@ -76,8 +72,7 @@ limitations under the License. - - PeriodicEnergyExported + @@ -85,8 +80,7 @@ limitations under the License. - - CumulativeEnergyReset + diff --git a/src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml index 18ee20bad30481..0a4fccb6b914f4 100644 --- a/src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml @@ -51,114 +51,95 @@ limitations under the License. - - PowerMode + - - NumberOfMeasurementTypes + - - Accuracy + - - Ranges + - - Voltage + - - ActiveCurrent + - - ReactiveCurrent + - - ApparentCurrent + - - ActivePower + - - ReactivePower + - - ApparentPower + - - RMSVoltage + - - RMSCurrent + - - RMSPower + - - Frequency + - - HarmonicCurrents + - - HarmonicPhases + - - PowerFactor + - - NeutralCurrent + diff --git a/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml index 97709d706abf4d..8c26a925876744 100644 --- a/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml @@ -128,44 +128,35 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - - State + - - SupplyState + - - FaultState + - - ChargingEnabledUntil + - - DischargingEnabledUntil + - - CircuitCapacity + - - MinimumChargeCurrent + - - MaximumChargeCurrent + - - MaximumDischargeCurrent + @@ -183,29 +174,25 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - - NextChargeStartTime + - - NextChargeTargetTime + - - NextChargeRequiredEnergy + - - NextChargeTargetSoC + @@ -219,41 +206,34 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - - StateOfCharge + - - BatteryCapacity + - - VehicleID + - - SessionID + - - SessionDuration + - - SessionEnergyCharged + - - SessionEnergyDischarged + diff --git a/src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml index 7c4ddac9f6f09b..52b066d7b84fdf 100644 --- a/src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml @@ -59,12 +59,10 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - - SupportedModes + - - CurrentMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/energy-preference-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/energy-preference-cluster.xml index cf646ab0197be5..19fdceb111676f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/energy-preference-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/energy-preference-cluster.xml @@ -34,16 +34,14 @@ limitations under the License. - - EnergyBalances + - - CurrentEnergyBalance + @@ -52,16 +50,14 @@ limitations under the License. - - EnergyPriorities + - - LowPowerModeSensitivities + diff --git a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml index d84f017f5eea00..5474ebaba2eb15 100644 --- a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml @@ -45,50 +45,41 @@ limitations under the License. - - PHYRate + - - FullDuplex + - - PacketRxCount + - - PacketTxCount + - - TxErrCount + - - CollisionCount + - - OverrunCount + - - CarrierDetect + - - TimeSinceReset + diff --git a/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml index 5e4b1734efb46e..67506a1827e2fe 100644 --- a/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml @@ -31,8 +31,7 @@ limitations under the License. FIXED_LABEL_CLUSTER The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only labels. - - LabelList + diff --git a/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml index b5336b50ad6406..14b22a16b19e3c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml @@ -24,20 +24,16 @@ limitations under the License. FLOW_MEASUREMENT_CLUSTER true true - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - Tolerance + diff --git a/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml index e8877b5c1cc9d9..f7f81c3f59d624 100644 --- a/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml @@ -52,30 +52,24 @@ limitations under the License. - - Breadcrumb + - - BasicCommissioningInfo + - - RegulatoryConfig + - - LocationCapability + - - SupportsConcurrentConnection + - - TCAcceptedVersion + @@ -84,8 +78,7 @@ limitations under the License. - - TCMinRequiredVersion + @@ -94,8 +87,7 @@ limitations under the License. - - TCAcknowledgements + @@ -104,8 +96,7 @@ limitations under the License. - - TCAcknowledgementsRequired + @@ -114,8 +105,7 @@ limitations under the License. - - TCUpdateDeadline + diff --git a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml index 9383517eb95a5b..c3bae609c66a21 100644 --- a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml @@ -92,42 +92,33 @@ limitations under the License. - - NetworkInterfaces + - - RebootCount + - - UpTime + - - TotalOperationalHours + - - BootReason + - - ActiveHardwareFaults + - - ActiveRadioFaults + - - ActiveNetworkFaults + - - TestEventTriggersEnabled + - - SupportedModes + - - CurrentMode + StartUpMode diff --git a/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml index 8d2326e01fb278..448b5ff0c98eec 100644 --- a/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml @@ -61,72 +61,58 @@ limitations under the License. - - CurrentLevel + - - RemainingTime + - - MinLevel + - - MaxLevel + - - CurrentFrequency + - - MinFrequency + - - MaxFrequency + - - OnOffTransitionTime + - - OnLevel + - - OnTransitionTime + - - OffTransitionTime + - - DefaultMoveRate + - - Options + - - StartUpCurrentLevel + diff --git a/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml index 34e81bbb445d0e..bd1149e9b0fa4e 100644 --- a/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml @@ -28,13 +28,11 @@ limitations under the License. standards. As such, Nodes that visually or audibly convey information need a mechanism by which they can be configured to use a user’s preferred language, units, etc - - ActiveLocale + - - SupportedLocales + diff --git a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml index 57fdda3bc7cb7f..1e1da7336593dc 100644 --- a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml @@ -32,12 +32,10 @@ limitations under the License. - - InputList + - - CurrentInput + diff --git a/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml index 1c4f2e37c8e42b..9e0896f777988c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml @@ -46,66 +46,55 @@ limitations under the License. - - CurrentState + - - StartTime + - - Duration + - - SampledPosition + - - PlaybackSpeed + - - SeekRangeEnd + - - SeekRangeStart + - - ActiveAudioTrack + - - AvailableAudioTracks + - - ActiveTextTrack + - - AvailableTextTracks + diff --git a/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml index 901e63703eee1f..52581674888a29 100644 --- a/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml @@ -91,12 +91,10 @@ limitations under the License. - - Messages + - - ActiveMessageIDs + diff --git a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml index fd44e47c2ca767..6ee5fac92c5210 100644 --- a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml @@ -41,40 +41,33 @@ limitations under the License. - - CookTime + - - MaxCookTime + - - PowerSetting + - - MinPower + - - MaxPower + - - PowerStep + - - SupportedWatts + @@ -82,8 +75,7 @@ limitations under the License. - - SelectedWattIndex + @@ -91,8 +83,7 @@ limitations under the License. - - WattRating + diff --git a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml index 393354fb4ca461..f217da41608f3d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml @@ -55,12 +55,10 @@ limitations under the License. - - SupportedModes + - - CurrentMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml index 80e0267155496b..adc776dbe68482 100644 --- a/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml @@ -48,28 +48,22 @@ limitations under the License. Attributes and commands for selecting a mode from a list of supported options. - - Description + - - StandardNamespace + - - SupportedModes + - - CurrentMode + - - StartUpMode + - - OnMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml index 02fcb28ee2e14b..33533dfa24d4e7 100644 --- a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml @@ -114,18 +114,15 @@ limitations under the License. - - MaxNetworks + - - Networks + - - ScanMaxTimeSeconds + @@ -133,50 +130,42 @@ limitations under the License. - - ConnectMaxTimeSeconds + - - - InterfaceEnabled + + - - LastNetworkingStatus + - - LastNetworkID + - - LastConnectErrorValue + - - SupportedWiFiBands + - - SupportedThreadFeatures + - - ThreadVersion + diff --git a/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml index 90f1a6a9f497a7..414eb2c287e5e7 100644 --- a/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml @@ -83,40 +83,34 @@ limitations under the License. - - Occupancy + - - OccupancySensorType + - - OccupancySensorTypeBitmap + - - HoldTime + - - HoldTimeLimits + - - PIROccupiedToUnoccupiedDelay + @@ -143,8 +137,7 @@ limitations under the License. - - PIRUnoccupiedToOccupiedDelay + @@ -193,8 +186,7 @@ limitations under the License. - - PIRUnoccupiedToOccupiedThreshold + @@ -243,8 +235,7 @@ limitations under the License. - - UltrasonicOccupiedToUnoccupiedDelay + @@ -258,8 +249,7 @@ limitations under the License. - - UltrasonicUnoccupiedToOccupiedDelay + @@ -280,8 +270,7 @@ limitations under the License. - - UltrasonicUnoccupiedToOccupiedThreshold + @@ -302,8 +291,7 @@ limitations under the License. - - PhysicalContactOccupiedToUnoccupiedDelay + @@ -317,8 +305,7 @@ limitations under the License. - - PhysicalContactUnoccupiedToOccupiedDelay + @@ -339,8 +326,7 @@ limitations under the License. - - PhysicalContactUnoccupiedToOccupiedThreshold + diff --git a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml index c1e87fd1ceb37d..6ed5cfec078a96 100644 --- a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml @@ -82,30 +82,25 @@ limitations under the License. - - OnOff + - - GlobalSceneControl + - - OnTime + - - OffWaitTime + - - StartUpOnOff + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml index 8be3ce077a2732..61dd99e58b5d29 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml @@ -59,29 +59,23 @@ limitations under the License. OPERATIONAL_CREDENTIALS_CLUSTER This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. - - NOCs + - - Fabrics + - - SupportedFabrics + - - CommissionedFabrics + - - TrustedRootCertificates + - - CurrentFabricIndex + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml index 9bc60ae2f73fef..07b874e4626c5f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml @@ -61,28 +61,22 @@ limitations under the License. - - PhaseList + - - CurrentPhase + - - CountdownTime + - - OperationalStateList + - - OperationalState + - - OperationalError + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml index 800506d73c6079..0b18947c5dd666 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml @@ -54,28 +54,22 @@ limitations under the License. - - PhaseList + - - CurrentPhase + - - CountdownTime + - - OperationalStateList + - - OperationalState + - - OperationalError + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml index 3c762879309e5c..bf09a56329f7a1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml @@ -67,20 +67,16 @@ limitations under the License. - - PhaseList + - - CurrentPhase + - - CountdownTime + - - OperationalStateList + @@ -89,12 +85,10 @@ The type of this attribute in the spec is OperationalStateEnum, but the Operatio excludes the values from the base OperationalState cluster. Just use ENUM8 for the type, so it allows both values from this cluster and from the base cluster. --> - - OperationalState + - - OperationalError + diff --git a/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml index 8a54783445013f..ff71dcc12cbfe3 100644 --- a/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml @@ -62,12 +62,10 @@ limitations under the License. - - SupportedModes + - - CurrentMode + StartUpMode diff --git a/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml index 8bbfe444227f1d..16b0c0c30787a0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml @@ -44,148 +44,123 @@ limitations under the License. - - Status + - - Order + - - Description + - - WiredAssessedInputVoltage + - - WiredAssessedInputFrequency + - - WiredCurrentType + - - WiredAssessedCurrent + - - WiredNominalVoltage + - - WiredMaximumCurrent + - - WiredPresent + - - ActiveWiredFaults + - - BatVoltage + - - BatPercentRemaining + - - BatTimeRemaining + - - BatChargeLevel + - - BatReplacementNeeded + - - BatReplaceability + - - BatPresent + - - ActiveBatFaults + - - BatReplacementDescription + - - BatCommonDesignation + - - BatANSIDesignation + - - BatIECDesignation + - - BatApprovedChemistry + - - BatCapacity + @@ -193,44 +168,37 @@ limitations under the License. - - BatQuantity + - - BatChargeState + - - BatTimeToFullCharge + - - BatFunctionalWhileCharging + - - BatChargingCurrent + - - ActiveBatChargeFaults + - - EndpointList + diff --git a/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml index ba97841d3492e0..ee99575b3b5cc6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml @@ -26,8 +26,7 @@ limitations under the License. true true - - Sources + diff --git a/src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml index c686115edcb8cb..9d5aa74931a6e4 100644 --- a/src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml @@ -44,14 +44,12 @@ limitations under the License. - - AvailableEndpoints + - - ActiveEndpoints + diff --git a/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml index 04100e82379f2d..61f9ccc1401a2b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml @@ -32,48 +32,39 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - Tolerance + - - ScaledValue + - - MinScaledValue + - - MaxScaledValue + - - ScaledTolerance + - - Scale + diff --git a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml index b23ad516515b11..0158c4077da4d3 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml @@ -50,20 +50,16 @@ limitations under the License. - - MaxPressure + - - MaxSpeed + - - MaxFlow + - - MinConstPressure + @@ -73,8 +69,7 @@ limitations under the License. - - MaxConstPressure + @@ -84,8 +79,7 @@ limitations under the License. - - MinCompPressure + @@ -95,8 +89,7 @@ limitations under the License. - - MaxCompPressure + @@ -106,8 +99,7 @@ limitations under the License. - - MinConstSpeed + @@ -117,8 +109,7 @@ limitations under the License. - - MaxConstSpeed + @@ -128,8 +119,7 @@ limitations under the License. - - MinConstFlow + @@ -139,8 +129,7 @@ limitations under the License. - - MaxConstFlow + @@ -150,8 +139,7 @@ limitations under the License. - - MinConstTemp + @@ -161,8 +149,7 @@ limitations under the License. - - MaxConstTemp + @@ -172,50 +159,40 @@ limitations under the License. - - PumpStatus + - - EffectiveOperationMode + - - EffectiveControlMode + - - Capacity + - - Speed + - - LifetimeRunningHours + - - Power + - - LifetimeEnergyConsumed + - - OperationMode + - - ControlMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml b/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml index deeb16b4dae3d7..ca091a5deab23e 100644 --- a/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml +++ b/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml @@ -29,16 +29,13 @@ limitations under the License. true true - - Mask + - - State + - - Supported + diff --git a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml index a4fe78bc225d65..7ed1160ce7410c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml @@ -56,12 +56,10 @@ limitations under the License. - - SupportedModes + - - CurrentMode + StartUpMode diff --git a/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml index 7f8157572a4270..047258fcbb87f6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml @@ -25,20 +25,16 @@ limitations under the License. true true - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - Tolerance + diff --git a/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml index 25e586226f0d82..d85bf3dfb5c7ba 100644 --- a/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml @@ -38,32 +38,26 @@ limitations under the License. - - Condition + - - DegradationDirection + - - ChangeIndication + - - InPlaceIndicator + - - LastChangedTime + - - ReplacementProductList + @@ -98,32 +92,26 @@ limitations under the License. - - Condition + - - DegradationDirection + - - ChangeIndication + - - InPlaceIndicator + - - LastChangedTime + - - ReplacementProductList + diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml index a1fe4809ee1e17..f3ac53b22d3bdc 100644 --- a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml @@ -67,12 +67,10 @@ limitations under the License. - - SupportedModes + - - CurrentMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml index 6cd765db7fab84..2ca053546c2234 100644 --- a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml @@ -73,12 +73,10 @@ limitations under the License. - - SupportedModes + - - CurrentMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/scene.xml b/src/app/zap-templates/zcl/data-model/chip/scene.xml index dcc929fa47e872..ceea35e3759e69 100644 --- a/src/app/zap-templates/zcl/data-model/chip/scene.xml +++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml @@ -80,16 +80,13 @@ limitations under the License. - - LastConfiguredBy + - - SceneTableSize + - - FabricSceneInfo + diff --git a/src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml index c442136d46aa0a..f74647a260e8c0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml @@ -96,31 +96,25 @@ limitations under the License. - - SupportedAreas + - - SupportedMaps + - - SelectedAreas + - - CurrentArea + - - EstimatedEndTime + - - Progress + diff --git a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml index a0543e04373dd5..e5a3afb75d39d6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml @@ -46,65 +46,52 @@ limitations under the License. - - ExpressedState + - - SmokeState + - - COState + - - BatteryAlert + - - DeviceMuted + - - TestInProgress + - - HardwareFaultAlert + - - EndOfServiceAlert + - - InterconnectSmokeAlarm + - - InterconnectCOAlarm + - - ContaminationState + - - SmokeSensitivityLevel + - - ExpiryDate + diff --git a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml index d0973998fa98d6..9d4026187f2420 100644 --- a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml @@ -37,20 +37,16 @@ limitations under the License. - - ThreadMetrics + - - CurrentHeapFree + - - CurrentHeapUsed + - - CurrentHeapHighWatermark + diff --git a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml index 90f61cdedcfbc8..1ab3f1d9509cb3 100644 --- a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml @@ -78,16 +78,13 @@ Interactions with the switch device are exposed as attributes (for the latching - - NumberOfPositions + - - CurrentPosition + - - MultiPressMax + diff --git a/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml index c7d516bcdc7416..86edb7478da629 100644 --- a/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml @@ -25,12 +25,10 @@ limitations under the License. true This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. - - TargetList + - - CurrentTarget + diff --git a/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml index 2c7c173c6af8ff..b3f7b6a86b03a0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml @@ -40,38 +40,32 @@ limitations under the License. - - TemperatureSetpoint + - - MinTemperature + - - MaxTemperature + - - Step + - - SelectedTemperatureLevel + - - SupportedTemperatureLevels + diff --git a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml index 45317b7b433894..8b5a4ac7302510 100644 --- a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml @@ -24,20 +24,16 @@ limitations under the License. TEMPERATURE_MEASUREMENT_CLUSTER true true - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - Tolerance + diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml index 9a409b7a89c1bd..d52c730d05ddc9 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml @@ -312,63 +312,52 @@ limitations under the License. - - LocalTemperature + - - OutdoorTemperature + - - Occupancy + - - AbsMinHeatSetpointLimit + - - AbsMaxHeatSetpointLimit + - - AbsMinCoolSetpointLimit + - - AbsMaxCoolSetpointLimit + - - PICoolingDemand + - - PIHeatingDemand + - - HVACSystemTypeConfiguration + - - LocalTemperatureCalibration + @@ -376,20 +365,17 @@ limitations under the License. - - OccupiedCoolingSetpoint + - - OccupiedHeatingSetpoint + - - UnoccupiedCoolingSetpoint + @@ -397,8 +383,7 @@ limitations under the License. - - UnoccupiedHeatingSetpoint + @@ -406,132 +391,109 @@ limitations under the License. - - MinHeatSetpointLimit + - - MaxHeatSetpointLimit + - - MinCoolSetpointLimit + - - MaxCoolSetpointLimit + - - MinSetpointDeadBand + - - RemoteSensing + - - ControlSequenceOfOperation + - - SystemMode + - - ThermostatRunningMode + - - StartOfWeek + - - NumberOfWeeklyTransitions + - - NumberOfDailyTransitions + - - TemperatureSetpointHold + - - TemperatureSetpointHoldDuration + - - ThermostatProgrammingOperationMode + - - ThermostatRunningState + - - SetpointChangeSource + - - SetpointChangeAmount + - - SetpointChangeSourceTimestamp + - - OccupiedSetback + - - OccupiedSetbackMin + - - OccupiedSetbackMax + - - UnoccupiedSetback + @@ -540,8 +502,7 @@ limitations under the License. - - UnoccupiedSetbackMin + @@ -549,8 +510,7 @@ limitations under the License. - - UnoccupiedSetbackMax + @@ -558,114 +518,94 @@ limitations under the License. - - EmergencyHeatDelta + - - ACType + - - ACCapacity + - - ACRefrigerantType + - - ACCompressorType + - - ACErrorCode + - - ACLouverPosition + - - ACCoilTemperature + - - ACCapacityformat + - - PresetTypes + - - ScheduleTypes + - - NumberOfPresets + - - NumberOfSchedules + - - NumberOfScheduleTransitions + - - NumberOfScheduleTransitionPerDay + - - ActivePresetHandle + - - ActiveScheduleHandle + - - Presets + - - Schedules + - - SetpointHoldExpiryTimestamp + diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml index a95a9a31f32d9e..ed0b412570f3dd 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml @@ -29,20 +29,17 @@ limitations under the License. - - TemperatureDisplayMode + - - KeypadLockout + - - ScheduleProgrammingVisibility + diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml index 84132e495cf4c0..38612b5eb6d117 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml @@ -33,33 +33,27 @@ limitations under the License. - - BorderRouterName + - - BorderAgentID + - - ThreadVersion + - - InterfaceEnabled + - - ActiveDatasetTimestamp + - - PendingDatasetTimestamp + diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml index 8804d64e30c7c1..943f69f58f9378 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml @@ -108,342 +108,279 @@ limitations under the License. - - Channel + - - RoutingRole + - - NetworkName + - - PanId + - - ExtendedPanId + - - MeshLocalPrefix + - - OverrunCount + - - NeighborTable + - - RouteTable + - - PartitionId + - - Weighting + - - DataVersion + - - StableDataVersion + - - LeaderRouterId + - - DetachedRoleCount + - - ChildRoleCount + - - RouterRoleCount + - - LeaderRoleCount + - - AttachAttemptCount + - - PartitionIdChangeCount + - - BetterPartitionAttachAttemptCount + - - ParentChangeCount + - - TxTotalCount + - - TxUnicastCount + - - TxBroadcastCount + - - TxAckRequestedCount + - - TxAckedCount + - - TxNoAckRequestedCount + - - TxDataCount + - - TxDataPollCount + - - TxBeaconCount + - - TxBeaconRequestCount + - - TxOtherCount + - - TxRetryCount + - - TxDirectMaxRetryExpiryCount + - - TxIndirectMaxRetryExpiryCount + - - TxErrCcaCount + - - TxErrAbortCount + - - TxErrBusyChannelCount + - - RxTotalCount + - - RxUnicastCount + - - RxBroadcastCount + - - RxDataCount + - - RxDataPollCount + - - RxBeaconCount + - - RxBeaconRequestCount + - - RxOtherCount + - - RxAddressFilteredCount + - - RxDestAddrFilteredCount + - - RxDuplicatedCount + - - RxErrNoFrameCount + - - RxErrUnknownNeighborCount + - - RxErrInvalidSrcAddrCount + - - RxErrSecCount + - - RxErrFcsCount + - - RxErrOtherCount + - - ActiveTimestamp + - - PendingTimestamp + - - Delay + - - SecurityPolicy + - - ChannelPage0Mask + - - OperationalDatasetComponents + - - ActiveNetworkFaultsList + diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml index 8f997cebc46d2f..2b00af31024a29 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml @@ -38,19 +38,16 @@ limitations under the License. - - PreferredExtendedPanID + - - ThreadNetworks + - - ThreadNetworkTableSize + diff --git a/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml index bfc2222ef35a4a..b71b710b707471 100644 --- a/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml @@ -58,20 +58,17 @@ limitations under the License. - - HourFormat + - - ActiveCalendarType + - - SupportedCalendarTypes + diff --git a/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml index 201f71a201e523..a352b2a181b8e8 100644 --- a/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml @@ -114,74 +114,61 @@ limitations under the License. - - UTCTime + - - Granularity + - - TimeSource + - - TrustedTimeSource + - - DefaultNTP + - - TimeZone + - - DSTOffset + - - LocalTime + - - TimeZoneDatabase + - - NTPServerAvailable + - - TimeZoneListMaxSize + - - DSTOffsetListMaxSize + - - SupportsDNSResolve + diff --git a/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml index 0deb6225eedab9..d79a265f633a39 100644 --- a/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml @@ -42,8 +42,7 @@ limitations under the License. - - TemperatureUnit + diff --git a/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml index 14ffa15b70bd11..acea3035a4029f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml @@ -23,8 +23,7 @@ limitations under the License. 0x0041 USER_LABEL_CLUSTER The User Label Cluster provides a feature to tag an endpoint with zero or more labels. - - LabelList + diff --git a/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml index 052a08108a69da..6656876c991c92 100644 --- a/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml @@ -59,58 +59,47 @@ limitations under the License. - - OpenDuration + - - DefaultOpenDuration + - - AutoCloseTime + - - RemainingDuration + - - CurrentState + - - TargetState + - - CurrentLevel + - - TargetLevel + - - DefaultOpenLevel + - - ValveFault + - - LevelStep + diff --git a/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml index 50c88a02726515..700f25b1986b3a 100644 --- a/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml @@ -28,12 +28,10 @@ limitations under the License. - - MACAddress + - - LinkLocalAddress + diff --git a/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml index 663f13dfcc1271..d566acb28cf306 100644 --- a/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml @@ -46,26 +46,22 @@ limitations under the License. - - SpinSpeeds + - - SpinSpeedCurrent + - - NumberOfRinses + - - SupportedRinses + diff --git a/src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml index 6e5c56e21f9670..60fc9ce3e0f009 100644 --- a/src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml @@ -64,34 +64,28 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 true - - HeaterTypes + - - HeatDemand + - - TankVolume + - - EstimatedHeatRequired + - - TankPercentage + - - BoostState + diff --git a/src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml index 89d8b78436337c..a1d3b27255f98c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml @@ -58,12 +58,10 @@ Git: 1.4-prerelease-ipr-69-ge15ff5700 - - SupportedModes + - - CurrentMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml index f2a68e977bf965..784568337b9773 100644 --- a/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml @@ -64,68 +64,55 @@ limitations under the License. - - BSSID + - - SecurityType + - - WiFiVersion + - - ChannelNumber + - - RSSI + - - BeaconLostCount + - - BeaconRxCount + - - PacketMulticastRxCount + - - PacketMulticastTxCount + - - PacketUnicastRxCount + - - PacketUnicastTxCount + - - CurrentMaxRate + - - OverrunCount + diff --git a/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml index c5246f6acddfc2..1c14050fc24451 100644 --- a/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml @@ -30,12 +30,10 @@ limitations under the License. - - SSID + - - PassphraseSurrogate + diff --git a/src/app/zap-templates/zcl/data-model/chip/window-covering.xml b/src/app/zap-templates/zcl/data-model/chip/window-covering.xml index 1363b5c8aa4c9d..5795e8efc34a88 100644 --- a/src/app/zap-templates/zcl/data-model/chip/window-covering.xml +++ b/src/app/zap-templates/zcl/data-model/chip/window-covering.xml @@ -57,13 +57,11 @@ limitations under the License. - - Type + - - PhysicalClosedLimitLift + @@ -73,8 +71,7 @@ limitations under the License. - - PhysicalClosedLimitTilt + @@ -84,8 +81,7 @@ limitations under the License. - - CurrentPositionLift + @@ -95,8 +91,7 @@ limitations under the License. - - CurrentPositionTilt + @@ -106,27 +101,23 @@ limitations under the License. - - NumberOfActuationsLift + - - NumberOfActuationsTilt + - - ConfigStatus + - - CurrentPositionLiftPercentage + @@ -135,8 +126,7 @@ limitations under the License. - - CurrentPositionTiltPercentage + @@ -145,13 +135,11 @@ limitations under the License. - - OperationalStatus + - - TargetPositionLiftPercent100ths + @@ -160,8 +148,7 @@ limitations under the License. - - TargetPositionTiltPercent100ths + @@ -170,13 +157,11 @@ limitations under the License. - - EndProductType + - - CurrentPositionLiftPercent100ths + @@ -185,8 +170,7 @@ limitations under the License. - - CurrentPositionTiltPercent100ths + @@ -196,8 +180,7 @@ limitations under the License. - - InstalledOpenLimitLift + @@ -206,8 +189,7 @@ limitations under the License. - - InstalledClosedLimitLift + @@ -217,8 +199,7 @@ limitations under the License. - - InstalledOpenLimitTilt + @@ -227,8 +208,7 @@ limitations under the License. - - InstalledClosedLimitTilt + @@ -242,8 +222,7 @@ limitations under the License. - - Mode + @@ -252,8 +231,7 @@ limitations under the License. - - SafetyStatus +