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 acf51b0a8b2bfe..d096a16ff3d963 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
@@ -178,11 +178,11 @@ limitations under the License.
-
- This event SHALL be generated when there is a change in the State of an ActionID during the execution of an action and the most recent command using that ActionID used an InvokeID data field.
+
+ This event SHALL be generated when there is a change in the Status of an ActionID.
-
+
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 6ff026704b93b1..58d09e3a888b77 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,7 +43,7 @@ limitations under the License.
-
+
WindowStatus
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 56d5c43db957cf..ea6be51e9bcb28 100644
--- a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml
@@ -32,7 +32,7 @@ limitations under the License.
VendorID
-
+
ApplicationName
@@ -44,7 +44,7 @@ limitations under the License.
Application
-
+
Status
@@ -52,7 +52,7 @@ limitations under the License.
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 8f29bc395537e4..07384220f4eaeb 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
@@ -30,7 +30,7 @@ limitations under the License.
-
+
CatalogList
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 2978c1a1274125..4e6dd131824a3b 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
@@ -30,7 +30,7 @@ limitations under the License.
-
+
OutputList
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 7e4ac2f0aa497e..29ec1cd38108f3 100644
--- a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml
@@ -65,7 +65,7 @@ limitations under the License.
-
+
IntrinsicBallastFactor
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 e52e01ddccbd79..288c82f950b8ab 100644
--- a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
@@ -72,9 +72,8 @@ limitations under the License.
This cluster provides attributes and events for determining basic information about Nodes, which supports both
Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
which apply to the whole Node. Also allows setting user device information such as location.
- true
- true
-
+
+
DataModelRevision
@@ -165,21 +164,18 @@ limitations under the License.
ProductAppearance
-
+
SpecificationVersion
-
+
MaxPathsPerInvoke
-
- DeviceLocation
-
-
-
-
- The StartUp event SHALL be emitted by a Node as soon as reasonable after completing a boot or reboot process.
+
+
+ The StartUp event SHALL be emitted by a Node as soon as reasonable after completing a boot or reboot process.
+
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 2c5d081349a8d3..04070700f2fcd1 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
@@ -75,7 +75,7 @@ limitations under the License.
-
+
AlarmsActive
@@ -84,7 +84,7 @@ limitations under the License.
-
+
AlarmsSuppressed
@@ -99,7 +99,7 @@ limitations under the License.
-
+
AlarmsSupported
diff --git a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml
index 1a21e6acca3343..39a2e2c258ac5f 100644
--- a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml
@@ -77,104 +77,47 @@ limitations under the License.
-
- VendorName
-
-
-
- VendorID
-
-
-
- ProductName
-
-
+ VendorName
+ VendorID
+ ProductName
ProductID
-
- NodeLabel
-
-
- HardwareVersion
-
-
-
- HardwareVersionString
-
-
-
- SoftwareVersion
-
-
-
- SoftwareVersionString
-
-
-
- ManufacturingDate
-
-
-
- PartNumber
-
-
-
- ProductURL
-
-
-
- ProductLabel
-
-
-
- SerialNumber
-
-
-
- Reachable
-
-
-
- UniqueID
-
-
-
- ProductAppearance
-
-
+ NodeLabel
+ HardwareVersion
+ HardwareVersionString
+ SoftwareVersion
+ SoftwareVersionString
+ ManufacturingDate
+ PartNumber
+ ProductURL
+ ProductLabel
+ SerialNumber
+ Reachable
+ UniqueID
+ ProductAppearance
The server SHALL attempt to keep the devices specified active for StayActiveDuration milliseconds when they are next active.
-
-
-
The StartUp event SHALL be emitted by a Node as soon as reasonable after completing a boot or reboot process.
-
The ShutDown event SHOULD be emitted by a Node prior to any orderly shutdown sequence on a best-effort basis.
-
The Leave event SHOULD be emitted by a Node prior to permanently leaving the Fabric.
-
This event SHALL be generated when there is a change in the Reachable attribute.
-
This event (when supported) SHALL be generated the next time a bridged device becomes active after a KeepActive command is received.
-
-
-
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 c38ce609974927..26d377aa4a6e88 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
@@ -40,7 +40,7 @@ limitations under the License.
-
+
ChannelList
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 20daa292214cce..a33688002f75e6 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
@@ -169,7 +169,7 @@ limitations under the License.
-
+
ColorTemperatureMireds
@@ -502,7 +502,7 @@ limitations under the License.
-
+
CoupleColorTempToLevelMinMireds
@@ -671,7 +671,6 @@ limitations under the License.
-
diff --git a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml
index 9c708a0e3af5a0..72fcea20e59727 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
@@ -57,7 +57,7 @@ limitations under the License.
-
+
MeasuredValue
@@ -75,43 +75,43 @@ limitations under the License.
-
+
PeakMeasuredValue
-
+
PeakMeasuredValueWindow
-
+
AverageMeasuredValue
-
+
AverageMeasuredValueWindow
-
+
Uncertainty
-
+
MeasurementUnit
-
+
MeasurementMedium
@@ -165,7 +165,7 @@ limitations under the License.
-
+
MeasuredValue
@@ -183,43 +183,43 @@ limitations under the License.
-
+
PeakMeasuredValue
-
+
PeakMeasuredValueWindow
-
+
AverageMeasuredValue
-
+
AverageMeasuredValueWindow
-
+
Uncertainty
-
+
MeasurementUnit
-
+
MeasurementMedium
@@ -245,10 +245,10 @@ limitations under the License.
-
+
-
+
@@ -271,7 +271,7 @@ limitations under the License.
-
+
MeasuredValue
@@ -289,43 +289,43 @@ limitations under the License.
-
+
PeakMeasuredValue
-
+
PeakMeasuredValueWindow
-
+
AverageMeasuredValue
-
+
AverageMeasuredValueWindow
-
+
Uncertainty
-
+
MeasurementUnit
-
+
MeasurementMedium
@@ -351,10 +351,10 @@ limitations under the License.
-
+
-
+
@@ -377,7 +377,7 @@ limitations under the License.
-
+
MeasuredValue
@@ -395,43 +395,43 @@ limitations under the License.
-
+
PeakMeasuredValue
-
+
PeakMeasuredValueWindow
-
+
AverageMeasuredValue
-
+
AverageMeasuredValueWindow
-
+
Uncertainty
-
+
MeasurementUnit
-
+
MeasurementMedium
@@ -457,10 +457,10 @@ limitations under the License.
-
+
-
+
@@ -483,7 +483,7 @@ limitations under the License.
-
+
MeasuredValue
@@ -501,43 +501,43 @@ limitations under the License.
-
+
PeakMeasuredValue
-
+
PeakMeasuredValueWindow
-
+
AverageMeasuredValue
-
+
AverageMeasuredValueWindow
-
+
Uncertainty
-
+
MeasurementUnit
-
+
MeasurementMedium
@@ -563,10 +563,10 @@ limitations under the License.
-
+
-
+
@@ -589,7 +589,7 @@ limitations under the License.
-
+
MeasuredValue
@@ -607,43 +607,43 @@ limitations under the License.
-
+
PeakMeasuredValue
-
+
PeakMeasuredValueWindow
-
+
AverageMeasuredValue
-
+
AverageMeasuredValueWindow
-
+
Uncertainty
-
+
MeasurementUnit
-
+
MeasurementMedium
@@ -669,10 +669,10 @@ limitations under the License.
-
+
-
+
@@ -695,7 +695,7 @@ limitations under the License.
-
+
MeasuredValue
@@ -713,43 +713,43 @@ limitations under the License.
-
+
PeakMeasuredValue
-
+
PeakMeasuredValueWindow
-
+
AverageMeasuredValue
-
+
AverageMeasuredValueWindow
-
+
Uncertainty
-
+
MeasurementUnit
-
+
MeasurementMedium
@@ -775,10 +775,10 @@ limitations under the License.
-
+
-
+
@@ -801,7 +801,7 @@ limitations under the License.
-
+
MeasuredValue
@@ -819,43 +819,43 @@ limitations under the License.
-
+
PeakMeasuredValue
-
+
PeakMeasuredValueWindow
-
+
AverageMeasuredValue
-
+
AverageMeasuredValueWindow
-
+
Uncertainty
-
+
MeasurementUnit
-
+
MeasurementMedium
@@ -881,10 +881,10 @@ limitations under the License.
-
+
-
+
@@ -907,7 +907,7 @@ limitations under the License.
-
+
MeasuredValue
@@ -925,43 +925,43 @@ limitations under the License.
-
+
PeakMeasuredValue
-
+
PeakMeasuredValueWindow
-
+
AverageMeasuredValue
-
+
AverageMeasuredValueWindow
-
+
Uncertainty
-
+
MeasurementUnit
-
+
MeasurementMedium
@@ -987,10 +987,10 @@ limitations under the License.
-
+
-
+
@@ -1013,7 +1013,7 @@ limitations under the License.
-
+
MeasuredValue
@@ -1031,43 +1031,43 @@ limitations under the License.
-
+
PeakMeasuredValue
-
+
PeakMeasuredValueWindow
-
+
AverageMeasuredValue
-
+
AverageMeasuredValueWindow
-
+
Uncertainty
-
+
MeasurementUnit
-
+
MeasurementMedium
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 bef8f4fb03913e..3825955351e231 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
@@ -70,13 +70,13 @@ limitations under the License.
-
+
ScreenDailyTime
-
+
RemainingScreenTime
@@ -89,6 +89,12 @@ limitations under the License.
+
+ The purpose of this command is to update the PIN used for protecting configuration of the content control settings. Upon success, the old PIN SHALL no longer work. The PIN is used to ensure that only the Node (or User) with the PIN code can make changes to the Content Control settings, for example, turn off Content Controls or modify the ScreenDailyTime. The PIN is composed of a numeric string of up to 6 human readable characters (displayable) . Upon receipt of this command, the media device SHALL check if the OldPIN field of this command is the same as the current PIN. If the PINs are the same, then the PIN code SHALL be set to NewPIN. Otherwise a response with InvalidPINCode error status SHALL be returned. The media device MAY provide a default PIN to the User via an out of band mechanism. For security reasons, it is recommended that a client encourage the user to update the PIN from its default value when performing configuration of the Content Control settings exposed by this cluster. The ResetPIN command can also be used to obtain the default PIN.
+
+
+
+
The purpose of this command is to reset the PIN. If this command is executed successfully, a ResetPINResponse command with a new PIN SHALL be returned.
@@ -167,7 +173,6 @@ 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 3ee3306afe7283..fda9a07789c5d8 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
@@ -66,9 +66,5 @@ limitations under the License.
-
- EndpointUniqueID
-
-
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 e051b91b952fdc..6cc49243fe8593 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
@@ -186,7 +186,8 @@ planned operation.">
- Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command
+ Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command
+
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 2d02aa32b96e43..fb7258583b56e5 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
@@ -67,6 +67,7 @@ limitations under the License.
StartUpMode
OnMode
+
diff --git a/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml
index 561dd1968e9f53..4140fd18a0eaec 100644
--- a/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml
@@ -14,13 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
+
@@ -28,7 +22,6 @@ Git: 0.9-fall2024-87-gcdfdb86be-dirty
-
@@ -37,13 +30,11 @@ Git: 0.9-fall2024-87-gcdfdb86be-dirty
-
-
Diagnostic Logs
CHIP
@@ -59,8 +50,7 @@ Git: 0.9-fall2024-87-gcdfdb86be-dirty
-
-
+
Response to the RetrieveLogsRequest
@@ -68,6 +58,5 @@ Git: 0.9-fall2024-87-gcdfdb86be-dirty
-
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 96a4e16d8508c3..a8cf1e166219e2 100644
--- a/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml
@@ -42,6 +42,7 @@ limitations under the License.
+
Mask
@@ -60,6 +61,7 @@ limitations under the License.
Supported
+
Reset alarm
@@ -74,7 +76,7 @@ limitations under the License.
-
+
Notify
diff --git a/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml
index 2e1b36901beeb3..7cc15557f0c5a1 100644
--- a/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml
@@ -67,6 +67,7 @@ limitations under the License.
StartUpMode
OnMode
+
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 cc3c7a286b3d28..f16bbbf28bbbba 100644
--- a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
@@ -131,6 +131,7 @@ limitations under the License.
3. Everything that depends on a certain feature is optional because we have no way
of setting up the dependencies here. Dependencies would be probably resolved in the
cluster itself. Those attributes/commands are marked with a special comment. -->
+
LockState
@@ -163,6 +164,7 @@ limitations under the License.
DoorClosedEvents
+
@@ -199,21 +201,21 @@ limitations under the License.
-
+
NumberOfWeekDaySchedulesSupportedPerUser
-
+
NumberOfYearDaySchedulesSupportedPerUser
-
+
NumberOfHolidaySchedulesSupported
@@ -466,14 +468,12 @@ limitations under the License.
-
This command causes the lock device to unlock the door.
-
This command causes the lock device to unlock the door with a timeout parameter.
@@ -482,7 +482,6 @@ limitations under the License.
-
Set a weekly repeating schedule for a specified user.
@@ -498,7 +497,6 @@ limitations under the License.
-
Retrieve the specific weekly schedule for the specific user.
@@ -509,7 +507,6 @@ limitations under the License.
-
Returns the weekly repeating schedule data for the specified schedule index.
@@ -525,7 +522,6 @@ limitations under the License.
-
Clear the specific weekly schedule or all weekly schedules for the specific user.
@@ -536,7 +532,6 @@ limitations under the License.
-
Set a time-specific schedule ID for a specified user.
@@ -549,7 +544,6 @@ limitations under the License.
-
Returns the year day schedule data for the specified schedule and user indexes.
@@ -560,7 +554,6 @@ limitations under the License.
-
Returns the year day schedule data for the specified schedule and user indexes.
@@ -573,7 +566,6 @@ limitations under the License.
-
Clears the specific year day schedule or all year day schedules for the specific user.
@@ -584,7 +576,6 @@ limitations under the License.
-
Set the holiday Schedule by specifying local start time and local end time with respect to any Lock Operating Mode.
@@ -597,7 +588,6 @@ limitations under the License.
-
Get the holiday schedule for the specified index.
@@ -607,7 +597,6 @@ limitations under the License.
-
Returns the Holiday Schedule Entry for the specified Holiday ID.
@@ -620,7 +609,6 @@ limitations under the License.
-
Clears the holiday schedule or all holiday schedules.
@@ -630,7 +618,6 @@ limitations under the License.
-
Set User into the lock.
@@ -646,7 +633,6 @@ limitations under the License.
-
Retrieve User.
@@ -656,7 +642,6 @@ limitations under the License.
-
Returns the User for the specified UserIndex.
@@ -674,7 +659,6 @@ limitations under the License.
-
Clears a User or all Users.
@@ -684,7 +668,6 @@ limitations under the License.
-
Set a credential (e.g. PIN, RFID, Fingerprint, etc.) into the lock for a new user, existing user, or ProgrammingUser.
@@ -699,7 +682,6 @@ limitations under the License.
-
Returns the status for setting the specified credential.
@@ -710,7 +692,6 @@ limitations under the License.
-
Retrieve the status of a particular credential (e.g. PIN, RFID, Fingerprint, etc.) by index.
@@ -720,7 +701,6 @@ limitations under the License.
-
Returns the status for the specified credential.
@@ -734,7 +714,6 @@ limitations under the License.
-
Clear one, one type, or all credentials except ProgrammingPIN credential.
@@ -744,7 +723,6 @@ limitations under the License.
-
This command causes the lock device to unlock the door without pulling the latch.
@@ -753,7 +731,6 @@ limitations under the License.
-
This command communicates an Aliro Reader configuration to the lock.
@@ -765,7 +742,6 @@ limitations under the License.
-
This command clears an existing Aliro Reader configuration for the lock.
@@ -774,13 +750,13 @@ limitations under the License.
+
The door lock cluster provides several alarms which can be sent when there is a critical state on the door lock.
-
The door lock server sends out a DoorStateChange event when the door lock door state changes.
@@ -789,7 +765,6 @@ limitations under the License.
-
The door lock server sends out a LockOperation event when the event is triggered by the various lock operation sources.
@@ -801,7 +776,6 @@ limitations under the License.
-
The door lock server sends out a LockOperationError event when a lock operation fails for various reasons.
@@ -814,7 +788,6 @@ limitations under the License.
-
The door lock server sends out a LockUserChange event when a lock user, schedule, or credential change has occurred.
@@ -828,9 +801,9 @@ limitations under the License.
-
+
@@ -986,6 +959,7 @@ limitations under the License.
+
diff --git a/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml
index 46a4aad1654e10..d7e04ccf464668 100644
--- a/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml
@@ -198,6 +198,7 @@ limitations under the License.
+
LoadControlPrograms
@@ -210,7 +211,7 @@ limitations under the License.
Events
-
+
ActiveEvents
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 43806a8680145e..4fe67a5148a959 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
@@ -66,6 +66,7 @@ limitations under the License.
StartUpMode
OnMode
+
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 086a846ea3aab1..5018b9dd0b180a 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
@@ -40,6 +40,7 @@ limitations under the License.
+
CurrentEnergyBalance
@@ -47,6 +48,7 @@ limitations under the License.
+
EnergyPriorities
@@ -54,6 +56,7 @@ limitations under the License.
+
LowPowerModeSensitivities
@@ -61,13 +64,17 @@ limitations under the License.
+
+
+
CurrentLowPowerModeSensitivity
+
diff --git a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml
index e11287f31ef4b3..d84f017f5eea00 100644
--- a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml
@@ -44,6 +44,7 @@ limitations under the License.
+
PHYRate
@@ -52,31 +53,31 @@ limitations under the License.
FullDuplex
-
+
PacketRxCount
-
+
PacketTxCount
-
+
TxErrCount
-
+
CollisionCount
-
+
OverrunCount
@@ -86,7 +87,7 @@ limitations under the License.
CarrierDetect
-
+
TimeSinceReset
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 aa71cc1ec54d0a..e8877b5c1cc9d9 100644
--- a/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml
@@ -145,8 +145,7 @@ limitations under the License.
-
-
+
Success/failure response for SetRegulatoryConfig command
@@ -157,7 +156,7 @@ limitations under the License.
-
+
Indicates to client whether CommissioningComplete command succeeded
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 2a5a021126807a..f0c62e13740bf9 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
@@ -91,21 +91,22 @@ limitations under the License.
+
NetworkInterfaces
-
+
RebootCount
-
+
UpTime
-
+
TotalOperationalHours
@@ -169,9 +170,9 @@ limitations under the License.
-
- This command is sent by the server on receipt of the PayloadTestRequest command.
-
+
+ Response for the PayloadTestRequest command.
+
@@ -195,7 +196,6 @@ limitations under the License.
-
Indicate the reason that caused the device to start-up.
diff --git a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml
index 35f0c32942b540..4d678a100abd02 100644
--- a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml
@@ -79,6 +79,7 @@ limitations under the License.
MaxGroupKeysPerFabric
+
Write a new set of keys for the given key set id.
diff --git a/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml
index f9fe5d6db8d961..ab6df628fc18bf 100644
--- a/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml
@@ -39,10 +39,12 @@ limitations under the License.
+
NameSupport
+
Command description for AddGroup
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 fa2b4bfd66c632..268573b0ec5666 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,17 +61,17 @@ limitations under the License.
-
+
CurrentLevel
-
+
RemainingTime
-
+
MinLevel
@@ -79,17 +79,17 @@ limitations under the License.
-
+
MaxLevel
-
+
CurrentFrequency
-
+
MinFrequency
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 32d220720f09db..068338172c6afd 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
@@ -35,7 +35,7 @@ limitations under the License.
InputList
-
+
CurrentInput
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 9a67552b4a6215..4fe451df0dcbd9 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
@@ -40,15 +40,15 @@ limitations under the License.
ThreadMetrics
-
+
CurrentHeapFree
-
+
CurrentHeapUsed
-
+
CurrentHeapHighWatermark
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 0ee7d11843329c..5629bfd3a6506e 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
@@ -445,14 +445,6 @@ limitations under the License.
ActiveNetworkFaultsList
-
- ExtAddress
-
-
-
- Rloc16
-
-
Reception of this command SHALL reset the OverrunCount attributes to 0
diff --git a/src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml
index 9e338efee7f7ce..be853e18f113eb 100644
--- a/src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml
@@ -14,12 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-
diff --git a/src/app/zap-templates/zcl/data-model/chip/webrtc-requestor-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/webrtc-requestor-cluster.xml
index 557ebf8e7b3cba..2d75b268f19a34 100644
--- a/src/app/zap-templates/zcl/data-model/chip/webrtc-requestor-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/webrtc-requestor-cluster.xml
@@ -14,12 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-
diff --git a/src/app/zap-templates/zcl/data-model/chip/window-covering.xml b/src/app/zap-templates/zcl/data-model/chip/window-covering.xml
index 09040f731b7685..563f86f0493813 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
@@ -170,7 +170,7 @@ limitations under the License.
-
+
EndProductType
diff --git a/src/app/zap-templates/zcl/data-model/chip/zone-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/zone-management-cluster.xml
index 27a947b5610015..2ba589f9c5027d 100644
--- a/src/app/zap-templates/zcl/data-model/chip/zone-management-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/zone-management-cluster.xml
@@ -14,12 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-