diff --git a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml index 831cc5b493..67a919eac1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml @@ -109,15 +109,13 @@ limitations under the License. and enforce Access Control for the Node's endpoints and their associated cluster instances. - - ACL + - - Extension + @@ -125,26 +123,21 @@ limitations under the License. - - SubjectsPerAccessControlEntry + - - TargetsPerAccessControlEntry + - - AccessControlEntriesPerFabric + - - CommissioningARL + - - ARL + diff --git a/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml index bed60efdf5..73c38134ed 100644 --- a/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml @@ -90,16 +90,13 @@ limitations under the License. ACTIONS_CLUSTER This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. - - ActionList + - - EndpointLists + - - SetupURL + diff --git a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml index 55a8310f0f..ba6b7fd266 100644 --- a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml @@ -43,16 +43,13 @@ limitations under the License. - - WindowStatus + - - AdminFabricIndex + - - AdminVendorId + diff --git a/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml index 6b91830856..1b5d34b7ba 100644 --- a/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml @@ -41,8 +41,7 @@ limitations under the License. - - AirQuality + diff --git a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml index ea6be51e9b..704b8cadbe 100644 --- a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml @@ -24,36 +24,28 @@ limitations under the License. true true This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. - - VendorName + - - VendorID + - - ApplicationName + - - ProductID + - - Application + - - Status + - - ApplicationVersion + - - AllowedVendorList + diff --git a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml index 34eb73fde5..d69437a298 100644 --- a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml @@ -31,14 +31,12 @@ limitations under the License. - - CatalogList + - - CurrentApp + diff --git a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml index 0de5d0e330..d24b34f402 100644 --- a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml @@ -31,12 +31,10 @@ limitations under the License. - - OutputList + - - CurrentOutput + diff --git a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml index 29ec1cd381..80119e8ec0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml @@ -41,73 +41,59 @@ limitations under the License. - - PhysicalMinLevel + - - PhysicalMaxLevel + - - BallastStatus + - - MinLevel + - - MaxLevel + - - IntrinsicBallastFactor + - - BallastFactorAdjustment + - - LampQuantity + - - LampType + - - LampManufacturer + - - LampRatedHours + - - LampBurnHours + - - LampAlarmMode + - - LampBurnHoursTripPoint + diff --git a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml index 288c82f950..f08d9dc2be 100644 --- a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml @@ -74,102 +74,79 @@ limitations under the License. which apply to the whole Node. Also allows setting user device information such as location. - - DataModelRevision + - - VendorName + - - VendorID + - - ProductName + - - ProductID + - - NodeLabel + - - Location + - - HardwareVersion + - - HardwareVersionString + - - SoftwareVersion + - - SoftwareVersionString + - - ManufacturingDate + - - PartNumber + - - ProductURL + - - ProductLabel + - - SerialNumber + - - LocalConfigDisabled + - - Reachable + - - UniqueID + - - CapabilityMinima + - - ProductAppearance + - - SpecificationVersion + - - MaxPathsPerInvoke + diff --git a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml index 0b1cbd0c56..19f2b0933c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml @@ -31,8 +31,7 @@ limitations under the License. 0x001e BINDING_CLUSTER The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. - - Binding + diff --git a/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml index 30a16e16bc..292067d12a 100644 --- a/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml @@ -26,8 +26,7 @@ limitations under the License. true true - - StateValue + diff --git a/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml index 85705e6a03..a301b4eacf 100644 --- a/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml @@ -58,26 +58,22 @@ limitations under the License. - - CurrentSensitivityLevel + - - SupportedSensitivityLevels + - - DefaultSensitivityLevel + - - AlarmsActive + @@ -85,14 +81,12 @@ limitations under the License. - - AlarmsSuppressed + - - AlarmsEnabled + @@ -100,8 +94,7 @@ limitations under the License. - - AlarmsSupported + @@ -109,8 +102,7 @@ limitations under the License. - - SensorFault + diff --git a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml index c3a08ab084..cb4bcd9adb 100644 --- a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml @@ -41,20 +41,17 @@ limitations under the License. - - ChannelList + - - Lineup + - - CurrentChannel + diff --git a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml index 04fa274363..14767f6429 100644 --- a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml +++ b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml @@ -121,8 +121,7 @@ limitations under the License. OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER true true - - DefaultOTAProviders + diff --git a/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml index a479da3637..b3be97a217 100644 --- a/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml @@ -127,73 +127,61 @@ limitations under the License. - - CurrentHue + - - CurrentSaturation + - - RemainingTime + - - CurrentX + - - CurrentY + - - DriftCompensation + - - CompensationText + - - ColorTemperatureMireds + - - ColorMode + - - Options + - - NumberOfPrimaries + - - Primary1X + @@ -205,8 +193,7 @@ limitations under the License. - - Primary1Y + @@ -218,8 +205,7 @@ limitations under the License. - - Primary1Intensity + @@ -231,8 +217,7 @@ limitations under the License. - - Primary2X + @@ -244,8 +229,7 @@ limitations under the License. - - Primary2Y + @@ -257,8 +241,7 @@ limitations under the License. - - Primary2Intensity + @@ -270,8 +253,7 @@ limitations under the License. - - Primary3X + @@ -283,8 +265,7 @@ limitations under the License. - - Primary3Y + @@ -296,8 +277,7 @@ limitations under the License. - - Primary3Intensity + @@ -309,8 +289,7 @@ limitations under the License. - - Primary4X + @@ -322,8 +301,7 @@ limitations under the License. - - Primary4Y + @@ -335,8 +313,7 @@ limitations under the License. - - Primary4Intensity + @@ -348,8 +325,7 @@ limitations under the License. - - Primary5X + @@ -361,8 +337,7 @@ limitations under the License. - - Primary5Y + @@ -374,8 +349,7 @@ limitations under the License. - - Primary5Intensity + @@ -387,8 +361,7 @@ limitations under the License. - - Primary6X + @@ -400,8 +373,7 @@ limitations under the License. - - Primary6Y + @@ -413,8 +385,7 @@ limitations under the License. - - Primary6Intensity + @@ -426,85 +397,73 @@ limitations under the License. - - WhitePointX + - - WhitePointY + - - ColorPointRX + - - ColorPointRY + - - ColorPointRIntensity + - - ColorPointGX + - - ColorPointGY + - - ColorPointGIntensity + - - ColorPointBX + - - ColorPointBY + - - ColorPointBIntensity + - - CoupleColorTempToLevelMinMireds + @@ -512,8 +471,7 @@ limitations under the License. - - StartUpColorTemperatureMireds + @@ -675,58 +633,48 @@ limitations under the License. - - EnhancedCurrentHue + - - EnhancedColorMode + - - ColorLoopActive + - - ColorLoopDirection + - - ColorLoopTime + - - ColorLoopStartEnhancedHue + - - ColorLoopStoredEnhancedHue + - - ColorCapabilities + - - ColorTempPhysicalMinMireds + - - ColorTempPhysicalMaxMireds + diff --git a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml index 33f26e3689..1422733cc0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml @@ -32,8 +32,7 @@ limitations under the License. - - SupportedDeviceCategories + diff --git a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml index e2116fc03c..27b298ae25 100644 --- a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml @@ -58,66 +58,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -166,66 +155,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -273,66 +251,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -380,66 +347,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -487,66 +443,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -594,66 +539,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -701,66 +635,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -808,66 +731,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -915,66 +827,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + @@ -1022,66 +923,55 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - PeakMeasuredValue + - - PeakMeasuredValueWindow + - - AverageMeasuredValue + - - AverageMeasuredValueWindow + - - Uncertainty + - - MeasurementUnit + - - MeasurementMedium + - - LevelValue + diff --git a/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml index e42967b581..d628663fcc 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml @@ -43,48 +43,40 @@ limitations under the License. - - Enabled + - - OnDemandRatings + - - OnDemandRatingThreshold + - - ScheduledContentRatings + - - ScheduledContentRatingThreshold + - - ScreenDailyTime + - - RemainingScreenTime + - - BlockUnrated + diff --git a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml index 31ad15a48b..4d96173013 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml @@ -26,14 +26,12 @@ limitations under the License. This cluster provides an interface for launching content on a media player device such as a TV or Speaker. - - AcceptHeader + - - SupportedStreamingProtocols + diff --git a/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml index f34d705a24..b7495d2d84 100644 --- a/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml @@ -45,24 +45,19 @@ limitations under the License. - - DeviceTypeList + - - ServerList + - - ClientList + - - PartsList + - - TagList + diff --git a/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml index 22b534cc8e..a067007689 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 @@ -75,36 +75,29 @@ planned operation."> - - ESAType + - - ESACanGenerate + - - ESAState + - - AbsMinPower + - - AbsMaxPower + - - PowerAdjustmentCapability + - - Forecast + @@ -112,8 +105,7 @@ planned operation."> - - OptOutState + diff --git a/src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml index 3d9f3fbd3f..e9eae40c5c 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 @@ -57,14 +57,15 @@ limitations under the License. - - SupportedModes + - - CurrentMode + + StartUpMode + OnMode + This command is used to change device modes. 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 a8cf1e1662..f460f42a19 100644 --- a/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml @@ -43,22 +43,18 @@ limitations under the License. - - Mask + - - Latch + - - State + - - Supported + diff --git a/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml index 7cc15557f0..49403ab547 100644 --- a/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml @@ -57,12 +57,10 @@ limitations under the License. - - SupportedModes + - - CurrentMode + StartUpMode diff --git a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml index f16bbbf28b..03042ad346 100644 --- a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml @@ -133,28 +133,23 @@ limitations under the License. cluster itself. Those attributes/commands are marked with a special comment. --> - - LockState + - - LockType + - - ActuatorEnabled + - - DoorState + - - DoorOpenEvents + @@ -162,8 +157,7 @@ limitations under the License. - - DoorClosedEvents + @@ -171,8 +165,7 @@ limitations under the License. - - OpenPeriod + @@ -180,160 +173,135 @@ limitations under the License. - - NumberOfTotalUsersSupported + - - NumberOfPINUsersSupported + - - NumberOfRFIDUsersSupported + - - NumberOfWeekDaySchedulesSupportedPerUser + - - NumberOfYearDaySchedulesSupportedPerUser + - - NumberOfHolidaySchedulesSupported + - - MaxPINCodeLength + - - MinPINCodeLength + - - MaxRFIDCodeLength + - - MinRFIDCodeLength + - - CredentialRulesSupport + - - NumberOfCredentialsSupportedPerUser + - - Language + - - LEDSettings + - - AutoRelockTime + - - SoundVolume + - - OperatingMode + - - SupportedOperatingModes + - - DefaultConfigurationRegister + - - EnableLocalProgramming + - - EnableOneTouchLocking + - - EnableInsideStatusLED + - - EnablePrivacyModeButton + - - LocalProgrammingFeatures + - - WrongCodeEntryLimit + @@ -344,8 +312,7 @@ limitations under the License. - - UserCodeTemporaryDisableTime + @@ -356,8 +323,7 @@ limitations under the License. - - SendPINOverTheAir + @@ -370,8 +336,7 @@ limitations under the License. - - RequirePINforRemoteOperation + @@ -383,8 +348,7 @@ limitations under the License. - - ExpiringUserTimeout + @@ -392,71 +356,62 @@ limitations under the License. - - AliroReaderVerificationKey + - - AliroReaderGroupIdentifier + - - AliroReaderGroupSubIdentifier + - - AliroExpeditedTransactionSupportedProtocolVersions + - - AliroGroupResolvingKey + - - AliroSupportedBLEUWBProtocolVersions + - - AliroBLEAdvertisingVersion + - - NumberOfAliroCredentialIssuerKeysSupported + - - NumberOfAliroEndpointKeysSupported + diff --git a/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml index d7e04ccf46..752a917fd3 100644 --- a/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml @@ -199,38 +199,30 @@ limitations under the License. - - LoadControlPrograms + - - NumberOfLoadControlPrograms + - - Events + - - ActiveEvents + - - NumberOfEventsPerProgram + - - NumberOfTransitions + - - DefaultRandomStart + - - DefaultRandomDuration + diff --git a/src/app/zap-templates/zcl/data-model/chip/ecosystem-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ecosystem-information-cluster.xml index 73ae522365..06f931ef07 100644 --- a/src/app/zap-templates/zcl/data-model/chip/ecosystem-information-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/ecosystem-information-cluster.xml @@ -44,12 +44,10 @@ limitations under the License. true - - DeviceDirectory + - - LocationDirectory + diff --git a/src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml index 3fbd9e984f..c8501c412c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml @@ -42,12 +42,10 @@ limitations under the License. - - Accuracy + - - CumulativeEnergyImported + @@ -56,8 +54,7 @@ limitations under the License. - - CumulativeEnergyExported + @@ -66,8 +63,7 @@ limitations under the License. - - PeriodicEnergyImported + @@ -76,8 +72,7 @@ limitations under the License. - - PeriodicEnergyExported + @@ -85,8 +80,7 @@ limitations under the License. - - CumulativeEnergyReset + diff --git a/src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml index 18ee20bad3..0a4fccb6b9 100644 --- a/src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml @@ -51,114 +51,95 @@ limitations under the License. - - PowerMode + - - NumberOfMeasurementTypes + - - Accuracy + - - Ranges + - - Voltage + - - ActiveCurrent + - - ReactiveCurrent + - - ApparentCurrent + - - ActivePower + - - ReactivePower + - - ApparentPower + - - RMSVoltage + - - RMSCurrent + - - RMSPower + - - Frequency + - - HarmonicCurrents + - - HarmonicPhases + - - PowerFactor + - - NeutralCurrent + diff --git a/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml index 2b321f7487..717b9f4712 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 @@ -116,44 +116,35 @@ limitations under the License. - - State + - - SupplyState + - - FaultState + - - ChargingEnabledUntil + - - DischargingEnabledUntil + - - CircuitCapacity + - - MinimumChargeCurrent + - - MaximumChargeCurrent + - - MaximumDischargeCurrent + @@ -171,29 +162,25 @@ limitations under the License. - - NextChargeStartTime + - - NextChargeTargetTime + - - NextChargeRequiredEnergy + - - NextChargeTargetSoC + @@ -207,41 +194,34 @@ limitations under the License. - - StateOfCharge + - - BatteryCapacity + - - VehicleID + - - SessionID + - - SessionDuration + - - SessionEnergyCharged + - - SessionEnergyDischarged + diff --git a/src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml index d0b3ee9f1f..045fc68a37 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 @@ -56,14 +56,15 @@ limitations under the License. - - SupportedModes + - - CurrentMode + + StartUpMode + OnMode + This command is used to change device modes. 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 cf646ab019..19fdceb111 100644 --- a/src/app/zap-templates/zcl/data-model/chip/energy-preference-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/energy-preference-cluster.xml @@ -34,16 +34,14 @@ limitations under the License. - - EnergyBalances + - - CurrentEnergyBalance + @@ -52,16 +50,14 @@ limitations under the License. - - EnergyPriorities + - - LowPowerModeSensitivities + diff --git a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml index d84f017f5e..5474ebaba2 100644 --- a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml @@ -45,50 +45,41 @@ limitations under the License. - - PHYRate + - - FullDuplex + - - PacketRxCount + - - PacketTxCount + - - TxErrCount + - - CollisionCount + - - OverrunCount + - - CarrierDetect + - - TimeSinceReset + diff --git a/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml index 5e4b1734ef..67506a1827 100644 --- a/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml @@ -31,8 +31,7 @@ limitations under the License. FIXED_LABEL_CLUSTER The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only labels. - - LabelList + diff --git a/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml index b5336b50ad..14b22a16b1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml @@ -24,20 +24,16 @@ limitations under the License. FLOW_MEASUREMENT_CLUSTER true true - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - Tolerance + diff --git a/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml index e8877b5c1c..eb7fb08431 100644 --- a/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml @@ -52,30 +52,24 @@ limitations under the License. - - Breadcrumb + - - BasicCommissioningInfo + - - RegulatoryConfig + - - LocationCapability + - - SupportsConcurrentConnection + - - TCAcceptedVersion + @@ -84,8 +78,7 @@ limitations under the License. - - TCMinRequiredVersion + @@ -94,8 +87,7 @@ limitations under the License. - - TCAcknowledgements + @@ -104,18 +96,7 @@ limitations under the License. - - TCAcknowledgementsRequired - - - - - - - - - - TCUpdateDeadline + diff --git a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml index 9383517eb9..c3bae609c6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml @@ -92,42 +92,33 @@ limitations under the License. - - NetworkInterfaces + - - RebootCount + - - UpTime + - - TotalOperationalHours + - - BootReason + - - ActiveHardwareFaults + - - ActiveRadioFaults + - - ActiveNetworkFaults + - - TestEventTriggersEnabled + - - SupportedModes + - - CurrentMode + StartUpMode diff --git a/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml index 8d2326e01f..448b5ff0c9 100644 --- a/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml @@ -61,72 +61,58 @@ limitations under the License. - - CurrentLevel + - - RemainingTime + - - MinLevel + - - MaxLevel + - - CurrentFrequency + - - MinFrequency + - - MaxFrequency + - - OnOffTransitionTime + - - OnLevel + - - OnTransitionTime + - - OffTransitionTime + - - DefaultMoveRate + - - Options + - - StartUpCurrentLevel + diff --git a/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml index 34e81bbb44..bd1149e9b0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml @@ -28,13 +28,11 @@ limitations under the License. standards. As such, Nodes that visually or audibly convey information need a mechanism by which they can be configured to use a user’s preferred language, units, etc - - ActiveLocale + - - SupportedLocales + diff --git a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml index 57fdda3bc7..1e1da73365 100644 --- a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml @@ -32,12 +32,10 @@ limitations under the License. - - InputList + - - CurrentInput + diff --git a/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml index 1c4f2e37c8..9e0896f777 100644 --- a/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml @@ -46,66 +46,55 @@ limitations under the License. - - CurrentState + - - StartTime + - - Duration + - - SampledPosition + - - PlaybackSpeed + - - SeekRangeEnd + - - SeekRangeStart + - - ActiveAudioTrack + - - AvailableAudioTracks + - - ActiveTextTrack + - - AvailableTextTracks + diff --git a/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml index 901e63703e..5258167488 100644 --- a/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml @@ -91,12 +91,10 @@ limitations under the License. - - Messages + - - ActiveMessageIDs + diff --git a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml index fd44e47c2c..6ee5fac92c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml @@ -41,40 +41,33 @@ limitations under the License. - - CookTime + - - MaxCookTime + - - PowerSetting + - - MinPower + - - MaxPower + - - PowerStep + - - SupportedWatts + @@ -82,8 +75,7 @@ limitations under the License. - - SelectedWattIndex + @@ -91,8 +83,7 @@ limitations under the License. - - WattRating + diff --git a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml index 393354fb4c..f217da4160 100644 --- a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml @@ -55,12 +55,10 @@ limitations under the License. - - SupportedModes + - - CurrentMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml index 80e0267155..adc776dbe6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml @@ -48,28 +48,22 @@ limitations under the License. Attributes and commands for selecting a mode from a list of supported options. - - Description + - - StandardNamespace + - - SupportedModes + - - CurrentMode + - - StartUpMode + - - OnMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml index 02fcb28ee2..33533dfa24 100644 --- a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml @@ -114,18 +114,15 @@ limitations under the License. - - MaxNetworks + - - Networks + - - ScanMaxTimeSeconds + @@ -133,50 +130,42 @@ limitations under the License. - - ConnectMaxTimeSeconds + - - - InterfaceEnabled + + - - LastNetworkingStatus + - - LastNetworkID + - - LastConnectErrorValue + - - SupportedWiFiBands + - - SupportedThreadFeatures + - - ThreadVersion + diff --git a/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml index 90f1a6a9f4..414eb2c287 100644 --- a/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml @@ -83,40 +83,34 @@ limitations under the License. - - Occupancy + - - OccupancySensorType + - - OccupancySensorTypeBitmap + - - HoldTime + - - HoldTimeLimits + - - PIROccupiedToUnoccupiedDelay + @@ -143,8 +137,7 @@ limitations under the License. - - PIRUnoccupiedToOccupiedDelay + @@ -193,8 +186,7 @@ limitations under the License. - - PIRUnoccupiedToOccupiedThreshold + @@ -243,8 +235,7 @@ limitations under the License. - - UltrasonicOccupiedToUnoccupiedDelay + @@ -258,8 +249,7 @@ limitations under the License. - - UltrasonicUnoccupiedToOccupiedDelay + @@ -280,8 +270,7 @@ limitations under the License. - - UltrasonicUnoccupiedToOccupiedThreshold + @@ -302,8 +291,7 @@ limitations under the License. - - PhysicalContactOccupiedToUnoccupiedDelay + @@ -317,8 +305,7 @@ limitations under the License. - - PhysicalContactUnoccupiedToOccupiedDelay + @@ -339,8 +326,7 @@ limitations under the License. - - PhysicalContactUnoccupiedToOccupiedThreshold + diff --git a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml index c1e87fd1ce..6ed5cfec07 100644 --- a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml @@ -82,30 +82,25 @@ limitations under the License. - - OnOff + - - GlobalSceneControl + - - OnTime + - - OffWaitTime + - - StartUpOnOff + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml index 8be3ce077a..61dd99e58b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml @@ -59,29 +59,23 @@ limitations under the License. OPERATIONAL_CREDENTIALS_CLUSTER This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. - - NOCs + - - Fabrics + - - SupportedFabrics + - - CommissionedFabrics + - - TrustedRootCertificates + - - CurrentFabricIndex + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml index 9bc60ae2f7..07b874e462 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml @@ -61,28 +61,22 @@ limitations under the License. - - PhaseList + - - CurrentPhase + - - CountdownTime + - - OperationalStateList + - - OperationalState + - - OperationalError + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml index 800506d73c..0b18947c5d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml @@ -54,28 +54,22 @@ limitations under the License. - - PhaseList + - - CurrentPhase + - - CountdownTime + - - OperationalStateList + - - OperationalState + - - OperationalError + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml index 3c76287930..bf09a56329 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml @@ -67,20 +67,16 @@ limitations under the License. - - PhaseList + - - CurrentPhase + - - CountdownTime + - - OperationalStateList + @@ -89,12 +85,10 @@ The type of this attribute in the spec is OperationalStateEnum, but the Operatio excludes the values from the base OperationalState cluster. Just use ENUM8 for the type, so it allows both values from this cluster and from the base cluster. --> - - OperationalState + - - OperationalError + diff --git a/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml index 8a54783445..ff71dcc12c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml @@ -62,12 +62,10 @@ limitations under the License. - - SupportedModes + - - CurrentMode + StartUpMode diff --git a/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml index 8bbfe44422..16b0c0c307 100644 --- a/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml @@ -44,148 +44,123 @@ limitations under the License. - - Status + - - Order + - - Description + - - WiredAssessedInputVoltage + - - WiredAssessedInputFrequency + - - WiredCurrentType + - - WiredAssessedCurrent + - - WiredNominalVoltage + - - WiredMaximumCurrent + - - WiredPresent + - - ActiveWiredFaults + - - BatVoltage + - - BatPercentRemaining + - - BatTimeRemaining + - - BatChargeLevel + - - BatReplacementNeeded + - - BatReplaceability + - - BatPresent + - - ActiveBatFaults + - - BatReplacementDescription + - - BatCommonDesignation + - - BatANSIDesignation + - - BatIECDesignation + - - BatApprovedChemistry + - - BatCapacity + @@ -193,44 +168,37 @@ limitations under the License. - - BatQuantity + - - BatChargeState + - - BatTimeToFullCharge + - - BatFunctionalWhileCharging + - - BatChargingCurrent + - - ActiveBatChargeFaults + - - EndpointList + diff --git a/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml index ba97841d34..ee99575b3b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml @@ -26,8 +26,7 @@ limitations under the License. true true - - Sources + diff --git a/src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml index c686115edc..9d5aa74931 100644 --- a/src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml @@ -44,14 +44,12 @@ limitations under the License. - - AvailableEndpoints + - - ActiveEndpoints + diff --git a/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml index 04100e8237..61f9ccc140 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml @@ -32,48 +32,39 @@ limitations under the License. - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - Tolerance + - - ScaledValue + - - MinScaledValue + - - MaxScaledValue + - - ScaledTolerance + - - Scale + diff --git a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml index b23ad51651..0158c4077d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml @@ -50,20 +50,16 @@ limitations under the License. - - MaxPressure + - - MaxSpeed + - - MaxFlow + - - MinConstPressure + @@ -73,8 +69,7 @@ limitations under the License. - - MaxConstPressure + @@ -84,8 +79,7 @@ limitations under the License. - - MinCompPressure + @@ -95,8 +89,7 @@ limitations under the License. - - MaxCompPressure + @@ -106,8 +99,7 @@ limitations under the License. - - MinConstSpeed + @@ -117,8 +109,7 @@ limitations under the License. - - MaxConstSpeed + @@ -128,8 +119,7 @@ limitations under the License. - - MinConstFlow + @@ -139,8 +129,7 @@ limitations under the License. - - MaxConstFlow + @@ -150,8 +139,7 @@ limitations under the License. - - MinConstTemp + @@ -161,8 +149,7 @@ limitations under the License. - - MaxConstTemp + @@ -172,50 +159,40 @@ limitations under the License. - - PumpStatus + - - EffectiveOperationMode + - - EffectiveControlMode + - - Capacity + - - Speed + - - LifetimeRunningHours + - - Power + - - LifetimeEnergyConsumed + - - OperationMode + - - ControlMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml b/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml index deeb16b4da..ca091a5dea 100644 --- a/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml +++ b/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml @@ -29,16 +29,13 @@ limitations under the License. true true - - Mask + - - State + - - Supported + diff --git a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml index a4fe78bc22..7ed1160ce7 100644 --- a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml @@ -56,12 +56,10 @@ limitations under the License. - - SupportedModes + - - CurrentMode + StartUpMode diff --git a/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml index 7f8157572a..047258fcbb 100644 --- a/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml @@ -25,20 +25,16 @@ limitations under the License. true true - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - Tolerance + diff --git a/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml index 25e586226f..d85bf3dfb5 100644 --- a/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml @@ -38,32 +38,26 @@ limitations under the License. - - Condition + - - DegradationDirection + - - ChangeIndication + - - InPlaceIndicator + - - LastChangedTime + - - ReplacementProductList + @@ -98,32 +92,26 @@ limitations under the License. - - Condition + - - DegradationDirection + - - ChangeIndication + - - InPlaceIndicator + - - LastChangedTime + - - ReplacementProductList + diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml index a1fe4809ee..f3ac53b22d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml @@ -67,12 +67,10 @@ limitations under the License. - - SupportedModes + - - CurrentMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml index 6cd765db7f..2ca053546c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml @@ -73,12 +73,10 @@ limitations under the License. - - SupportedModes + - - CurrentMode + diff --git a/src/app/zap-templates/zcl/data-model/chip/scene.xml b/src/app/zap-templates/zcl/data-model/chip/scene.xml index dcc929fa47..ceea35e375 100644 --- a/src/app/zap-templates/zcl/data-model/chip/scene.xml +++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml @@ -80,16 +80,13 @@ limitations under the License. - - LastConfiguredBy + - - SceneTableSize + - - FabricSceneInfo + diff --git a/src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml index c442136d46..f74647a260 100644 --- a/src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml @@ -96,31 +96,25 @@ limitations under the License. - - SupportedAreas + - - SupportedMaps + - - SelectedAreas + - - CurrentArea + - - EstimatedEndTime + - - Progress + diff --git a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml index a0543e0437..e5a3afb75d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml @@ -46,65 +46,52 @@ limitations under the License. - - ExpressedState + - - SmokeState + - - COState + - - BatteryAlert + - - DeviceMuted + - - TestInProgress + - - HardwareFaultAlert + - - EndOfServiceAlert + - - InterconnectSmokeAlarm + - - InterconnectCOAlarm + - - ContaminationState + - - SmokeSensitivityLevel + - - ExpiryDate + diff --git a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml index d0973998fa..9d4026187f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml @@ -37,20 +37,16 @@ limitations under the License. - - ThreadMetrics + - - CurrentHeapFree + - - CurrentHeapUsed + - - CurrentHeapHighWatermark + diff --git a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml index 90f61cdedc..1ab3f1d950 100644 --- a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml @@ -78,16 +78,13 @@ Interactions with the switch device are exposed as attributes (for the latching - - NumberOfPositions + - - CurrentPosition + - - MultiPressMax + diff --git a/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml index c7d516bcdc..86edb7478d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml @@ -25,12 +25,10 @@ limitations under the License. true This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. - - TargetList + - - CurrentTarget + diff --git a/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml index 2c7c173c6a..b3f7b6a86b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml @@ -40,38 +40,32 @@ limitations under the License. - - TemperatureSetpoint + - - MinTemperature + - - MaxTemperature + - - Step + - - SelectedTemperatureLevel + - - SupportedTemperatureLevels + diff --git a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml index 45317b7b43..8b5a4ac730 100644 --- a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml @@ -24,20 +24,16 @@ limitations under the License. TEMPERATURE_MEASUREMENT_CLUSTER true true - - MeasuredValue + - - MinMeasuredValue + - - MaxMeasuredValue + - - Tolerance + diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml index 9a409b7a89..d52c730d05 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml @@ -312,63 +312,52 @@ limitations under the License. - - LocalTemperature + - - OutdoorTemperature + - - Occupancy + - - AbsMinHeatSetpointLimit + - - AbsMaxHeatSetpointLimit + - - AbsMinCoolSetpointLimit + - - AbsMaxCoolSetpointLimit + - - PICoolingDemand + - - PIHeatingDemand + - - HVACSystemTypeConfiguration + - - LocalTemperatureCalibration + @@ -376,20 +365,17 @@ limitations under the License. - - OccupiedCoolingSetpoint + - - OccupiedHeatingSetpoint + - - UnoccupiedCoolingSetpoint + @@ -397,8 +383,7 @@ limitations under the License. - - UnoccupiedHeatingSetpoint + @@ -406,132 +391,109 @@ limitations under the License. - - MinHeatSetpointLimit + - - MaxHeatSetpointLimit + - - MinCoolSetpointLimit + - - MaxCoolSetpointLimit + - - MinSetpointDeadBand + - - RemoteSensing + - - ControlSequenceOfOperation + - - SystemMode + - - ThermostatRunningMode + - - StartOfWeek + - - NumberOfWeeklyTransitions + - - NumberOfDailyTransitions + - - TemperatureSetpointHold + - - TemperatureSetpointHoldDuration + - - ThermostatProgrammingOperationMode + - - ThermostatRunningState + - - SetpointChangeSource + - - SetpointChangeAmount + - - SetpointChangeSourceTimestamp + - - OccupiedSetback + - - OccupiedSetbackMin + - - OccupiedSetbackMax + - - UnoccupiedSetback + @@ -540,8 +502,7 @@ limitations under the License. - - UnoccupiedSetbackMin + @@ -549,8 +510,7 @@ limitations under the License. - - UnoccupiedSetbackMax + @@ -558,114 +518,94 @@ limitations under the License. - - EmergencyHeatDelta + - - ACType + - - ACCapacity + - - ACRefrigerantType + - - ACCompressorType + - - ACErrorCode + - - ACLouverPosition + - - ACCoilTemperature + - - ACCapacityformat + - - PresetTypes + - - ScheduleTypes + - - NumberOfPresets + - - NumberOfSchedules + - - NumberOfScheduleTransitions + - - NumberOfScheduleTransitionPerDay + - - ActivePresetHandle + - - ActiveScheduleHandle + - - Presets + - - Schedules + - - SetpointHoldExpiryTimestamp + diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml index a95a9a31f3..ed0b412570 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml @@ -29,20 +29,17 @@ limitations under the License. - - TemperatureDisplayMode + - - KeypadLockout + - - ScheduleProgrammingVisibility + diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml index 84132e495c..38612b5eb6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml @@ -33,33 +33,27 @@ limitations under the License. - - BorderRouterName + - - BorderAgentID + - - ThreadVersion + - - InterfaceEnabled + - - ActiveDatasetTimestamp + - - PendingDatasetTimestamp + diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml index 8804d64e30..943f69f58f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml @@ -108,342 +108,279 @@ limitations under the License. - - Channel + - - RoutingRole + - - NetworkName + - - PanId + - - ExtendedPanId + - - MeshLocalPrefix + - - OverrunCount + - - NeighborTable + - - RouteTable + - - PartitionId + - - Weighting + - - DataVersion + - - StableDataVersion + - - LeaderRouterId + - - DetachedRoleCount + - - ChildRoleCount + - - RouterRoleCount + - - LeaderRoleCount + - - AttachAttemptCount + - - PartitionIdChangeCount + - - BetterPartitionAttachAttemptCount + - - ParentChangeCount + - - TxTotalCount + - - TxUnicastCount + - - TxBroadcastCount + - - TxAckRequestedCount + - - TxAckedCount + - - TxNoAckRequestedCount + - - TxDataCount + - - TxDataPollCount + - - TxBeaconCount + - - TxBeaconRequestCount + - - TxOtherCount + - - TxRetryCount + - - TxDirectMaxRetryExpiryCount + - - TxIndirectMaxRetryExpiryCount + - - TxErrCcaCount + - - TxErrAbortCount + - - TxErrBusyChannelCount + - - RxTotalCount + - - RxUnicastCount + - - RxBroadcastCount + - - RxDataCount + - - RxDataPollCount + - - RxBeaconCount + - - RxBeaconRequestCount + - - RxOtherCount + - - RxAddressFilteredCount + - - RxDestAddrFilteredCount + - - RxDuplicatedCount + - - RxErrNoFrameCount + - - RxErrUnknownNeighborCount + - - RxErrInvalidSrcAddrCount + - - RxErrSecCount + - - RxErrFcsCount + - - RxErrOtherCount + - - ActiveTimestamp + - - PendingTimestamp + - - Delay + - - SecurityPolicy + - - ChannelPage0Mask + - - OperationalDatasetComponents + - - ActiveNetworkFaultsList + diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml index 8f997cebc4..2b00af3102 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml @@ -38,19 +38,16 @@ limitations under the License. - - PreferredExtendedPanID + - - ThreadNetworks + - - ThreadNetworkTableSize + diff --git a/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml index bfc2222ef3..b71b710b70 100644 --- a/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml @@ -58,20 +58,17 @@ limitations under the License. - - HourFormat + - - ActiveCalendarType + - - SupportedCalendarTypes + diff --git a/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml index 201f71a201..a352b2a181 100644 --- a/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml @@ -114,74 +114,61 @@ limitations under the License. - - UTCTime + - - Granularity + - - TimeSource + - - TrustedTimeSource + - - DefaultNTP + - - TimeZone + - - DSTOffset + - - LocalTime + - - TimeZoneDatabase + - - NTPServerAvailable + - - TimeZoneListMaxSize + - - DSTOffsetListMaxSize + - - SupportsDNSResolve + diff --git a/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml index 0deb6225ee..d79a265f63 100644 --- a/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml @@ -42,8 +42,7 @@ limitations under the License. - - TemperatureUnit + diff --git a/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml index 14ffa15b70..acea3035a4 100644 --- a/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml @@ -23,8 +23,7 @@ limitations under the License. 0x0041 USER_LABEL_CLUSTER The User Label Cluster provides a feature to tag an endpoint with zero or more labels. - - LabelList + diff --git a/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml index 052a08108a..6656876c99 100644 --- a/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/valve-configuration-and-control-cluster.xml @@ -59,58 +59,47 @@ limitations under the License. - - OpenDuration + - - DefaultOpenDuration + - - AutoCloseTime + - - RemainingDuration + - - CurrentState + - - TargetState + - - CurrentLevel + - - TargetLevel + - - DefaultOpenLevel + - - ValveFault + - - LevelStep + diff --git a/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml index 50c88a0272..700f25b198 100644 --- a/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml @@ -28,12 +28,10 @@ limitations under the License. - - MACAddress + - - LinkLocalAddress + diff --git a/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml index 663f13dfcc..d566acb28c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml @@ -46,26 +46,22 @@ limitations under the License. - - SpinSpeeds + - - SpinSpeedCurrent + - - NumberOfRinses + - - SupportedRinses + diff --git a/src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml index b1ee7e3c3f..b5665d4402 100644 --- a/src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml @@ -58,34 +58,28 @@ limitations under the License. true - - HeaterTypes + - - HeatDemand + - - TankVolume + - - EstimatedHeatRequired + - - TankPercentage + - - BoostState + diff --git a/src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml index b31690f14f..3f02e50fa5 100644 --- a/src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml @@ -57,14 +57,15 @@ limitations under the License. - - SupportedModes + - - CurrentMode + + StartUpMode + OnMode + This command is used to change device modes. 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 f2a68e977b..784568337b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml @@ -64,68 +64,55 @@ limitations under the License. - - BSSID + - - SecurityType + - - WiFiVersion + - - ChannelNumber + - - RSSI + - - BeaconLostCount + - - BeaconRxCount + - - PacketMulticastRxCount + - - PacketMulticastTxCount + - - PacketUnicastRxCount + - - PacketUnicastTxCount + - - CurrentMaxRate + - - OverrunCount + diff --git a/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml index c5246f6acd..1c14050fc2 100644 --- a/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml @@ -30,12 +30,10 @@ limitations under the License. - - SSID + - - PassphraseSurrogate + diff --git a/src/app/zap-templates/zcl/data-model/chip/window-covering.xml b/src/app/zap-templates/zcl/data-model/chip/window-covering.xml index 1363b5c8aa..5795e8efc3 100644 --- a/src/app/zap-templates/zcl/data-model/chip/window-covering.xml +++ b/src/app/zap-templates/zcl/data-model/chip/window-covering.xml @@ -57,13 +57,11 @@ limitations under the License. - - Type + - - PhysicalClosedLimitLift + @@ -73,8 +71,7 @@ limitations under the License. - - PhysicalClosedLimitTilt + @@ -84,8 +81,7 @@ limitations under the License. - - CurrentPositionLift + @@ -95,8 +91,7 @@ limitations under the License. - - CurrentPositionTilt + @@ -106,27 +101,23 @@ limitations under the License. - - NumberOfActuationsLift + - - NumberOfActuationsTilt + - - ConfigStatus + - - CurrentPositionLiftPercentage + @@ -135,8 +126,7 @@ limitations under the License. - - CurrentPositionTiltPercentage + @@ -145,13 +135,11 @@ limitations under the License. - - OperationalStatus + - - TargetPositionLiftPercent100ths + @@ -160,8 +148,7 @@ limitations under the License. - - TargetPositionTiltPercent100ths + @@ -170,13 +157,11 @@ limitations under the License. - - EndProductType + - - CurrentPositionLiftPercent100ths + @@ -185,8 +170,7 @@ limitations under the License. - - CurrentPositionTiltPercent100ths + @@ -196,8 +180,7 @@ limitations under the License. - - InstalledOpenLimitLift + @@ -206,8 +189,7 @@ limitations under the License. - - InstalledClosedLimitLift + @@ -217,8 +199,7 @@ limitations under the License. - - InstalledOpenLimitTilt + @@ -227,8 +208,7 @@ limitations under the License. - - InstalledClosedLimitTilt + @@ -242,8 +222,7 @@ limitations under the License. - - Mode + @@ -252,8 +231,7 @@ limitations under the License. - - SafetyStatus +