Move OnOff cluster to match the spec (#29946)
* 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 <andreilitvin@google.com>
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 48fdd6a..4c39209 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
@@ -314,6 +314,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -334,7 +335,7 @@
request struct OffWithEffectRequest {
EffectIdentifierEnum effectIdentifier = 0;
- int8u effectVariant = 1;
+ enum8 effectVariant = 1;
}
request struct OnWithTimedOffRequest {
@@ -383,6 +384,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -403,7 +405,7 @@
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
index fa1c7b7..978f6e2 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
@@ -269,6 +269,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -289,7 +290,7 @@
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
index 694b7de..90a7ece 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -73,6 +73,7 @@
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
index 8dfc009..70c46ca 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -136,6 +136,7 @@
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
index a9e79fa..46324c3 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
@@ -27,6 +27,7 @@
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
index 05203e0..548750c 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -142,6 +142,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@
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
index f503073..90108ab 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -136,6 +136,7 @@
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
index 5502974..c3eed8a 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -136,6 +136,7 @@
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
index 03c9feb..a2ac95f 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -136,6 +136,7 @@
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
index fb6bcf3..9622dff 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -136,6 +136,7 @@
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
index 69ee309..d9d54c4 100644
--- a/examples/chef/devices/rootnode_onofflight_samplemei.matter
+++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter
@@ -136,6 +136,7 @@
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
index da912ef..b674cec 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -136,6 +136,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -156,7 +157,7 @@
request struct OffWithEffectRequest {
EffectIdentifierEnum effectIdentifier = 0;
- int8u effectVariant = 1;
+ enum8 effectVariant = 1;
}
request struct OnWithTimedOffRequest {
@@ -205,6 +206,7 @@
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
index 08003bc..ce12b61 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -136,6 +136,7 @@
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
index a28ab46..acef9e4 100644
--- a/examples/chef/devices/rootnode_pump_5f904818cc.matter
+++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter
@@ -73,6 +73,7 @@
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
index ed9c708..2dfeb7e 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
@@ -73,6 +73,7 @@
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
index 6a2b464..c46fb0d 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
@@ -142,6 +142,7 @@
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
index c2a6515..a38b89e 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -67,6 +67,7 @@
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
index 868aa36..94c3ed0 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
@@ -372,6 +372,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -392,7 +393,7 @@
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
index 7a3be88..0c56d1c 100644
--- 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 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@
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
index 3475808..4098984 100644
--- 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 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@
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
index c389aaf..d5da433 100644
--- 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 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@
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
index 7874b41..3efe9e7 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -293,6 +293,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -313,7 +314,7 @@
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
index 4ac1ee3..e5c0772 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.matter
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -142,6 +142,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@
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
index 61efe83..e1355ca 100644
--- a/examples/lighting-app/qpg/zap/light.matter
+++ b/examples/lighting-app/qpg/zap/light.matter
@@ -142,6 +142,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@
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
index 8c22887..2e080eb 100644
--- 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 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -334,7 +335,7 @@
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
index 144717d..db45774 100644
--- 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 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -313,7 +314,7 @@
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
index ea7d73c..351c752 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -73,6 +73,7 @@
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
index 8b95001..a753b91 100644
--- 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 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -162,7 +163,7 @@
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
index ab95412..40f0365 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -316,6 +316,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -336,7 +337,7 @@
request struct OffWithEffectRequest {
EffectIdentifierEnum effectIdentifier = 0;
- int8u effectVariant = 1;
+ enum8 effectVariant = 1;
}
request struct OnWithTimedOffRequest {
@@ -385,6 +386,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -405,7 +407,7 @@
request struct OffWithEffectRequest {
EffectIdentifierEnum effectIdentifier = 0;
- int8u effectVariant = 1;
+ enum8 effectVariant = 1;
}
request struct OnWithTimedOffRequest {
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index dc99a10..26b52ea 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -316,6 +316,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -336,7 +337,7 @@
request struct OffWithEffectRequest {
EffectIdentifierEnum effectIdentifier = 0;
- int8u effectVariant = 1;
+ enum8 effectVariant = 1;
}
request struct OnWithTimedOffRequest {
@@ -385,6 +386,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -405,7 +407,7 @@
request struct OffWithEffectRequest {
EffectIdentifierEnum effectIdentifier = 0;
- int8u effectVariant = 1;
+ enum8 effectVariant = 1;
}
request struct OnWithTimedOffRequest {
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index 6c26c5b..3f0cb19 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -67,6 +67,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter
index 25a99c2..cae13ae 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter
@@ -67,6 +67,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
index 25a99c2..cae13ae 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
@@ -67,6 +67,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
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
index 7dabd7f..40cabfb 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -67,6 +67,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -87,7 +88,7 @@
request struct OffWithEffectRequest {
EffectIdentifierEnum effectIdentifier = 0;
- int8u effectVariant = 1;
+ enum8 effectVariant = 1;
}
request struct OnWithTimedOffRequest {
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 59711df..02db5c3 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -27,6 +27,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
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
index 35363f4..6a70fe7 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -136,6 +136,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -156,7 +157,7 @@
request struct OffWithEffectRequest {
EffectIdentifierEnum effectIdentifier = 0;
- int8u effectVariant = 1;
+ enum8 effectVariant = 1;
}
request struct OnWithTimedOffRequest {
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
index 984821d..34f7a65 100644
--- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
+++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
@@ -268,6 +268,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -288,7 +289,7 @@
request struct OffWithEffectRequest {
EffectIdentifierEnum effectIdentifier = 0;
- int8u effectVariant = 1;
+ enum8 effectVariant = 1;
}
request struct OnWithTimedOffRequest {
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 20074f4..b5b5aa9 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
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
-Copyright (c) 2021 Project CHIP Authors
+Copyright (c) 2023 Project CHIP Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@
<code>0x0006</code>
<define>ON_OFF_CLUSTER</define>
<description>Attributes and commands for switching devices between 'On' and 'Off' states.</description>
- <globalAttribute side="either" code="0xFFFD" value="5"/>
+ <globalAttribute side="either" code="0xFFFD" value="6"/>
<attribute side="server" code="0x0000" define="ON_OFF" type="boolean" default="0" reportable="true" >OnOff</attribute>
<attribute side="server" code="0x4000" define="GLOBAL_SCENE_CONTROL" type="boolean" default="1" optional="true">GlobalSceneControl</attribute>
@@ -80,7 +80,7 @@
<command source="client" code="0x40" name="OffWithEffect" optional="true">
<description>The OffWithEffect command allows devices to be turned off using enhanced ways of fading.</description>
<arg name="EffectIdentifier" type="EffectIdentifierEnum"/>
- <arg name="EffectVariant" type="int8u"/>
+ <arg name="EffectVariant" type="enum8"/>
</command>
<command source="client" code="0x41" name="OnWithRecallGlobalScene" optional="true">
@@ -99,5 +99,6 @@
<cluster code="0x0006" />
<field name="Lighting" mask="0x01" />
<field name="DeadFrontBehavior" mask="0x02" />
+ <field name="OffOnly" mask="0x04" />
</bitmap>
</configurator>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index e4a5e93..b7269a4 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -332,6 +332,7 @@
bitmap Feature : bitmap32 {
kLighting = 0x1;
kDeadFrontBehavior = 0x2;
+ kOffOnly = 0x4;
}
bitmap OnOffControlBitmap : bitmap8 {
@@ -352,7 +353,7 @@
request struct OffWithEffectRequest {
EffectIdentifierEnum effectIdentifier = 0;
- int8u effectVariant = 1;
+ enum8 effectVariant = 1;
}
request struct OnWithTimedOffRequest {
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index d27abac..e17a0c0 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -1351,6 +1351,7 @@
class Feature(IntFlag):
kLighting = 0x1
kDeadFrontBehavior = 0x2
+ kOffOnly = 0x4
class OnOffControlBitmap(IntFlag):
kAcceptOnlyWhenOn = 0x1
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 4789188..6c03114 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -13500,6 +13500,7 @@
MTROnOffFeatureLighting MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
MTROnOffFeatureDeadFrontBehavior MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x2,
MTROnOffFeatureDeadFront MTR_DEPRECATED("Please use MTROnOffFeatureDeadFrontBehavior", ios(17.1, 17.2), macos(14.1, 14.2), watchos(10.1, 10.2), tvos(17.1, 17.2)) = 0x2,
+ MTROnOffFeatureOffOnly MTR_PROVISIONALLY_AVAILABLE = 0x4,
} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
typedef NS_OPTIONS(uint8_t, MTROnOffControlBitmap) {
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
index 1983d89..7a7e8ba 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
@@ -168,6 +168,7 @@
{
kLighting = 0x1,
kDeadFrontBehavior = 0x2,
+ kOffOnly = 0x4,
};
// Bitmap for OnOffControlBitmap
