Move OnOff cluster to match the spec (#29946)

andy31415 · andreilitvin · pull[bot] · commit 4237395b2335 · 2023-11-29T03:36:11.000Z
* Match onoff naming to spec

* Zap regen

* Minor change to re-kick CI

* Undo the rename of Behaviour

* Bump OnOff revision to 6 (add off only feature)

---------

Co-authored-by: Andrei Litvin &lt;andreilitvin@google.com&gt;
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
@@ -314,6 +314,7 @@ client cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -334,7 +335,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -383,6 +384,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -403,7 +405,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
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
@@ -269,6 +269,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -289,7 +290,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -73,6 +73,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -136,6 +136,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
@@ -27,6 +27,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -142,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -136,6 +136,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -136,6 +136,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -136,6 +136,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -136,6 +136,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter
@@ -136,6 +136,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -136,6 +136,7 @@ client cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -156,7 +157,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -205,6 +206,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -136,6 +136,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter
@@ -73,6 +73,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
@@ -73,6 +73,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
@@ -142,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -67,6 +67,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
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
@@ -372,6 +372,7 @@ client cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -392,7 +393,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
@@ -142,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
@@ -142,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -142,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -293,6 +293,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -313,7 +314,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -142,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter
@@ -142,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -314,6 +314,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -334,7 +335,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
@@ -293,6 +293,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -313,7 +314,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
@@ -73,6 +73,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -142,6 +142,7 @@ server cluster OnOff = 6 {
   bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
+    kOffOnly = 0x4;
   }
 
   bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     EffectIdentifierEnum effectIdentifier = 0;
-    int8u effectVariant = 1;
+    enum8 effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter
diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
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
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,7 @@ server cluster OnOff = 6 {`
`269`	`269`	`bitmap Feature : bitmap32 {`
`270`	`270`	`kLighting = 0x1;`
`271`	`271`	`kDeadFrontBehavior = 0x2;`
	`272`	`+ kOffOnly = 0x4;`
`272`	`273`	`}`
`273`	`274`
`274`	`275`	`bitmap OnOffControlBitmap : bitmap8 {`
`@@ -289,7 +290,7 @@ server cluster OnOff = 6 {`
`289`	`290`
`290`	`291`	`request struct OffWithEffectRequest {`
`291`	`292`	`EffectIdentifierEnum effectIdentifier = 0;`
`292`		`- int8u effectVariant = 1;`
	`293`	`+ enum8 effectVariant = 1;`
`293`	`294`	`}`
`294`	`295`
`295`	`296`	`request struct OnWithTimedOffRequest {`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ server cluster OnOff = 6 {`
`73`	`73`	`bitmap Feature : bitmap32 {`
`74`	`74`	`kLighting = 0x1;`
`75`	`75`	`kDeadFrontBehavior = 0x2;`
	`76`	`+ kOffOnly = 0x4;`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`bitmap OnOffControlBitmap : bitmap8 {`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ server cluster OnOff = 6 {`
`136`	`136`	`bitmap Feature : bitmap32 {`
`137`	`137`	`kLighting = 0x1;`
`138`	`138`	`kDeadFrontBehavior = 0x2;`
	`139`	`+ kOffOnly = 0x4;`
`139`	`140`	`}`
`140`	`141`
`141`	`142`	`bitmap OnOffControlBitmap : bitmap8 {`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ server cluster OnOff = 6 {`
`27`	`27`	`bitmap Feature : bitmap32 {`
`28`	`28`	`kLighting = 0x1;`
`29`	`29`	`kDeadFrontBehavior = 0x2;`
	`30`	`+ kOffOnly = 0x4;`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`bitmap OnOffControlBitmap : bitmap8 {`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ server cluster OnOff = 6 {`
`142`	`142`	`bitmap Feature : bitmap32 {`
`143`	`143`	`kLighting = 0x1;`
`144`	`144`	`kDeadFrontBehavior = 0x2;`
	`145`	`+ kOffOnly = 0x4;`
`145`	`146`	`}`
`146`	`147`
`147`	`148`	`bitmap OnOffControlBitmap : bitmap8 {`
`@@ -162,7 +163,7 @@ server cluster OnOff = 6 {`
`162`	`163`
`163`	`164`	`request struct OffWithEffectRequest {`
`164`	`165`	`EffectIdentifierEnum effectIdentifier = 0;`
`165`		`- int8u effectVariant = 1;`
	`166`	`+ enum8 effectVariant = 1;`
`166`	`167`	`}`
`167`	`168`
`168`	`169`	`request struct OnWithTimedOffRequest {`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ client cluster OnOff = 6 {`
`136`	`136`	`bitmap Feature : bitmap32 {`
`137`	`137`	`kLighting = 0x1;`
`138`	`138`	`kDeadFrontBehavior = 0x2;`
	`139`	`+ kOffOnly = 0x4;`
`139`	`140`	`}`
`140`	`141`
`141`	`142`	`bitmap OnOffControlBitmap : bitmap8 {`
`@@ -156,7 +157,7 @@ client cluster OnOff = 6 {`
`156`	`157`
`157`	`158`	`request struct OffWithEffectRequest {`
`158`	`159`	`EffectIdentifierEnum effectIdentifier = 0;`
`159`		`- int8u effectVariant = 1;`
	`160`	`+ enum8 effectVariant = 1;`
`160`	`161`	`}`
`161`	`162`
`162`	`163`	`request struct OnWithTimedOffRequest {`
`@@ -205,6 +206,7 @@ server cluster OnOff = 6 {`
`205`	`206`	`bitmap Feature : bitmap32 {`
`206`	`207`	`kLighting = 0x1;`
`207`	`208`	`kDeadFrontBehavior = 0x2;`
	`209`	`+ kOffOnly = 0x4;`
`208`	`210`	`}`
`209`	`211`
`210`	`212`	`bitmap OnOffControlBitmap : bitmap8 {`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ server cluster OnOff = 6 {`
`67`	`67`	`bitmap Feature : bitmap32 {`
`68`	`68`	`kLighting = 0x1;`
`69`	`69`	`kDeadFrontBehavior = 0x2;`
	`70`	`+ kOffOnly = 0x4;`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`bitmap OnOffControlBitmap : bitmap8 {`
Original file line number	Diff line number	Diff line change
`@@ -372,6 +372,7 @@ client cluster OnOff = 6 {`
`372`	`372`	`bitmap Feature : bitmap32 {`
`373`	`373`	`kLighting = 0x1;`
`374`	`374`	`kDeadFrontBehavior = 0x2;`
	`375`	`+ kOffOnly = 0x4;`
`375`	`376`	`}`
`376`	`377`
`377`	`378`	`bitmap OnOffControlBitmap : bitmap8 {`
`@@ -392,7 +393,7 @@ client cluster OnOff = 6 {`
`392`	`393`
`393`	`394`	`request struct OffWithEffectRequest {`
`394`	`395`	`EffectIdentifierEnum effectIdentifier = 0;`
`395`		`- int8u effectVariant = 1;`
	`396`	`+ enum8 effectVariant = 1;`
`396`	`397`	`}`
`397`	`398`
`398`	`399`	`request struct OnWithTimedOffRequest {`
Original file line number	Diff line number	Diff line change
`@@ -293,6 +293,7 @@ server cluster OnOff = 6 {`
`293`	`293`	`bitmap Feature : bitmap32 {`
`294`	`294`	`kLighting = 0x1;`
`295`	`295`	`kDeadFrontBehavior = 0x2;`
	`296`	`+ kOffOnly = 0x4;`
`296`	`297`	`}`
`297`	`298`
`298`	`299`	`bitmap OnOffControlBitmap : bitmap8 {`
`@@ -313,7 +314,7 @@ server cluster OnOff = 6 {`
`313`	`314`
`314`	`315`	`request struct OffWithEffectRequest {`
`315`	`316`	`EffectIdentifierEnum effectIdentifier = 0;`
`316`		`- int8u effectVariant = 1;`
	`317`	`+ enum8 effectVariant = 1;`
`317`	`318`	`}`
`318`	`319`
`319`	`320`	`request struct OnWithTimedOffRequest {`
Original file line number	Diff line number	Diff line change
`@@ -314,6 +314,7 @@ server cluster OnOff = 6 {`
`314`	`314`	`bitmap Feature : bitmap32 {`
`315`	`315`	`kLighting = 0x1;`
`316`	`316`	`kDeadFrontBehavior = 0x2;`
	`317`	`+ kOffOnly = 0x4;`
`317`	`318`	`}`
`318`	`319`
`319`	`320`	`bitmap OnOffControlBitmap : bitmap8 {`
`@@ -334,7 +335,7 @@ server cluster OnOff = 6 {`
`334`	`335`
`335`	`336`	`request struct OffWithEffectRequest {`
`336`	`337`	`EffectIdentifierEnum effectIdentifier = 0;`
`337`		`- int8u effectVariant = 1;`
	`338`	`+ enum8 effectVariant = 1;`
`338`	`339`	`}`
`339`	`340`
`340`	`341`	`request struct OnWithTimedOffRequest {`