From 7493045bb2369907a380f3451eb9692f8b23698e Mon Sep 17 00:00:00 2001 From: Bharat Dandu Date: Wed, 10 Apr 2024 15:19:03 -0400 Subject: [PATCH 01/10] Updating the existing xml with features per cluster and features per device type JIRA: ZAPP-1346 --- .../administrator-commissioning-cluster.xml | 5 + .../data-model/chip/air-quality-cluster.xml | 15 + .../chip/application-launcher-cluster.xml | 6 + .../data-model/chip/audio-output-cluster.xml | 7 + .../boolean-state-configuration-cluster.xml | 20 ++ .../zcl/data-model/chip/channel-cluster.xml | 16 + .../data-model/chip/color-control-cluster.xml | 18 ++ .../concentration-measurement-cluster.xml | 29 ++ .../chip/content-control-cluster.xml | 28 ++ .../chip/content-launch-cluster.xml | 18 ++ .../data-model/chip/descriptor-cluster.xml | 4 + .../chip/device-energy-management-cluster.xml | 67 +++++ .../zcl/data-model/chip/door-lock-cluster.xml | 55 ++++ .../zcl/data-model/chip/drlc-cluster.xml | 24 ++ .../electrical-energy-measurement-cluster.xml | 16 + .../electrical-power-measurement-cluster.xml | 25 ++ .../data-model/chip/energy-evse-cluster.xml | 18 ++ .../chip/energy-preference-cluster.xml | 9 + .../data-model/chip/fan-control-cluster.xml | 21 ++ .../chip/group-key-mgmt-cluster.xml | 7 + .../zcl/data-model/chip/groups-cluster.xml | 6 + .../chip/icd-management-cluster.xml | 27 ++ .../data-model/chip/keypad-input-cluster.xml | 12 + .../chip/laundry-washer-mode-cluster.xml | 10 + .../data-model/chip/level-control-cluster.xml | 14 + .../zcl/data-model/chip/matter-devices.xml | 280 ++++++++++++++++-- .../data-model/chip/media-input-cluster.xml | 6 + .../chip/media-playback-cluster.xml | 19 ++ .../zcl/data-model/chip/messages-cluster.xml | 20 ++ .../chip/microwave-oven-control-cluster.xml | 15 + .../data-model/chip/mode-select-cluster.xml | 6 + .../chip/network-commissioning-cluster.xml | 12 + .../zcl/data-model/chip/onoff-cluster.xml | 27 ++ .../data-model/chip/power-source-cluster.xml | 19 ++ .../chip/power-topology-cluster.xml | 18 ++ .../chip/pressure-measurement-cluster.xml | 7 + ...pump-configuration-and-control-cluster.xml | 25 ++ .../data-model/chip/refrigerator-alarm.xml | 7 + .../chip/resource-monitoring-cluster.xml | 12 + .../zcl/data-model/chip/scene.xml | 6 + .../chip/smoke-co-alarm-cluster.xml | 9 + .../zcl/data-model/chip/switch-cluster.xml | 30 ++ .../chip/temperature-control-cluster.xml | 15 + .../data-model/chip/thermostat-cluster.xml | 39 +++ .../chip/time-synchronization-cluster.xml | 15 + ...alve-configuration-and-control-cluster.xml | 7 + .../zcl/data-model/chip/window-covering.xml | 22 ++ 47 files changed, 1076 insertions(+), 17 deletions(-) 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 0668f2dea4ae7c..68c56e5984c809 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 @@ -38,6 +38,11 @@ limitations under the License. ADMINISTRATOR_COMMISSIONING_CLUSTER Commands to trigger a Node to allow a new Administrator to commission it. + + + + + 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 f2ce941007bf59..3a20b02aaa3d85 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 @@ -25,6 +25,21 @@ limitations under the License. true true + + + + + + + + + + + + + + + AirQuality 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 7a50d97d666b5f..d2b1b8049e1e58 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 @@ -25,6 +25,12 @@ limitations under the License. true This cluster provides an interface for launching content on a media player device such as a TV or Speaker. + + + + + + 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 2067d048d4e569..1705d645613970 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 @@ -24,6 +24,13 @@ limitations under the License. true true This cluster provides an interface for controlling the Output on a media device such as a TV. + + + + + + + OutputList CurrentOutput 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 2b5f81eed744e1..95939510fa944b 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 @@ -46,6 +46,26 @@ limitations under the License. This cluster is used to configure a boolean sensor. + + + + + + + + + + + + + + + + + + + + CurrentSensitivityLevel SupportedSensitivityLevels DefaultSensitivityLevel 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 460fedd40c89c1..26e0ea47327b5d 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 @@ -25,6 +25,22 @@ limitations under the License. true This cluster provides an interface for controlling the current Channel on a device. + + + + + + + + + + + + + + + + ChannelList Lineup CurrentChannel 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 0dcb76abac44ea..6be1804befb948 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 @@ -107,6 +107,24 @@ limitations under the License. + + + + + + + + + + + + + + + + + + CurrentHue CurrentSaturation 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 c671c5b3e58373..c14a56f547ef4a 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 @@ -29,6 +29,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue 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 d8077e9e9276cc..4bda93902c6e3f 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 @@ -24,6 +24,34 @@ limitations under the License. true true This cluster is used for managing the content control (including "parental control") settings on a media device such as a TV, or Set-top Box. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Enabled OnDemandRatings OnDemandRatingThreshold 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 037998053d512f..854f3072a11283 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,6 +26,24 @@ 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 f95d2acb1b2f40..d66330023eb6fc 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,6 +45,10 @@ limitations under the License. + + + + DeviceTypeList ServerList ClientList 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 85762181765590..ccbca9ecd49a5e 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 @@ -37,6 +37,73 @@ limitations under the License. This cluster allows a client to manage the power draw of a device. An example of such a client could be an Energy Management System (EMS) which controls an Energy Smart Appliance (ESA). + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ESAType ESACanGenerate 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 1c179f9324422a..03c4657e491d59 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 @@ -64,6 +64,61 @@ limitations under the License. true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Accuracy CumulativeEnergyImported 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 e723982ee0ffe8..79fc3297f409a1 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 @@ -33,6 +33,31 @@ limitations under the License. true This cluster provides a mechanism for querying data about electrical power as measured by the server. + + + + + + + + + + + + + + + + + + + + + + + + + PowerMode NumberOfMeasurementTypes 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 107cc9cab7b103..12506f34e8d240 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 @@ -96,6 +96,24 @@ limitations under the License. Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management. + + + + + + + + + + + + + + + + + + State 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 32893bd82a68e9..2ce1aaf6c0ad93 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 @@ -24,6 +24,15 @@ limitations under the License. + + + + + + + + + EnergyBalances diff --git a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml index c2deff336eae46..0255634b58fd32 100644 --- a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml @@ -85,6 +85,27 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + FanMode FanModeSequence PercentSetting diff --git a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml index 41eefa1008eaf0..433a1aa46114b3 100644 --- a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml @@ -59,6 +59,13 @@ limitations under the License. 0x003F GROUP_KEY_MANAGEMENT_CLUSTER The Group Key Management Cluster is the mechanism by which group keys are managed. + + + + + + + GroupKeyMap diff --git a/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml index ce1289e71e529e..51b6bd734b16bc 100644 --- a/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml @@ -39,6 +39,12 @@ limitations under the License. + + + + + + NameSupport diff --git a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml index d68cc30ea95f9c..5b3b7ab2425f45 100644 --- a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml @@ -71,6 +71,33 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + IdleModeDuration ActiveModeDuration ActiveModeThreshold 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 d4f6ffbba9a742..3c86093417c973 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 @@ -25,6 +25,18 @@ limitations under the License. true This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. + + + + + + + + + + + + Upon receipt, this SHALL process a keycode as input to the media device. 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 fff4fdcaac0dfb..419f5a2a57c746 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 @@ -34,6 +34,16 @@ limitations under the License. true Attributes and commands for selecting a mode from a list of supported options. + + + + + + + + + + SupportedModes CurrentMode 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 dca3fb6f3532d1..c8fc95a6fd8bba 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 @@ -54,6 +54,20 @@ limitations under the License. + + + + + + + + + + + + CurrentLevel RemainingTime MinLevel diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml index 96ed6fdc2da625..795f7a71cf54bc 100644 --- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml +++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml @@ -86,7 +86,18 @@ limitations under the License. - + + + + + + + + + + + + @@ -253,6 +264,11 @@ limitations under the License. CopySceneResponse + + + + + ON_OFF GLOBAL_SCENE_CONTROL ON_TIME @@ -266,6 +282,14 @@ limitations under the License. OnWithTimedOff + + + + + + + + CURRENT_LEVEL OPTIONS LEVEL_CONTROL_REMAINING_TIME @@ -341,6 +365,11 @@ limitations under the License. CopySceneResponse + + + + + ON_OFF GLOBAL_SCENE_CONTROL ON_TIME @@ -354,6 +383,14 @@ limitations under the License. OnWithTimedOff + + + + + + + + CURRENT_LEVEL OPTIONS LEVEL_CONTROL_REMAINING_TIME @@ -426,6 +463,11 @@ limitations under the License. CopySceneResponse + + + + + ON_OFF GLOBAL_SCENE_CONTROL ON_TIME @@ -439,6 +481,14 @@ limitations under the License. OnWithTimedOff + + + + + + + + CURRENT_LEVEL OPTIONS LEVEL_CONTROL_REMAINING_TIME @@ -455,6 +505,11 @@ limitations under the License. StopWithOnOff + + + + + COLOR_CONTROL_REMAINING_TIME COLOR_CONTROL_COLOR_TEMPERATURE COLOR_CONTROL_COLOR_MODE @@ -525,6 +580,11 @@ limitations under the License. GetSceneMembershipResponse + + + + + ON_OFF GLOBAL_SCENE_CONTROL ON_TIME @@ -538,6 +598,14 @@ limitations under the License. OnWithTimedOff + + + + + + + + CURRENT_LEVEL OPTIONS LEVEL_CONTROL_REMAINING_TIME @@ -554,6 +622,23 @@ limitations under the License. StopWithOnOff + + + + + + + + + + + + + + + + + COLOR_CONTROL_REMAINING_TIME COLOR_CONTROL_CURRENT_X COLOR_CONTROL_CURRENT_Y @@ -628,6 +713,11 @@ limitations under the License. GetSceneMembershipResponse + + + + + ON_OFF GLOBAL_SCENE_CONTROL ON_TIME @@ -641,6 +731,14 @@ limitations under the License. OnWithTimedOff + + + + + + + + CURRENT_LEVEL OPTIONS LEVEL_CONTROL_REMAINING_TIME @@ -709,6 +807,11 @@ limitations under the License. GetSceneMembershipResponse + + + + + ON_OFF GLOBAL_SCENE_CONTROL ON_TIME @@ -722,6 +825,14 @@ limitations under the License. OnWithTimedOff + + + + + + + + CURRENT_LEVEL OPTIONS LEVEL_CONTROL_REMAINING_TIME @@ -1377,7 +1488,29 @@ limitations under the License. CLIENT_LIST PARTS_LIST - + + + + + + + + + + + + + + + + + + + + + + + @@ -1457,7 +1590,15 @@ limitations under the License. RemoveAllGroups AddGroupIfIdentifying - + + + + + + + + + @@ -1486,7 +1627,15 @@ limitations under the License. - + + + + + + + + + @@ -1674,7 +1823,13 @@ limitations under the License. - + + + + + + + @@ -1829,7 +1984,13 @@ limitations under the License. - + + + + + + + @@ -1877,6 +2038,11 @@ limitations under the License. Identify + + + + + ON_OFF Off On @@ -1976,10 +2142,22 @@ limitations under the License. Endpoint - + + + + + + + - + + + + + + + @@ -2008,7 +2186,16 @@ limitations under the License. - + + + + + + + + + + @@ -2025,7 +2212,13 @@ limitations under the License. - + + + + + + + @@ -2040,8 +2233,20 @@ limitations under the License. - - + + + + + + + + + + + + + + @@ -2058,8 +2263,20 @@ limitations under the License. - - + + + + + + + + + + + + + + @@ -2078,7 +2295,19 @@ limitations under the License. - + + + + + + + + + + + + + @@ -2110,8 +2339,20 @@ limitations under the License. - - + + + + + + + + + + + + + + @@ -2375,6 +2616,11 @@ limitations under the License. + + + + + 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 028ab467af7c0c..8cc67939a0fa21 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 @@ -26,6 +26,12 @@ limitations under the License. This cluster provides an interface for controlling the Input Selector on a media device such as a TV. + + + + + + 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 32c2da12ed0780..8bfe6a23a8e765 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 @@ -27,6 +27,25 @@ limitations under the License. This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. + + + + + + + + + + + + + + + + + + + CurrentState StartTime Duration 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 16b1527625d320..57d2d7cb4f97fd 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 @@ -78,6 +78,26 @@ limitations under the License. true true + + + + + + + + + + + + + + + + + + + + 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 ab13fc51e10f29..89b6b124b011e1 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 @@ -32,6 +32,21 @@ limitations under the License. MICROWAVE_OVEN_CONTROL_CLUSTER true true + + + + + + + + + + + + + + + CookTime MaxCookTime PowerSetting 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 0462a48e8bc513..7161fabca998ee 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 @@ -40,6 +40,12 @@ limitations under the License. + + + + + + Attributes and commands for selecting a mode from a list of supported options. Description 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 340effa347298d..4c9d45c994ba80 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 @@ -105,6 +105,18 @@ limitations under the License. true true + + + + + + + + + + + + MaxNetworks 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 b5b5aa913229e8..7ad697015f856b 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 @@ -55,6 +55,33 @@ limitations under the License. Attributes and commands for switching devices between 'On' and 'Off' states. + + + + + + + + + + + + + + + + + + + + + + + + + + + OnOff GlobalSceneControl OnTime 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 913df128cc758e..0dc3d17a198091 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 @@ -24,6 +24,25 @@ limitations under the License. true true This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. + + + + + + + + + + + + + + + + + + + Status Order 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 9eef1e03c6c023..46fe4d661267df 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 @@ -32,6 +32,24 @@ limitations under the License. true true + + + + + + + + + + + + + + + + + + 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 f66c546abd60ce..aa8caaff443a28 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 @@ -25,6 +25,13 @@ limitations under the License. true true + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue 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 7aa34bc6554b68..747537803d6545 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 @@ -25,6 +25,31 @@ limitations under the License. true true + + + + + + + + + + + + + + + + + + + + + + + + + MaxPressure MaxSpeed MaxFlow 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 21bf7da48bd02e..126d0412e9efbb 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,6 +28,13 @@ limitations under the License. REFRIGERATOR_ALARM_CLUSTER true true + + + + + + + Mask State Supported 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 4be5dbddc12478..a47c972fded3ae 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 @@ -25,6 +25,18 @@ limitations under the License. true true + + + + + + + + + + + + Condition DegradationDirection 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 e16047b9c14c07..3d6fbc07f15846 100644 --- a/src/app/zap-templates/zcl/data-model/chip/scene.xml +++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml @@ -51,6 +51,12 @@ limitations under the License. true true + + + + + + LastConfiguredBy SceneTableSize 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 c6827dd1c4bd48..1dcdd2dfc3b870 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 @@ -36,6 +36,15 @@ limitations under the License. + + + + + + + + + ExpressedState SmokeState 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 7df57e3ebd26c1..93d80b60043a2a 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 @@ -30,6 +30,36 @@ 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/temperature-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml index 7509e9b44579cb..eb4ace3b32f556 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 @@ -25,6 +25,21 @@ limitations under the License. TEMPERATURE_CONTROL_CLUSTER true true + + + + + + + + + + + + + + + TemperatureSetpoint MinTemperature MaxTemperature 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 948c0937a3fd10..2e910e386d71cc 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 @@ -290,6 +290,45 @@ limitations under the License. true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LocalTemperature 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 17271c56352c03..54ae6a7215c1aa 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 @@ -106,6 +106,21 @@ limitations under the License. Accurate time is required for a number of reasons, including scheduling, display and validating security materials. + + + + + + + + + + + + + + + UTCTime Granularity TimeSource 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 0818b3637c892a..0c8e65cf7ff788 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 @@ -55,6 +55,13 @@ limitations under the License. This cluster is used to configure a valve. + + + + + + + OpenDuration 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 e98329a72812a0..d12498901652dc 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 @@ -33,6 +33,28 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + Type From 54077d59984da5eb58f03daf7baa75d3cab9f3da Mon Sep 17 00:00:00 2001 From: Bharat Dandu Date: Fri, 12 Apr 2024 16:40:57 -0400 Subject: [PATCH 02/10] Removing bitmap name=feature in favor of features which can be used to populate the bitmap JIRA: ZAPP-1346 --- src/app/zap-templates/app-templates.json | 1 + .../administrator-commissioning-cluster.xml | 5 --- .../data-model/chip/air-quality-cluster.xml | 9 ------ .../chip/application-launcher-cluster.xml | 5 --- .../data-model/chip/audio-output-cluster.xml | 5 --- .../boolean-state-configuration-cluster.xml | 8 ----- .../zcl/data-model/chip/channel-cluster.xml | 8 ----- .../data-model/chip/color-control-cluster.xml | 9 +----- .../concentration-measurement-cluster.xml | 20 ------------ .../chip/content-control-cluster.xml | 9 ------ .../chip/content-launch-cluster.xml | 8 ----- .../data-model/chip/descriptor-cluster.xml | 5 --- .../chip/device-energy-management-cluster.xml | 11 +------ .../chip/dishwasher-alarm-cluster.xml | 5 --- .../zcl/data-model/chip/door-lock-cluster.xml | 31 ------------------- .../zcl/data-model/chip/drlc-cluster.xml | 10 ------ .../electrical-energy-measurement-cluster.xml | 7 ----- .../electrical-power-measurement-cluster.xml | 8 ----- .../data-model/chip/energy-evse-cluster.xml | 8 ----- .../chip/energy-preference-cluster.xml | 6 ---- .../ethernet-network-diagnostics-cluster.xml | 5 --- .../data-model/chip/fan-control-cluster.xml | 10 ------ .../chip/general-diagnostics-cluster.xml | 5 --- .../chip/group-key-mgmt-cluster.xml | 5 --- .../zcl/data-model/chip/groups-cluster.xml | 5 --- .../chip/icd-management-cluster.xml | 7 ----- .../data-model/chip/keypad-input-cluster.xml | 6 ---- .../data-model/chip/level-control-cluster.xml | 6 ---- .../data-model/chip/media-input-cluster.xml | 4 --- .../chip/media-playback-cluster.xml | 8 ----- .../zcl/data-model/chip/messages-cluster.xml | 7 ----- .../chip/microwave-oven-control-cluster.xml | 6 ---- .../zcl/data-model/chip/mode-base-cluster.xml | 14 +-------- .../data-model/chip/mode-select-cluster.xml | 5 +-- .../chip/network-commissioning-cluster.xml | 8 ----- .../zcl/data-model/chip/onoff-cluster.xml | 6 ---- .../data-model/chip/power-source-cluster.xml | 7 ----- .../chip/power-topology-cluster.xml | 8 +---- .../chip/pressure-measurement-cluster.xml | 4 --- ...pump-configuration-and-control-cluster.xml | 10 ------ .../chip/resource-monitoring-cluster.xml | 8 ----- .../chip/rvc-clean-mode-cluster.xml | 5 --- .../data-model/chip/rvc-run-mode-cluster.xml | 5 --- .../zcl/data-model/chip/scene.xml | 4 --- .../chip/smoke-co-alarm-cluster.xml | 5 --- .../chip/software-diagnostics-cluster.xml | 5 +-- .../zcl/data-model/chip/switch-cluster.xml | 8 ----- .../chip/temperature-control-cluster.xml | 7 +---- .../data-model/chip/thermostat-cluster.xml | 15 +-------- .../thread-network-diagnostics-cluster.xml | 8 +---- .../chip/time-format-localization-cluster.xml | 5 --- .../chip/time-synchronization-cluster.xml | 7 ----- .../zcl/data-model/chip/timer-cluster.xml | 4 --- .../chip/unit-localization-cluster.xml | 5 +-- ...alve-configuration-and-control-cluster.xml | 5 --- .../chip/washer-controls-cluster.xml | 5 --- .../chip/wifi-network-diagnostics-cluster.xml | 6 +--- .../zcl/data-model/chip/window-covering.xml | 8 ----- .../zcl/zcl-with-test-extensions.json | 1 + src/app/zap-templates/zcl/zcl.json | 1 + 60 files changed, 14 insertions(+), 417 deletions(-) diff --git a/src/app/zap-templates/app-templates.json b/src/app/zap-templates/app-templates.json index 1d41e127165c01..73c33aa3597757 100644 --- a/src/app/zap-templates/app-templates.json +++ b/src/app/zap-templates/app-templates.json @@ -1,6 +1,7 @@ { "name": "CHIP Application templates", "version": "chip-v1", + "requiredFeatureLevel": 102, "helpers": [ "partials/helper.js", "common/ListHelper.js", 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 68c56e5984c809..3532c89b931880 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 @@ -69,9 +69,4 @@ limitations under the License. - - - - - 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 3a20b02aaa3d85..bbc57510e85dce 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 @@ -44,15 +44,6 @@ limitations under the License. AirQuality - - - - - - - - - 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 d2b1b8049e1e58..8aaca6201074dd 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 @@ -81,9 +81,4 @@ limitations under the License. - - - - - 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 1705d645613970..acaa9deadb6a3b 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 @@ -65,9 +65,4 @@ limitations under the License. - - - - - 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 95939510fa944b..f60623455c8d24 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 @@ -17,14 +17,6 @@ limitations under the License. - - - - - - - - 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 26e0ea47327b5d..25ec7b7062f97a 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 @@ -208,12 +208,4 @@ 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 6be1804befb948..287fe6bdd8f917 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 @@ -15,14 +15,7 @@ See the License for the specific language governing permissions and 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 c14a56f547ef4a..776b07f810303d 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 @@ -297,26 +297,6 @@ limitations under the License. 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 4bda93902c6e3f..8cf7adf463bccc 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 @@ -124,13 +124,4 @@ limitations under the License. - - - - - - - - - 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 854f3072a11283..80e4d4559af0a3 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 @@ -194,12 +194,4 @@ limitations under the License. - - - - - - - - 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 d66330023eb6fc..639b965cfc9bf9 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 @@ -31,11 +31,6 @@ limitations under the License. - - - - - General Descriptor 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 ccbca9ecd49a5e..3f921f4e554409 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 @@ -16,16 +16,7 @@ limitations under the License. --> - - - - - - - - - - + Device Energy Management 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 3dc4ff779bd655..5f470f46236dea 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 @@ -60,9 +60,4 @@ 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 03c4657e491d59..843efff9edb7a5 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 @@ -839,18 +839,6 @@ limitations under the License. - - - - - - - - - - - - @@ -870,25 +858,6 @@ 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 cc2ceaafee10b9..d64bce1c85b7f6 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 @@ -17,16 +17,6 @@ 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 eee108d15f82c7..0a4039badf7c97 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 @@ -16,13 +16,6 @@ limitations under the License. --> - - - - - - - Electrical Energy Measurement Measurement & Sensing 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 79fc3297f409a1..69be8e08570f39 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 @@ -16,14 +16,6 @@ limitations under the License. --> - - - - - - - - Electrical Power Measurement Measurement & Sensing 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 12506f34e8d240..cbc0882ac1b3ac 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 @@ -242,13 +242,5 @@ limitations under the License. - - - - - - - - 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 2ce1aaf6c0ad93..a5e1ea8e950ae1 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 @@ -58,12 +58,6 @@ limitations under the License. - - - - - - 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 830814b55dd2f3..04bece4fa900a2 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 @@ -29,11 +29,6 @@ limitations under the License. - - - - - General Ethernet Network Diagnostics diff --git a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml index 0255634b58fd32..6cf763dd30ba26 100644 --- a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml @@ -17,16 +17,6 @@ limitations under the License. - - - - - - - - - - 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 26e14006a6cca8..1b4516bc7aaa25 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 @@ -17,11 +17,6 @@ limitations under the License. - - - - - diff --git a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml index 433a1aa46114b3..5ba220969b7f72 100644 --- a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml @@ -36,11 +36,6 @@ limitations under the License. - - - - - diff --git a/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml index 51b6bd734b16bc..abc33ffa8d04ac 100644 --- a/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml @@ -17,11 +17,6 @@ limitations under the License. - - - - - diff --git a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml index 5b3b7ab2425f45..7015adadc2e5e1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml @@ -18,13 +18,6 @@ limitations under the License. - - - - - - - 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 3c86093417c973..b43ace5c0c8383 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 @@ -152,11 +152,5 @@ 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 c8fc95a6fd8bba..79a7da56a448e0 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 @@ -17,12 +17,6 @@ limitations under the License. - - - - - - 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 8cc67939a0fa21..597b285cc1b5dd 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 @@ -81,9 +81,5 @@ 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 8bfe6a23a8e765..a77b8fa4befb4c 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 @@ -180,14 +180,6 @@ 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 57d2d7cb4f97fd..741ba801f5c092 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 @@ -17,13 +17,6 @@ limitations under the License. - - - - - - - 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 89b6b124b011e1..5567bc99461893 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 @@ -17,12 +17,6 @@ limitations under the License. - - - - - - Microwave Oven Control diff --git a/src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml index abacba4bafe631..111df8eca07eff 100644 --- a/src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml @@ -86,17 +86,5 @@ This is because zap does not currently support generating code for clusters that - - - - - - - - - - - - - + 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 7161fabca998ee..443acb1c955c36 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 @@ -65,8 +65,5 @@ limitations under the License. - - - - + 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 4c9d45c994ba80..e0a6d32cdfb51d 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 @@ -88,14 +88,6 @@ limitations under the License. - - - - - - - - Network Commissioning CHIP 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 7ad697015f856b..04dcfed83766e8 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 @@ -122,10 +122,4 @@ 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 0dc3d17a198091..5701dc6ec61e65 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 @@ -99,13 +99,6 @@ limitations under the License. - - - - - - - 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 46fe4d661267df..2fdddcbe3560da 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 @@ -16,13 +16,7 @@ limitations under the License. --> - - - - - - - + Measurement & Sensing Power Topology 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 aa8caaff443a28..f9487af7f3a9e2 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 @@ -43,8 +43,4 @@ limitations under the License. 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 747537803d6545..74416092e7c7f8 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 @@ -174,15 +174,5 @@ limitations under the License. - - - - - - - - - - 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 a47c972fded3ae..bb395e65cf21bc 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 @@ -74,14 +74,6 @@ limitations under the License. - - - - - - - - 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 3c8686b6d90fb3..8befb7110af6bc 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 @@ -61,10 +61,5 @@ 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 f2d24e62ede0f4..09159a5b69a963 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 @@ -68,10 +68,5 @@ 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 3d6fbc07f15846..0c1189093c4e79 100644 --- a/src/app/zap-templates/zcl/data-model/chip/scene.xml +++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml @@ -201,8 +201,4 @@ 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 1dcdd2dfc3b870..d75ebd6ec653a0 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 @@ -157,9 +157,4 @@ limitations under the License. - - - - - 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 41dfb3a156693b..dafb0d3e9ee58f 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 @@ -45,8 +45,5 @@ limitations under the License. - - - - + 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 93d80b60043a2a..c5e69b3c51ff39 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 @@ -96,13 +96,5 @@ Interactions with the switch device are exposed as attributes (for the latching - - - - - - - - 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 eb4ace3b32f556..da0c0bcee983bb 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 @@ -53,10 +53,5 @@ limitations under the License. - - - - - - + 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 2e910e386d71cc..e1b4b5e3bfd714 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 @@ -16,20 +16,7 @@ limitations under the License. --> - - - - - - - - - - - - - - + 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 e56aeca08f2592..381358cf6a6d61 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 @@ -169,11 +169,5 @@ limitations under the License. - - - - - - - + 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 39ba6d316712e3..9629bf0664d49c 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 @@ -23,11 +23,6 @@ limitations under the License. - - - - - 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 54ae6a7215c1aa..9336a6a944735e 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 @@ -17,13 +17,6 @@ limitations under the License. - - - - - - - diff --git a/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml index 1b1156b54e5480..9fec41d54b3597 100644 --- a/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml @@ -18,10 +18,6 @@ limitations under the License. - - - - 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 febb19ed595e36..c009667da1c7d2 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 @@ -40,8 +40,5 @@ limitations under the License. - - - - + 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 0c8e65cf7ff788..4bb545112be846 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 @@ -17,11 +17,6 @@ limitations under the License. - - - - - 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 69a50f4a7ee8be..8a7e583650a16a 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 @@ -17,11 +17,6 @@ limitations under the License. - - - - - 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 a2d0ca758de91e..7628efca0259f4 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 @@ -47,11 +47,7 @@ limitations under the License. - - - - - + General WiFi Network Diagnostics 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 d12498901652dc..b7224f0fb67ea0 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 @@ -233,12 +233,4 @@ limitations under the License. - - - - - - - - diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index 5bae212dc6d50c..7213b96cf0e012 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -2,6 +2,7 @@ "description": "Matter SDK ZCL data with some extensions", "category": "matter", "version": 1, + "requiredFeatureLevel": 102, "xmlRoot": [ ".", "./data-model/chip/", diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index dcfbaf6986c23c..8a4159e98f7eb8 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -2,6 +2,7 @@ "description": "Matter SDK ZCL data", "category": "matter", "version": 1, + "requiredFeatureLevel": 102, "xmlRoot": [ ".", "./data-model/chip/", From 55d26a380cf9f174967e07e5ef7144e600e33166 Mon Sep 17 00:00:00 2001 From: Bharat Dandu Date: Mon, 15 Apr 2024 10:47:17 -0400 Subject: [PATCH 03/10] Minor cleanup JIRA: ZAPP-1346 --- src/app/zap-templates/app-templates.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/zap-templates/app-templates.json b/src/app/zap-templates/app-templates.json index 73c33aa3597757..d55bae36312e03 100644 --- a/src/app/zap-templates/app-templates.json +++ b/src/app/zap-templates/app-templates.json @@ -2,6 +2,7 @@ "name": "CHIP Application templates", "version": "chip-v1", "requiredFeatureLevel": 102, + "category": "matter", "helpers": [ "partials/helper.js", "common/ListHelper.js", From f9aaa5c30593a430c1ae4fca4041435477ba159c Mon Sep 17 00:00:00 2001 From: Bharat Dandu Date: Mon, 15 Apr 2024 15:18:50 -0400 Subject: [PATCH 04/10] Updating the zap to be used JIRA: ZAPP-1346 --- scripts/setup/zap.json | 4 ++-- scripts/setup/zap.version | 2 +- scripts/tools/zap/zap_execution.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json index 173a68633f6d0e..4e7da8f6d30a7c 100644 --- a/scripts/setup/zap.json +++ b/scripts/setup/zap.json @@ -8,13 +8,13 @@ "mac-amd64", "windows-amd64" ], - "tags": ["version:2@v2024.03.14-nightly.1"] + "tags": ["version:2@v2024.04.15-nightly.1"] }, { "_comment": "Always get the amd64 version on mac until usable arm64 zap build is available", "path": "fuchsia/third_party/zap/mac-amd64", "platforms": ["mac-arm64"], - "tags": ["version:2@v2024.03.14-nightly.1"] + "tags": ["version:2@v2024.04.15-nightly.1"] } ] } diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version index 6f551d6ac92803..cdc8952361f654 100644 --- a/scripts/setup/zap.version +++ b/scripts/setup/zap.version @@ -1 +1 @@ -v2024.03.14-nightly +v2024.04.15-nightly diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py index b5880f761dd41d..3256ba069c2790 100644 --- a/scripts/tools/zap/zap_execution.py +++ b/scripts/tools/zap/zap_execution.py @@ -23,7 +23,7 @@ # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many # files may need updating for versions # -MIN_ZAP_VERSION = '2024.3.14' +MIN_ZAP_VERSION = '2024.4.15' class ZapTool: From ec543b0fa6cc83265808d5c8f6d78945bbd2f685 Mon Sep 17 00:00:00 2001 From: Bharat Dandu Date: Tue, 16 Apr 2024 16:05:45 -0400 Subject: [PATCH 05/10] Updating the xml correctly for features JIRA: ZAPP-1346 --- .../concentration-measurement-cluster.xml | 261 ++++++++++++++++++ .../device-energy-management-mode-cluster.xml | 7 + .../chip/dishwasher-mode-cluster.xml | 7 + .../zcl/data-model/chip/door-lock-cluster.xml | 12 + .../chip/energy-evse-mode-cluster.xml | 7 + .../ethernet-network-diagnostics-cluster.xml | 10 + .../chip/general-diagnostics-cluster.xml | 7 + .../chip/laundry-washer-mode-cluster.xml | 6 + .../chip/microwave-oven-mode-cluster.xml | 7 + .../zcl/data-model/chip/oven-mode-cluster.xml | 7 + ...rature-controlled-cabinet-mode-cluster.xml | 7 + .../chip/resource-monitoring-cluster.xml | 12 + .../chip/software-diagnostics-cluster.xml | 7 + .../thread-network-diagnostics-cluster.xml | 16 ++ .../chip/time-format-localization-cluster.xml | 7 + .../chip/unit-localization-cluster.xml | 7 + .../chip/washer-controls-cluster.xml | 9 + .../chip/wifi-network-diagnostics-cluster.xml | 10 + 18 files changed, 406 insertions(+) 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 776b07f810303d..4d03c539103970 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 @@ -83,6 +83,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue @@ -109,6 +138,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -134,6 +192,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -159,6 +246,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -184,6 +300,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -209,6 +354,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -234,6 +408,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -259,6 +462,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -284,6 +516,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue 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 b41555e2fe03cd..043fb4a1833502 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 @@ -34,6 +34,13 @@ limitations under the License. true Attributes and commands for selecting a mode from a list of supported options. + + + + + + + SupportedModes CurrentMode 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 c578c164c0ca0f..436967be2cee89 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 @@ -33,6 +33,13 @@ limitations under the License. true Attributes and commands for selecting a mode from a list of supported options. + + + + + + + SupportedModes CurrentMode 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 843efff9edb7a5..82a4dd5a1bcfbe 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 @@ -839,6 +839,18 @@ limitations under the License. + + + + + + + + + + + + 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 4418502ae5e389..22e5562ed33f7f 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 @@ -33,6 +33,13 @@ limitations under the License. true Attributes and commands for selecting a mode from a list of supported options. + + + + + + + SupportedModes CurrentMode 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 04bece4fa900a2..f2cf3173c68b29 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 @@ -35,6 +35,16 @@ limitations under the License. 0x0037 ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER 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 PacketRxCount 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 1b4516bc7aaa25..26f0e5708dd280 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 @@ -85,6 +85,13 @@ limitations under the License. GENERAL_DIAGNOSTICS_CLUSTER The General Diagnostics Cluster, along with other diagnostics clusters, provide 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. + + + + + + + NetworkInterfaces RebootCount SupportedModes CurrentMode 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 d97be938d74d2d..2508b4741602b3 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 @@ -39,6 +39,13 @@ limitations under the License. true Attributes and commands for selecting a mode from a list of supported options. + + + + + + + SupportedModes CurrentMode 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 a8f9605b81a1bc..e5ff239c18afa6 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 @@ -32,6 +32,13 @@ limitations under the License. true Attributes and commands for selecting a mode from a list of supported options. + + + + + + + SupportedModes CurrentMode 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 bb395e65cf21bc..66de9ee66cbebd 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 @@ -60,6 +60,18 @@ limitations under the License. true true + + + + + + + + + + + + Condition DegradationDirection 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 dafb0d3e9ee58f..3ac2ba42e8e22e 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 @@ -30,6 +30,13 @@ limitations under the License. 0x0034 SOFTWARE_DIAGNOSTICS_CLUSTER The Software 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. + + + + + + + ThreadMetrics CurrentHeapFree CurrentHeapUsed 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 381358cf6a6d61..77ec8699615156 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 @@ -92,6 +92,22 @@ limitations under the License. THREAD_NETWORK_DIAGNOSTICS_CLUSTER The Thread 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 + + + + + + + + + + + + + + + + Channel RoutingRole NetworkName 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 9629bf0664d49c..6ade7abe2e446c 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 @@ -50,6 +50,13 @@ limitations under the License. may have differing preferences for how dates and times are conveyed. As such, Nodes that visually or audibly convey time information need a mechanism by which they can be configured to use a user’s preferred format. + + + + + + + HourFormat 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 c009667da1c7d2..fb6238add46a4f 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 @@ -34,6 +34,13 @@ limitations under the License. user. As such, Nodes that visually or audibly convey measurable values to the user need a mechanism by which they can be configured to use a user’s preferred unit. + + + + + + + TemperatureUnit 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 8a7e583650a16a..2dc01920ae3e37 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 @@ -37,6 +37,15 @@ limitations under the License. + + + + + + + + + SpinSpeeds SpinSpeedCurrent NumberOfRinses 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 7628efca0259f4..33d3f661fd3834 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 @@ -54,6 +54,16 @@ limitations under the License. 0x0036 WIFI_NETWORK_DIAGNOSTICS_CLUSTER The Wi-Fi 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. + + + + + + + + + + BSSID SecurityType WiFiVersion From ec995f12275f7d38d484a0eeffe4966a407312fe Mon Sep 17 00:00:00 2001 From: Bharat Dandu Date: Tue, 16 Apr 2024 16:43:02 -0400 Subject: [PATCH 06/10] Minor cleanup JIRA: ZAPP-1346 --- .../zcl/data-model/chip/laundry-washer-mode-cluster.xml | 9 --------- 1 file changed, 9 deletions(-) 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 178d1b7e9c331c..99e4ef50c9ca7b 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 @@ -40,15 +40,6 @@ limitations under the License. - - - - - - - - - SupportedModes From 4ddaa9b1ca967b771b3b8647c2cd834055d3205b Mon Sep 17 00:00:00 2001 From: Bharat Dandu Date: Tue, 16 Apr 2024 17:12:56 -0400 Subject: [PATCH 07/10] Cleanup to sync bitmap feature and features JIRA: ZAPP-1346 --- .../zcl/data-model/chip/color-control-cluster.xml | 2 +- .../zcl/data-model/chip/dishwasher-alarm-cluster.xml | 6 ++++++ .../chip/network-commissioning-cluster.xml | 3 +++ .../zcl/data-model/chip/rvc-clean-mode-cluster.xml | 6 ++++++ .../zcl/data-model/chip/rvc-run-mode-cluster.xml | 6 +++++- .../zcl/data-model/chip/thermostat-cluster.xml | 12 ++++++++++++ 6 files changed, 33 insertions(+), 2 deletions(-) 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 287fe6bdd8f917..749731069494f5 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 @@ -101,7 +101,7 @@ limitations under the License. - + 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 5f470f46236dea..7e41a7a1c03f99 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 @@ -37,6 +37,12 @@ limitations under the License. true true + + + + + + Mask Latch State 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 e0a6d32cdfb51d..964923be4f2dfa 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,6 +107,9 @@ limitations under the License. + + + 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 8befb7110af6bc..c528759d2a8cb7 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 @@ -38,6 +38,7 @@ limitations under the License. true Attributes and commands for selecting a mode from a list of supported options. + SupportedModes CurrentMode @@ -61,5 +62,10 @@ 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 09159a5b69a963..f13f86ac2dc97e 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 @@ -68,5 +68,9 @@ limitations under the License. - + + + + + 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 e1b4b5e3bfd714..62e9a6d883516d 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 @@ -314,6 +314,18 @@ limitations under the License. + + + + + + + + + + + + From 39b84a6dba529903ca24ab12c543347f52fc352b Mon Sep 17 00:00:00 2001 From: Bharat Dandu Date: Wed, 17 Apr 2024 10:28:01 -0400 Subject: [PATCH 08/10] Cleanup to sync bitmap feature and features JIRA: ZAPP-1346 --- .../chip/content-control-cluster.xml | 9 ------- .../chip/content-launch-cluster.xml | 27 +++++++------------ .../zcl/data-model/chip/door-lock-cluster.xml | 14 +++++++--- .../data-model/chip/refrigerator-alarm.xml | 6 ----- .../chip/smoke-co-alarm-cluster.xml | 2 +- .../zcl/data-model/chip/timer-cluster.xml | 7 +++++ 6 files changed, 27 insertions(+), 38 deletions(-) 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 8cf7adf463bccc..06468c114c42dc 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 @@ -41,15 +41,6 @@ limitations under the License. - - - - - - - - - Enabled 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 80e4d4559af0a3..3c59ae1f9c90ad 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,24 +26,6 @@ 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 @@ -194,4 +176,13 @@ 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 82a4dd5a1bcfbe..c82b06f1db4f0c 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 @@ -65,10 +65,10 @@ limitations under the License. - + - + @@ -92,7 +92,7 @@ limitations under the License. - + @@ -114,7 +114,13 @@ limitations under the License. - + + + + + + + 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 126d0412e9efbb..58fa70163f65ea 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,12 +29,6 @@ limitations under the License. true true - - - - - - Mask State Supported 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 d75ebd6ec653a0..4f80bcf1477fef 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 @@ -40,7 +40,7 @@ limitations under the License. - + diff --git a/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml index 9fec41d54b3597..d849313d269a83 100644 --- a/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml @@ -38,6 +38,13 @@ limitations under the License. + + + + + + + SetTime TimeRemaining TimerState From ccd18e443786867895d5ba248e7b6e3e597c9fc7 Mon Sep 17 00:00:00 2001 From: Bharat Dandu Date: Wed, 17 Apr 2024 12:26:25 -0400 Subject: [PATCH 09/10] Cleanup to sync bitmap feature and features JIRA: ZAPP-1346 --- .../zap-templates/zcl/data-model/chip/door-lock-cluster.xml | 4 ++-- .../zcl/data-model/chip/smoke-co-alarm-cluster.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 c82b06f1db4f0c..d4f1841257f525 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 @@ -65,10 +65,10 @@ 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 4f80bcf1477fef..d75ebd6ec653a0 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 @@ -40,7 +40,7 @@ limitations under the License. - + From f4b9c4cfeee0b7edf180c965ae7c861861362768 Mon Sep 17 00:00:00 2001 From: Bharat Dandu Date: Wed, 17 Apr 2024 14:16:02 -0400 Subject: [PATCH 10/10] Cleanup to sync bitmap feature and features JIRA: ZAPP-1346 --- .../zap-templates/zcl/data-model/chip/door-lock-cluster.xml | 4 ++-- .../zcl/data-model/chip/smoke-co-alarm-cluster.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 d4f1841257f525..cc2bf491f25045 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 @@ -65,10 +65,10 @@ 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 d75ebd6ec653a0..31ae0bba9e7d99 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 @@ -40,7 +40,7 @@ limitations under the License. - +