From 4322a88b7af4c91b6ada797aa3a0f687df4723e8 Mon Sep 17 00:00:00 2001 From: Bharat Raju Date: Thu, 18 Apr 2024 09:10:15 -0400 Subject: [PATCH] Updating the existing xml with features per cluster and features per device type (#32930) * Updating the existing xml with features per cluster and features per device type JIRA: ZAPP-1346 * Removing bitmap name=feature in favor of features which can be used to populate the bitmap JIRA: ZAPP-1346 * Minor cleanup JIRA: ZAPP-1346 * Updating the zap to be used JIRA: ZAPP-1346 * Updating the xml correctly for features JIRA: ZAPP-1346 * Minor cleanup JIRA: ZAPP-1346 * Cleanup to sync bitmap feature and features JIRA: ZAPP-1346 * Cleanup to sync bitmap feature and features JIRA: ZAPP-1346 * Cleanup to sync bitmap feature and features JIRA: ZAPP-1346 * Cleanup to sync bitmap feature and features JIRA: ZAPP-1346 --- scripts/setup/zap.json | 4 +- scripts/setup/zap.version | 2 +- scripts/tools/zap/zap_execution.py | 2 +- src/app/zap-templates/app-templates.json | 2 + .../administrator-commissioning-cluster.xml | 10 +- .../data-model/chip/air-quality-cluster.xml | 24 +- .../chip/application-launcher-cluster.xml | 11 +- .../data-model/chip/audio-output-cluster.xml | 12 +- .../boolean-state-configuration-cluster.xml | 28 +- .../zcl/data-model/chip/channel-cluster.xml | 24 +- .../data-model/chip/color-control-cluster.xml | 27 +- .../concentration-measurement-cluster.xml | 310 ++++++++++++++++-- .../chip/content-control-cluster.xml | 28 +- .../chip/content-launch-cluster.xml | 15 +- .../data-model/chip/descriptor-cluster.xml | 9 +- .../chip/device-energy-management-cluster.xml | 78 ++++- .../device-energy-management-mode-cluster.xml | 7 + .../chip/dishwasher-alarm-cluster.xml | 11 +- .../chip/dishwasher-mode-cluster.xml | 7 + .../zcl/data-model/chip/door-lock-cluster.xml | 100 ++++-- .../zcl/data-model/chip/drlc-cluster.xml | 34 +- .../electrical-energy-measurement-cluster.xml | 23 +- .../electrical-power-measurement-cluster.xml | 33 +- .../data-model/chip/energy-evse-cluster.xml | 26 +- .../chip/energy-evse-mode-cluster.xml | 7 + .../chip/energy-preference-cluster.xml | 15 +- .../ethernet-network-diagnostics-cluster.xml | 15 +- .../data-model/chip/fan-control-cluster.xml | 31 +- .../chip/general-diagnostics-cluster.xml | 12 +- .../chip/group-key-mgmt-cluster.xml | 12 +- .../zcl/data-model/chip/groups-cluster.xml | 11 +- .../chip/icd-management-cluster.xml | 34 +- .../data-model/chip/keypad-input-cluster.xml | 18 +- .../chip/laundry-washer-mode-cluster.xml | 7 + .../data-model/chip/level-control-cluster.xml | 20 +- .../zcl/data-model/chip/matter-devices.xml | 280 +++++++++++++++- .../data-model/chip/media-input-cluster.xml | 10 +- .../chip/media-playback-cluster.xml | 27 +- .../zcl/data-model/chip/messages-cluster.xml | 27 +- .../chip/microwave-oven-control-cluster.xml | 21 +- .../chip/microwave-oven-mode-cluster.xml | 7 + .../zcl/data-model/chip/mode-base-cluster.xml | 14 +- .../data-model/chip/mode-select-cluster.xml | 11 +- .../chip/network-commissioning-cluster.xml | 23 +- .../zcl/data-model/chip/onoff-cluster.xml | 33 +- .../zcl/data-model/chip/oven-mode-cluster.xml | 7 + .../data-model/chip/power-source-cluster.xml | 26 +- .../chip/power-topology-cluster.xml | 26 +- .../chip/pressure-measurement-cluster.xml | 11 +- ...pump-configuration-and-control-cluster.xml | 35 +- .../data-model/chip/refrigerator-alarm.xml | 1 + ...rature-controlled-cabinet-mode-cluster.xml | 7 + .../chip/resource-monitoring-cluster.xml | 32 +- .../chip/rvc-clean-mode-cluster.xml | 9 +- .../data-model/chip/rvc-run-mode-cluster.xml | 9 +- .../zcl/data-model/chip/scene.xml | 10 +- .../chip/smoke-co-alarm-cluster.xml | 14 +- .../chip/software-diagnostics-cluster.xml | 12 +- .../zcl/data-model/chip/switch-cluster.xml | 38 ++- .../chip/temperature-control-cluster.xml | 22 +- .../data-model/chip/thermostat-cluster.xml | 66 +++- .../thread-network-diagnostics-cluster.xml | 24 +- .../chip/time-format-localization-cluster.xml | 12 +- .../chip/time-synchronization-cluster.xml | 22 +- .../zcl/data-model/chip/timer-cluster.xml | 11 +- .../chip/unit-localization-cluster.xml | 12 +- ...alve-configuration-and-control-cluster.xml | 12 +- .../chip/washer-controls-cluster.xml | 14 +- .../chip/wifi-network-diagnostics-cluster.xml | 16 +- .../zcl/data-model/chip/window-covering.xml | 30 +- .../zcl/zcl-with-test-extensions.json | 1 + src/app/zap-templates/zcl/zcl.json | 1 + 72 files changed, 1508 insertions(+), 434 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: diff --git a/src/app/zap-templates/app-templates.json b/src/app/zap-templates/app-templates.json index 1d41e127165c01..d55bae36312e03 100644 --- a/src/app/zap-templates/app-templates.json +++ b/src/app/zap-templates/app-templates.json @@ -1,6 +1,8 @@ { "name": "CHIP Application templates", "version": "chip-v1", + "requiredFeatureLevel": 102, + "category": "matter", "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 0668f2dea4ae7c..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 @@ -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 @@ -64,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 f2ce941007bf59..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 @@ -25,19 +25,25 @@ 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..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 @@ -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 @@ -75,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 2067d048d4e569..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 @@ -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 @@ -58,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 2b5f81eed744e1..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. - - - - - - - - @@ -46,6 +38,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..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 @@ -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 @@ -192,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 0dcb76abac44ea..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 @@ -15,14 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - - + @@ -107,6 +100,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..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 @@ -29,6 +29,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -54,6 +83,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue @@ -80,6 +138,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -105,6 +192,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -130,6 +246,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -155,6 +300,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -180,6 +354,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -205,6 +408,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -230,6 +462,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -255,6 +516,35 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -268,26 +558,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 d8077e9e9276cc..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 @@ -24,6 +24,25 @@ 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 @@ -96,13 +115,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 037998053d512f..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 @@ -177,11 +177,12 @@ 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 f95d2acb1b2f40..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 @@ -45,6 +40,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..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 @@ -37,6 +28,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/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-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml index 3dc4ff779bd655..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 @@ -60,9 +66,4 @@ limitations under the License. - - - - - 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 1c179f9324422a..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 @@ -64,6 +64,67 @@ limitations under the License. true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -815,25 +876,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 dce7ff59f3fdac..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. - - - - - - - - - - @@ -185,6 +175,30 @@ limitations under the License. true + + + + + + + + + + + + + + + + + + + + + + + + LoadControlPrograms NumberOfLoadControlPrograms Events 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 55a298ee596e53..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 @@ -32,6 +25,22 @@ limitations under the License. true This cluster provides a mechanism for querying data about the electrical energy imported or provided by the server. + + + + + + + + + + + + + + + + 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..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 @@ -33,6 +25,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..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 @@ -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 @@ -224,13 +242,5 @@ 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/energy-preference-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/energy-preference-cluster.xml index 32893bd82a68e9..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 @@ -24,6 +24,15 @@ limitations under the License. + + + + + + + + + EnergyBalances @@ -49,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..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 @@ -29,17 +29,22 @@ limitations under the License. - - - - - General Ethernet Network Diagnostics 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/fan-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml index c2deff336eae46..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. - - - - - - - - - - @@ -85,6 +75,27 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + FanMode FanModeSequence PercentSetting 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..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 @@ -17,11 +17,6 @@ limitations under the License. - - - - - @@ -90,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 + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..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 @@ -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. @@ -140,11 +152,5 @@ limitations under the License. - - - - - - 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..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 @@ -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/level-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml index dca3fb6f3532d1..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. - - - - - - @@ -54,6 +48,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..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 @@ -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 @@ -75,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 32c2da12ed0780..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 @@ -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 @@ -161,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 16b1527625d320..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. - - - - - - - @@ -78,6 +71,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..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 @@ -32,6 +26,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/microwave-oven-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml index 826d77ecd9f42a..b26f022f3cc9b4 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 @@ -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/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 0462a48e8bc513..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 @@ -40,6 +40,12 @@ limitations under the License. + + + + + + Attributes and commands for selecting a mode from a list of supported options. Description @@ -59,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 340effa347298d..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 @@ -88,14 +88,6 @@ limitations under the License. - - - - - - - - Network Commissioning CHIP @@ -105,6 +97,21 @@ 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..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 @@ -55,6 +55,33 @@ limitations under the License. Attributes and commands for switching devices between 'On' and 'Off' states. + + + + + + + + + + + + + + + + + + + + + + + + + + + OnOff GlobalSceneControl OnTime @@ -95,10 +122,4 @@ limitations under the License. - - - - - - 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/power-source-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml index 913df128cc758e..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 @@ -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 @@ -80,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 9eef1e03c6c023..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 @@ -32,6 +26,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..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 @@ -25,6 +25,13 @@ limitations under the License. true true + + + + + + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -36,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 7aa34bc6554b68..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 @@ -25,6 +25,31 @@ limitations under the License. true true + + + + + + + + + + + + + + + + + + + + + + + + + MaxPressure MaxSpeed MaxFlow @@ -149,15 +174,5 @@ 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 21bf7da48bd02e..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 @@ -28,6 +28,7 @@ limitations under the License. REFRIGERATOR_ALARM_CLUSTER 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 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 4be5dbddc12478..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 @@ -25,6 +25,18 @@ limitations under the License. true true + + + + + + + + + + + + Condition DegradationDirection @@ -48,6 +60,18 @@ limitations under the License. true true + + + + + + + + + + + + Condition DegradationDirection @@ -62,14 +86,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..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 @@ -62,9 +63,9 @@ 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..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 @@ -69,9 +69,8 @@ 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 e16047b9c14c07..0c1189093c4e79 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 @@ -195,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 c6827dd1c4bd48..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 @@ -36,6 +36,15 @@ limitations under the License. + + + + + + + + + ExpressedState SmokeState @@ -148,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..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 @@ -45,8 +52,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 7df57e3ebd26c1..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 @@ -30,6 +30,36 @@ Interactions with the switch device are exposed as attributes (for the latching + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NumberOfPositions CurrentPosition MultiPressMax @@ -66,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 7509e9b44579cb..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 @@ -25,6 +25,21 @@ limitations under the License. TEMPERATURE_CONTROL_CLUSTER true true + + + + + + + + + + + + + + + TemperatureSetpoint MinTemperature MaxTemperature @@ -38,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 948c0937a3fd10..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 @@ -16,20 +16,7 @@ limitations under the License. --> - - - - - - - - - - - - - - + @@ -290,6 +277,57 @@ limitations under the License. true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LocalTemperature 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..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 @@ -169,11 +185,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..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 @@ -23,11 +23,6 @@ limitations under the License. - - - - - @@ -55,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/time-synchronization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml index 17271c56352c03..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. - - - - - - - @@ -106,6 +99,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/timer-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml index 1b1156b54e5480..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 @@ -18,10 +18,6 @@ limitations under the License. - - - - @@ -42,6 +38,13 @@ limitations under the License. + + + + + + + SetTime TimeRemaining TimerState 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..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,14 +34,18 @@ 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/valve-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml index 0818b3637c892a..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. - - - - - @@ -55,6 +50,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/washer-controls-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml index 69a50f4a7ee8be..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 @@ -17,11 +17,6 @@ limitations under the License. - - - - - @@ -42,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 a2d0ca758de91e..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 @@ -47,17 +47,23 @@ limitations under the License. - - - - - + General WiFi Network Diagnostics 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 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..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 @@ -33,6 +33,28 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + Type @@ -211,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/",