diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 71bb489e6a3c21..bec63bfa49c8d7 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -2426,7 +2426,7 @@ cluster TimeSynchronization = 56 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
@@ -2952,7 +2952,7 @@ cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
/** This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine. */
cluster LaundryWasherControls = 83 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum NumberOfRinsesEnum : enum8 {
kNone = 0;
@@ -3425,7 +3425,7 @@ provisional cluster MicrowaveOvenMode = 94 {
/** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
cluster OperationalState = 96 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum ErrorStateEnum : enum8 {
kNoError = 0;
@@ -3491,7 +3491,7 @@ cluster OperationalState = 96 {
/** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
cluster RvcOperationalState = 97 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum ErrorStateEnum : enum8 {
kFailedToFindChargingDock = 64;
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index 95dddce935ea21..42daa8ddac3aa8 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -2158,7 +2158,7 @@ cluster EthernetNetworkDiagnostics = 55 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index 7e73c15a77843a..aef4649df2ce39 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -1550,7 +1550,7 @@ cluster EthernetNetworkDiagnostics = 55 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
index db46b2db43a458..75fc5f1af0cb09 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
@@ -1040,7 +1040,7 @@ cluster GroupKeyManagement = 63 {
/** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
cluster OperationalState = 96 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum ErrorStateEnum : enum8 {
kNoError = 0;
diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
index 748ff8600d947e..9a519df48b380f 100644
--- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
+++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
@@ -671,7 +671,7 @@ cluster GeneralDiagnostics = 51 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
index d5eb1ef1827039..51af151b59bbcf 100644
--- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
+++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
@@ -1040,7 +1040,7 @@ cluster GroupKeyManagement = 63 {
/** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
cluster OperationalState = 96 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum ErrorStateEnum : enum8 {
kNoError = 0;
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
index 014daaffa2213f..ddc12bda428fcb 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -1112,7 +1112,7 @@ cluster RvcCleanMode = 85 {
/** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
cluster RvcOperationalState = 97 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum ErrorStateEnum : enum8 {
kFailedToFindChargingDock = 64;
diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
index 70888c4c53d335..6a2620e02878fa 100644
--- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
+++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
@@ -1138,7 +1138,7 @@ cluster GroupKeyManagement = 63 {
/** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
cluster OperationalState = 96 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum ErrorStateEnum : enum8 {
kNoError = 0;
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index 1f8c3b2bb4a5b5..db7b722df87860 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -1769,7 +1769,7 @@ cluster TimeSynchronization = 56 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 8a50b9eb7721af..1dbdd0a6b54450 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -1675,7 +1675,7 @@ cluster EthernetNetworkDiagnostics = 55 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 141c16cf46e6e3..c096d265aa0628 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -2544,7 +2544,7 @@ cluster BridgedDeviceBasicInformation = 57 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
@@ -2599,7 +2599,7 @@ cluster Switch = 59 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index da0c83939f94a1..6fc557367ce7d5 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -2501,7 +2501,7 @@ cluster BridgedDeviceBasicInformation = 57 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
@@ -2556,7 +2556,7 @@ cluster Switch = 59 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter
index f791bee8e85180..682b5ef6f5dd54 100644
--- a/examples/rvc-app/rvc-common/rvc-app.matter
+++ b/examples/rvc-app/rvc-common/rvc-app.matter
@@ -1035,7 +1035,7 @@ cluster RvcCleanMode = 85 {
/** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
cluster RvcOperationalState = 97 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum ErrorStateEnum : enum8 {
kFailedToFindChargingDock = 64;
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 a07ac6d0d505e1..1d98820d274442 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
@@ -32,7 +32,7 @@ limitations under the License.
true
This cluster allows a client to manage the power draw of a device. An example of such a client could be an Energy Management System (EMS) which controls an Energy Smart Appliance (ESA).
-
+
ESAType
@@ -189,4 +189,4 @@ limitations under the License.
-
\ No newline at end of file
+
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 df911627b297dc..2e58fb31da3f42 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
@@ -82,7 +82,7 @@ limitations under the License.
true
Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management.
-
+
State
@@ -214,4 +214,4 @@ limitations under the License.
-
\ No newline at end of file
+
diff --git a/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml
index 1de079011c00ab..9514659cda3cf5 100644
--- a/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml
@@ -36,9 +36,9 @@ limitations under the License.
This cluster supports remotely monitoring and controling the different typs of
functionality available to a drying device, such as a laundry dryer.
-
+
SupportedDrynessLevels
SelectedDrynessLevel
-
\ No newline at end of file
+
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 a93e27fe130333..bf296d237b8327 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,7 +61,7 @@ limitations under the License.
true
This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation.
-
+
PhaseList
CurrentPhase
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 b34995597bd6f7..8f19a21cf1bc59 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
@@ -45,7 +45,7 @@ limitations under the License.
true
This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum.
-
+
PhaseList
CurrentPhase
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 7586e063843f62..7df57e3ebd26c1 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
@@ -28,7 +28,7 @@ Two types of switch devices are supported: latching switch (e.g. rocker switch)
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade.
-
+
NumberOfPositions
CurrentPosition
diff --git a/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml
index 07f2aa1f822cf7..1b1156b54e5480 100644
--- a/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml
@@ -40,7 +40,7 @@ limitations under the License.
true
This cluster supports creating a simple timer functionality.
-
+
SetTime
TimeRemaining
@@ -73,4 +73,4 @@ limitations under the License.
-
\ No newline at end of file
+
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 2b076b67eb03d1..ac278ca488837c 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
@@ -40,7 +40,7 @@ limitations under the License.
true
This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine.
-
+
SpinSpeeds
SpinSpeedCurrent
@@ -48,4 +48,4 @@ limitations under the License.
SupportedRinses
-
\ No newline at end of file
+
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index b78cbfa007eca0..380270d146601a 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -2449,7 +2449,7 @@ cluster BridgedDeviceBasicInformation = 57 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
@@ -2925,7 +2925,7 @@ cluster IcdManagement = 70 {
/** This cluster supports creating a simple timer functionality. */
provisional cluster Timer = 71 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum TimerStatusEnum : enum8 {
kRunning = 0;
@@ -3095,7 +3095,7 @@ provisional cluster OvenMode = 73 {
/** This cluster supports remotely monitoring and controling the different typs of
functionality available to a drying device, such as a laundry dryer. */
cluster LaundryDryerControls = 74 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum DrynessLevelEnum : enum8 {
kLow = 0;
@@ -3256,7 +3256,7 @@ cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
/** This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine. */
cluster LaundryWasherControls = 83 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum NumberOfRinsesEnum : enum8 {
kNone = 0;
@@ -3761,7 +3761,7 @@ provisional cluster MicrowaveOvenControl = 95 {
/** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
cluster OperationalState = 96 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum ErrorStateEnum : enum8 {
kNoError = 0;
@@ -3827,7 +3827,7 @@ cluster OperationalState = 96 {
/** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
cluster RvcOperationalState = 97 {
- revision 1; // NOTE: Default/not specifically set
+ revision 1;
enum ErrorStateEnum : enum8 {
kFailedToFindChargingDock = 64;
@@ -4396,7 +4396,7 @@ provisional cluster DemandResponseLoadControl = 150 {
/** This cluster allows a client to manage the power draw of a device. An example of such a client could be an Energy Management System (EMS) which controls an Energy Smart Appliance (ESA). */
provisional cluster DeviceEnergyManagement = 152 {
- revision 1; // NOTE: Default/not specifically set
+ revision 2;
enum CauseEnum : enum8 {
kNormalCompletion = 0;
@@ -4575,7 +4575,7 @@ provisional cluster DeviceEnergyManagement = 152 {
/** Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management. */
provisional cluster EnergyEvse = 153 {
- revision 1; // NOTE: Default/not specifically set
+ revision 2;
enum EnergyTransferStoppedReasonEnum : enum8 {
kEVStopped = 0;