Bring LevelControl cluster and its tests into conformance with the spec and the test spec (#21312)
* Bring Level Control cluster in line with the spec
* rename misspelled parameters: optionMask -> optionsMask, optionOverride->optionsOverride
* add missing parameters to the command variants `WithOnOnff`
The discrepancy with the spec stemmed from the old version of the level control being used, the version included previously appeared to track "zcl6-errata-14-0129-15" as opposed to ZCL9
Fixes #21294
Co-authored-by: Justin Wood <woody@apple.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 7ab4040..3a0bc89 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
@@ -320,44 +320,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -367,7 +378,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster BinaryInputBasic = 15 {
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 54427b7..e2ad049 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
@@ -278,44 +278,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -325,7 +336,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster Descriptor = 29 {
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index f3deedf..8cd5035 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -125,44 +125,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -172,7 +183,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster Descriptor = 29 {
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index 2c6c791..f1d12e8 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -301,44 +301,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -348,7 +359,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster Descriptor = 29 {
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index cf6eecf..70ca6ec 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -301,44 +301,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -348,7 +359,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster Descriptor = 29 {
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index 6ba4cdd..a55b3e4 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -294,44 +294,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -341,7 +352,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster Descriptor = 29 {
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index ba45392..5fdd540 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -301,44 +301,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -348,7 +359,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster Descriptor = 29 {
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index 0bd059f..131573c 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -181,44 +181,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -228,7 +239,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster Descriptor = 29 {
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 9af9d47..92f113b 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -205,44 +205,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -252,7 +263,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster Descriptor = 29 {
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index cc33249..3dd237d 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -350,44 +350,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -397,7 +408,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster Descriptor = 29 {
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index cc33249..3dd237d 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -350,44 +350,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -397,7 +408,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster Descriptor = 29 {
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index 8ebcf64..b70aea2 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -116,44 +116,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -163,7 +174,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster Descriptor = 29 {
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 3e487d3..f608722 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -86,44 +86,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -133,7 +144,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster Descriptor = 29 {
diff --git a/examples/tv-casting-app/tv-casting-common/src/LevelControl.cpp b/examples/tv-casting-app/tv-casting-common/src/LevelControl.cpp
index 63f3777..d55ae63 100644
--- a/examples/tv-casting-app/tv-casting-common/src/LevelControl.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/LevelControl.cpp
@@ -25,11 +25,11 @@
uint8_t optionOverride, std::function<void(CHIP_ERROR)> responseCallback)
{
LevelControl::Commands::Step::Type request;
- request.stepMode = stepMode;
- request.stepSize = stepSize;
- request.transitionTime = transitionTime;
- request.optionMask = optionMask;
- request.optionOverride = optionOverride;
+ request.stepMode = stepMode;
+ request.stepSize = stepSize;
+ request.transitionTime = transitionTime;
+ request.optionsMask = optionMask;
+ request.optionsOverride = optionOverride;
return MediaCommandBase::Invoke(request, responseCallback);
}
@@ -37,9 +37,9 @@
std::function<void(CHIP_ERROR)> responseCallback)
{
LevelControl::Commands::MoveToLevel::Type request;
- request.level = level;
- request.transitionTime = transitionTime;
- request.optionMask = optionMask;
- request.optionOverride = optionOverride;
+ request.level = level;
+ request.transitionTime = transitionTime;
+ request.optionsMask = optionMask;
+ request.optionsOverride = optionOverride;
return MediaCommandBase::Invoke(request, responseCallback);
}
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 7a1cdc6..ee30eb7 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
@@ -340,44 +340,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -387,7 +398,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster LevelControl = 8 {
@@ -427,44 +438,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -474,7 +496,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
server cluster BinaryInputBasic = 15 {
diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
index 0596cbb..2035997 100644
--- a/src/app/clusters/level-control/level-control.cpp
+++ b/src/app/clusters/level-control/level-control.cpp
@@ -113,16 +113,16 @@
static EmberAfLevelControlState * getState(EndpointId endpoint);
static EmberAfStatus moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8_t level, uint16_t transitionTimeDs,
- uint8_t optionMask, uint8_t optionOverride, uint16_t storedLevel);
-static void moveHandler(EndpointId endpoint, CommandId commandId, uint8_t moveMode, uint8_t rate, uint8_t optionMask,
- uint8_t optionOverride);
+ uint8_t optionsMask, uint8_t optionsOverride, uint16_t storedLevel);
+static void moveHandler(EndpointId endpoint, CommandId commandId, uint8_t moveMode, uint8_t rate, uint8_t optionsMask,
+ uint8_t optionsOverride);
static void stepHandler(EndpointId endpoint, CommandId commandId, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTimeDs,
- uint8_t optionMask, uint8_t optionOverride);
-static void stopHandler(EndpointId endpoint, CommandId commandId, uint8_t optionMask, uint8_t optionOverride);
+ uint8_t optionsMask, uint8_t optionsOverride);
+static void stopHandler(EndpointId endpoint, CommandId commandId, uint8_t optionsMask, uint8_t optionsOverride);
static void setOnOffValue(EndpointId endpoint, bool onOff);
static void writeRemainingTime(EndpointId endpoint, uint16_t remainingTimeMs);
-static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, uint8_t optionMask, uint8_t optionOverride);
+static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, uint8_t optionsMask, uint8_t optionsOverride);
#if !defined(IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS) && defined(EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP)
static void reallyUpdateCoupledColorTemp(EndpointId endpoint);
@@ -314,7 +314,7 @@
#endif // EMBER_AF_PLUGIN_ON_OFF
}
-static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, uint8_t optionMask, uint8_t optionOverride)
+static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, uint8_t optionsMask, uint8_t optionsOverride)
{
#ifndef IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS
if (emberAfContainsAttribute(endpoint, LevelControl::Id, Attributes::Options::Id))
@@ -376,7 +376,7 @@
// ---------- The following order is important in decision making -------
// -----------more readable ----------
//
- if (optionMask == 0xFF && optionOverride == 0xFF)
+ if (optionsMask == 0xFF && optionsOverride == 0xFF)
{
// 0xFF are the default values passed to the command handler when
// the payload is not present - in that case there is use of option
@@ -385,11 +385,11 @@
}
// ---------- The above is to distinguish if the payload is present or not
- if (READBITS(optionMask, EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF))
+ if (READBITS(optionsMask, EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF))
{
// Mask is present and set in the command payload, this indicates
// use the over ride as temporary option
- return READBITS(optionOverride, EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF);
+ return READBITS(optionsOverride, EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF);
}
// if we are here - use the option bits
return (READBITS(options, EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF));
@@ -403,15 +403,15 @@
bool emberAfLevelControlClusterMoveToLevelCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
const Commands::MoveToLevel::DecodableType & commandData)
{
- auto & level = commandData.level;
- auto & transitionTime = commandData.transitionTime;
- auto & optionMask = commandData.optionMask;
- auto & optionOverride = commandData.optionOverride;
+ auto & level = commandData.level;
+ auto & transitionTime = commandData.transitionTime;
+ auto & optionsMask = commandData.optionsMask;
+ auto & optionsOverride = commandData.optionsOverride;
- emberAfLevelControlClusterPrintln("%pMOVE_TO_LEVEL %x %2x %x %x", "RX level-control:", level, transitionTime, optionMask,
- optionOverride);
+ emberAfLevelControlClusterPrintln("%pMOVE_TO_LEVEL %x %2x %x %x", "RX level-control:", level, transitionTime, optionsMask,
+ optionsOverride);
EmberAfStatus status =
- moveToLevelHandler(commandPath.mEndpointId, Commands::MoveToLevel::Id, level, transitionTime, optionMask, optionOverride,
+ moveToLevelHandler(commandPath.mEndpointId, Commands::MoveToLevel::Id, level, transitionTime, optionsMask, optionsOverride,
INVALID_STORED_LEVEL); // Don't revert to the stored level
emberAfSendImmediateDefaultResponse(status);
@@ -423,13 +423,15 @@
const app::ConcreteCommandPath & commandPath,
const Commands::MoveToLevelWithOnOff::DecodableType & commandData)
{
- auto & level = commandData.level;
- auto & transitionTime = commandData.transitionTime;
+ auto & level = commandData.level;
+ auto & transitionTime = commandData.transitionTime;
+ auto & optionsMask = commandData.optionsMask;
+ auto & optionsOverride = commandData.optionsOverride;
emberAfLevelControlClusterPrintln("%pMOVE_TO_LEVEL_WITH_ON_OFF %x %2x", "RX level-control:", level, transitionTime);
- EmberAfStatus status =
- moveToLevelHandler(commandPath.mEndpointId, Commands::MoveToLevelWithOnOff::Id, level, transitionTime, 0xFF, 0xFF,
- INVALID_STORED_LEVEL); // Don't revert to the stored level
+ EmberAfStatus status = moveToLevelHandler(commandPath.mEndpointId, Commands::MoveToLevelWithOnOff::Id, level, transitionTime,
+ optionsMask, optionsOverride,
+ INVALID_STORED_LEVEL); // Don't revert to the stored level
emberAfSendImmediateDefaultResponse(status);
@@ -439,74 +441,81 @@
bool emberAfLevelControlClusterMoveCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
const Commands::Move::DecodableType & commandData)
{
- auto & moveMode = commandData.moveMode;
- auto & rate = commandData.rate;
- auto & optionMask = commandData.optionMask;
- auto & optionOverride = commandData.optionOverride;
+ auto & moveMode = commandData.moveMode;
+ auto & rate = commandData.rate;
+ auto & optionsMask = commandData.optionsMask;
+ auto & optionsOverride = commandData.optionsOverride;
emberAfLevelControlClusterPrintln("%pMOVE %x %x", "RX level-control:", moveMode, rate);
- moveHandler(commandPath.mEndpointId, Commands::Move::Id, moveMode, rate, optionMask, optionOverride);
+ moveHandler(commandPath.mEndpointId, Commands::Move::Id, moveMode, rate, optionsMask, optionsOverride);
return true;
}
bool emberAfLevelControlClusterMoveWithOnOffCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
const Commands::MoveWithOnOff::DecodableType & commandData)
{
- auto & moveMode = commandData.moveMode;
- auto & rate = commandData.rate;
+ auto & moveMode = commandData.moveMode;
+ auto & rate = commandData.rate;
+ auto & optionsMask = commandData.optionsMask;
+ auto & optionsOverride = commandData.optionsOverride;
emberAfLevelControlClusterPrintln("%pMOVE_WITH_ON_OFF %x %x", "RX level-control:", moveMode, rate);
- moveHandler(commandPath.mEndpointId, Commands::MoveWithOnOff::Id, moveMode, rate, 0xFF, 0xFF);
+ moveHandler(commandPath.mEndpointId, Commands::MoveWithOnOff::Id, moveMode, rate, optionsMask, optionsOverride);
return true;
}
bool emberAfLevelControlClusterStepCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
const Commands::Step::DecodableType & commandData)
{
- auto & stepMode = commandData.stepMode;
- auto & stepSize = commandData.stepSize;
- auto & transitionTime = commandData.transitionTime;
- auto & optionMask = commandData.optionMask;
- auto & optionOverride = commandData.optionOverride;
+ auto & stepMode = commandData.stepMode;
+ auto & stepSize = commandData.stepSize;
+ auto & transitionTime = commandData.transitionTime;
+ auto & optionsMask = commandData.optionsMask;
+ auto & optionsOverride = commandData.optionsOverride;
emberAfLevelControlClusterPrintln("%pSTEP %x %x %2x", "RX level-control:", stepMode, stepSize, transitionTime);
- stepHandler(commandPath.mEndpointId, Commands::Step::Id, stepMode, stepSize, transitionTime, optionMask, optionOverride);
+ stepHandler(commandPath.mEndpointId, Commands::Step::Id, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
return true;
}
bool emberAfLevelControlClusterStepWithOnOffCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
const Commands::StepWithOnOff::DecodableType & commandData)
{
- auto & stepMode = commandData.stepMode;
- auto & stepSize = commandData.stepSize;
- auto & transitionTime = commandData.transitionTime;
+ auto & stepMode = commandData.stepMode;
+ auto & stepSize = commandData.stepSize;
+ auto & transitionTime = commandData.transitionTime;
+ auto & optionsMask = commandData.optionsMask;
+ auto & optionsOverride = commandData.optionsOverride;
emberAfLevelControlClusterPrintln("%pSTEP_WITH_ON_OFF %x %x %2x", "RX level-control:", stepMode, stepSize, transitionTime);
- stepHandler(commandPath.mEndpointId, Commands::StepWithOnOff::Id, stepMode, stepSize, transitionTime, 0xFF, 0xFF);
+ stepHandler(commandPath.mEndpointId, Commands::StepWithOnOff::Id, stepMode, stepSize, transitionTime, optionsMask,
+ optionsOverride);
return true;
}
bool emberAfLevelControlClusterStopCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
const Commands::Stop::DecodableType & commandData)
{
- auto & optionMask = commandData.optionMask;
- auto & optionOverride = commandData.optionOverride;
+ auto & optionsMask = commandData.optionsMask;
+ auto & optionsOverride = commandData.optionsOverride;
emberAfLevelControlClusterPrintln("%pSTOP", "RX level-control:");
- stopHandler(commandPath.mEndpointId, Commands::Stop::Id, optionMask, optionOverride);
+ stopHandler(commandPath.mEndpointId, Commands::Stop::Id, optionsMask, optionsOverride);
return true;
}
bool emberAfLevelControlClusterStopWithOnOffCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
const Commands::StopWithOnOff::DecodableType & commandData)
{
+ auto & optionsMask = commandData.optionsMask;
+ auto & optionsOverride = commandData.optionsOverride;
emberAfLevelControlClusterPrintln("%pSTOP_WITH_ON_OFF", "RX level-control:");
- stopHandler(commandPath.mEndpointId, Commands::StopWithOnOff::Id, 0xFF, 0xFF);
+ stopHandler(commandPath.mEndpointId, Commands::StopWithOnOff::Id, optionsMask, optionsOverride);
return true;
}
static EmberAfStatus moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8_t level, uint16_t transitionTimeDs,
- uint8_t optionMask, uint8_t optionOverride, uint16_t storedLevel)
+ uint8_t optionsMask, uint8_t optionsOverride, uint16_t storedLevel)
{
EmberAfLevelControlState * state = getState(endpoint);
EmberAfStatus status;
@@ -523,7 +532,7 @@
return EMBER_ZCL_STATUS_INVALID_COMMAND;
}
- if (!shouldExecuteIfOff(endpoint, commandId, optionMask, optionOverride))
+ if (!shouldExecuteIfOff(endpoint, commandId, optionsMask, optionsOverride))
{
return EMBER_ZCL_STATUS_SUCCESS;
}
@@ -641,8 +650,8 @@
return status;
}
-static void moveHandler(EndpointId endpoint, CommandId commandId, uint8_t moveMode, uint8_t rate, uint8_t optionMask,
- uint8_t optionOverride)
+static void moveHandler(EndpointId endpoint, CommandId commandId, uint8_t moveMode, uint8_t rate, uint8_t optionsMask,
+ uint8_t optionsOverride)
{
EmberAfLevelControlState * state = getState(endpoint);
EmberAfStatus status;
@@ -655,7 +664,7 @@
goto send_default_response;
}
- if (rate == 0 || !shouldExecuteIfOff(endpoint, commandId, optionMask, optionOverride))
+ if (rate == 0 || !shouldExecuteIfOff(endpoint, commandId, optionsMask, optionsOverride))
{
status = EMBER_ZCL_STATUS_SUCCESS;
goto send_default_response;
@@ -751,7 +760,7 @@
}
static void stepHandler(EndpointId endpoint, CommandId commandId, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTimeDs,
- uint8_t optionMask, uint8_t optionOverride)
+ uint8_t optionsMask, uint8_t optionsOverride)
{
EmberAfLevelControlState * state = getState(endpoint);
EmberAfStatus status;
@@ -764,7 +773,7 @@
goto send_default_response;
}
- if (!shouldExecuteIfOff(endpoint, commandId, optionMask, optionOverride))
+ if (!shouldExecuteIfOff(endpoint, commandId, optionsMask, optionsOverride))
{
status = EMBER_ZCL_STATUS_SUCCESS;
goto send_default_response;
@@ -868,7 +877,7 @@
emberAfSendImmediateDefaultResponse(status);
}
-static void stopHandler(EndpointId endpoint, CommandId commandId, uint8_t optionMask, uint8_t optionOverride)
+static void stopHandler(EndpointId endpoint, CommandId commandId, uint8_t optionsMask, uint8_t optionsOverride)
{
EmberAfLevelControlState * state = getState(endpoint);
EmberAfStatus status;
@@ -879,7 +888,7 @@
goto send_default_response;
}
- if (!shouldExecuteIfOff(endpoint, commandId, optionMask, optionOverride))
+ if (!shouldExecuteIfOff(endpoint, commandId, optionsMask, optionsOverride))
{
status = EMBER_ZCL_STATUS_SUCCESS;
goto send_default_response;
diff --git a/src/app/tests/suites/TestLevelControlWithOnOffDependency.yaml b/src/app/tests/suites/TestLevelControlWithOnOffDependency.yaml
index 4f05a9f..6a3f63b 100644
--- a/src/app/tests/suites/TestLevelControlWithOnOffDependency.yaml
+++ b/src/app/tests/suites/TestLevelControlWithOnOffDependency.yaml
@@ -36,9 +36,9 @@
value: 1
- name: "transitionTime"
value: 0
- - name: "optionMask"
+ - name: "optionsMask"
value: 1
- - name: "optionOverride"
+ - name: "optionsOverride"
value: 1
- label: "Wait 100 ms"
@@ -159,9 +159,9 @@
value: 127
- name: "transitionTime"
value: 0
- - name: "optionMask"
+ - name: "optionsMask"
value: 1
- - name: "optionOverride"
+ - name: "optionsOverride"
value: 1
- label: "Wait 100 ms"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml
index 1aa89b6..c71f745 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml
@@ -77,9 +77,9 @@
value: 64
- name: "transitionTime"
value: 0
- - name: "optionMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 100ms"
@@ -106,9 +106,9 @@
value: 100
- name: "transitionTime"
value: 0
- - name: "optionMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 100 ms"
@@ -135,9 +135,9 @@
value: 128
- name: "transitionTime"
value: 100
- - name: "optionMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 11000ms"
@@ -175,9 +175,9 @@
value: 64
- name: "transitionTime"
value: 0xFFFF
- - name: "optionMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 1000ms"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml
index 6b75b0c..dfc9ae5 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml
@@ -68,9 +68,9 @@
value: 1
- name: "transitionTime"
value: 0
- - name: "optionMask"
+ - name: "OptionsMask"
value: 1
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 1
- label: "reads max level attribute from DUT"
@@ -93,9 +93,9 @@
value: 0
- name: "rate"
value: 32
- - name: "optionMask"
+ - name: "OptionsMask"
value: 1
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 1
- label:
@@ -136,9 +136,9 @@
value: 1
- name: "rate"
value: 64
- - name: "optionMask"
+ - name: "OptionsMask"
value: 1
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 1
- label:
@@ -193,9 +193,9 @@
value: 0
- name: "rate"
value: 255
- - name: "optionMask"
+ - name: "OptionsMask"
value: 1
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 1
- label: "Wait 500ms"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml
index c26c395..e5690f1 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml
@@ -68,9 +68,9 @@
value: MinlevelValue + 1
- name: "transitionTime"
value: 0
- - name: "optionMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Sends MoveToLevelWithOnOff command to DUT"
@@ -82,9 +82,9 @@
value: 2
- name: "transitionTime"
value: 0
- - name: "optionMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Reads current level attribute from DUT"
@@ -121,9 +121,9 @@
value: 64
- name: "transitionTime"
value: 20
- - name: "optionMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Sends step up command to DUT"
@@ -137,9 +137,9 @@
value: 64
- name: "transitionTime"
value: 20
- - name: "optionMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 2500ms"
@@ -179,9 +179,9 @@
value: 64
- name: "transitionTime"
value: 20
- - name: "optionMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Sends a StepWithOnOff command"
@@ -195,9 +195,9 @@
value: 64
- name: "transitionTime"
value: 20
- - name: "optionMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 2500ms"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml
index b6727af..98748b2 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml
@@ -68,9 +68,9 @@
value: 1
- name: "transitionTime"
value: 0
- - name: "optionMask"
+ - name: "optionsMask"
value: 1
- - name: "optionOverride"
+ - name: "optionsOverride"
value: 1
- label: "Reads CurrentLevel attribute from DUT"
@@ -92,9 +92,9 @@
value: 0
- name: "rate"
value: 5
- - name: "optionMask"
+ - name: "optionsMask"
value: 1
- - name: "optionOverride"
+ - name: "optionsOverride"
value: 1
- label: "Wait 5000ms"
@@ -110,9 +110,9 @@
command: "Stop"
arguments:
values:
- - name: "optionMask"
+ - name: "optionsMask"
value: 1
- - name: "optionOverride"
+ - name: "optionsOverride"
value: 1
- label: "Physically verify that the device has stopped transitioning"
@@ -145,9 +145,9 @@
value: 0
- name: "rate"
value: 5
- - name: "optionMask"
+ - name: "optionsMask"
value: 1
- - name: "optionOverride"
+ - name: "optionsOverride"
value: 1
- label: "Wait 5000ms"
@@ -163,9 +163,9 @@
command: "StopWithOnOff"
arguments:
values:
- - name: "optionMask"
+ - name: "optionsMask"
value: 1
- - name: "optionOverride"
+ - name: "optionsOverride"
value: 1
- label: "Physically verify that the device has stopped transitioning"
diff --git a/src/app/zap-templates/zcl/data-model/silabs/general.xml b/src/app/zap-templates/zcl/data-model/silabs/general.xml
index ea60694..aa19355 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/general.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/general.xml
@@ -216,8 +216,8 @@
</description>
<arg name="level" type="INT8U"/>
<arg name="transitionTime" type="INT16U"/>
- <arg name="optionMask" type="BITMAP8" introducedIn="zcl6-errata-14-0129-15" optional="1"/>
- <arg name="optionOverride" type="BITMAP8" introducedIn="zcl6-errata-14-0129-15" optional="1"/>
+ <arg name="OptionsMask" type="BITMAP8"/>
+ <arg name="OptionsOverride" type="BITMAP8"/>
</command>
<command source="client" code="0x01" name="Move" optional="false" cli="zcl level-control move">
<description>
@@ -225,8 +225,8 @@
</description>
<arg name="moveMode" type="MoveMode"/>
<arg name="rate" type="INT8U"/>
- <arg name="optionMask" type="BITMAP8" introducedIn="zcl6-errata-14-0129-15" optional="1"/>
- <arg name="optionOverride" type="BITMAP8" introducedIn="zcl6-errata-14-0129-15" optional="1"/>
+ <arg name="OptionsMask" type="BITMAP8"/>
+ <arg name="OptionsOverride" type="BITMAP8"/>
</command>
<command source="client" code="0x02" name="Step" optional="false" cli="zcl level-control step">
<description>
@@ -235,15 +235,15 @@
<arg name="stepMode" type="StepMode"/>
<arg name="stepSize" type="INT8U"/>
<arg name="transitionTime" type="INT16U"/>
- <arg name="optionMask" type="BITMAP8" introducedIn="zcl6-errata-14-0129-15" optional="1"/>
- <arg name="optionOverride" type="BITMAP8" introducedIn="zcl6-errata-14-0129-15" optional="1"/>
+ <arg name="OptionsMask" type="BITMAP8"/>
+ <arg name="OptionsOverride" type="BITMAP8"/>
</command>
<command source="client" code="0x03" name="Stop" optional="false" cli="zcl level-control stop">
<description>
Command description for Stop
</description>
- <arg name="optionMask" type="BITMAP8" introducedIn="zcl6-errata-14-0129-15" optional="1"/>
- <arg name="optionOverride" type="BITMAP8" introducedIn="zcl6-errata-14-0129-15" optional="1"/>
+ <arg name="OptionsMask" type="BITMAP8"/>
+ <arg name="OptionsOverride" type="BITMAP8"/>
</command>
<command source="client" code="0x04" name="MoveToLevelWithOnOff" optional="false" cli="zcl level-control o-mv-to-level">
<description>
@@ -251,6 +251,8 @@
</description>
<arg name="level" type="INT8U"/>
<arg name="transitionTime" type="INT16U"/>
+ <arg name="OptionsMask" type="BITMAP8"/>
+ <arg name="OptionsOverride" type="BITMAP8"/>
</command>
<command source="client" code="0x05" name="MoveWithOnOff" optional="false" cli="zcl level-control o-move">
<description>
@@ -258,6 +260,8 @@
</description>
<arg name="moveMode" type="MoveMode"/>
<arg name="rate" type="INT8U"/>
+ <arg name="OptionsMask" type="BITMAP8"/>
+ <arg name="OptionsOverride" type="BITMAP8"/>
</command>
<command source="client" code="0x06" name="StepWithOnOff" optional="false" cli="zcl level-control o-step">
<description>
@@ -266,11 +270,15 @@
<arg name="stepMode" type="StepMode"/>
<arg name="stepSize" type="INT8U"/>
<arg name="transitionTime" type="INT16U"/>
+ <arg name="OptionsMask" type="BITMAP8"/>
+ <arg name="OptionsOverride" type="BITMAP8"/>
</command>
<command source="client" code="0x07" name="StopWithOnOff" optional="false" cli="zcl level-control o-stop">
<description>
Command description for StopWithOnOff
</description>
+ <arg name="OptionsMask" type="BITMAP8"/>
+ <arg name="OptionsOverride" type="BITMAP8"/>
</command>
<command source="client" code="0x08" name="MoveToClosestFrequency" optional="true">
<description>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index e868756..f72c864 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -338,44 +338,55 @@
request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
- BITMAP8 optionMask = 2;
- BITMAP8 optionOverride = 3;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
- BITMAP8 optionMask = 3;
- BITMAP8 optionOverride = 4;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
}
request struct StopRequest {
- BITMAP8 optionMask = 0;
- BITMAP8 optionOverride = 1;
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
+ BITMAP8 optionsMask = 2;
+ BITMAP8 optionsOverride = 3;
}
request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
+ BITMAP8 optionsMask = 3;
+ BITMAP8 optionsOverride = 4;
+ }
+
+ request struct StopWithOnOffRequest {
+ BITMAP8 optionsMask = 0;
+ BITMAP8 optionsOverride = 1;
}
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
@@ -385,7 +396,7 @@
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
- command StopWithOnOff(): DefaultSuccess = 7;
+ command StopWithOnOff(StopWithOnOffRequest): DefaultSuccess = 7;
}
client cluster BinaryInputBasic = 15 {
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index fd4f704..6ca633c 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -1510,26 +1510,26 @@
DefaultClusterCallback callback,
Integer level,
Integer transitionTime,
- Integer optionMask,
- Integer optionOverride) {
+ Integer optionsMask,
+ Integer optionsOverride) {
moveToLevel(
- chipClusterPtr, callback, level, transitionTime, optionMask, optionOverride, null);
+ chipClusterPtr, callback, level, transitionTime, optionsMask, optionsOverride, null);
}
public void moveToLevel(
DefaultClusterCallback callback,
Integer level,
Integer transitionTime,
- Integer optionMask,
- Integer optionOverride,
+ Integer optionsMask,
+ Integer optionsOverride,
int timedInvokeTimeoutMs) {
moveToLevel(
chipClusterPtr,
callback,
level,
transitionTime,
- optionMask,
- optionOverride,
+ optionsMask,
+ optionsOverride,
timedInvokeTimeoutMs);
}
@@ -1537,25 +1537,25 @@
DefaultClusterCallback callback,
Integer moveMode,
Integer rate,
- Integer optionMask,
- Integer optionOverride) {
- move(chipClusterPtr, callback, moveMode, rate, optionMask, optionOverride, null);
+ Integer optionsMask,
+ Integer optionsOverride) {
+ move(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
}
public void move(
DefaultClusterCallback callback,
Integer moveMode,
Integer rate,
- Integer optionMask,
- Integer optionOverride,
+ Integer optionsMask,
+ Integer optionsOverride,
int timedInvokeTimeoutMs) {
move(
chipClusterPtr,
callback,
moveMode,
rate,
- optionMask,
- optionOverride,
+ optionsMask,
+ optionsOverride,
timedInvokeTimeoutMs);
}
@@ -1564,16 +1564,16 @@
Integer stepMode,
Integer stepSize,
Integer transitionTime,
- Integer optionMask,
- Integer optionOverride) {
+ Integer optionsMask,
+ Integer optionsOverride) {
step(
chipClusterPtr,
callback,
stepMode,
stepSize,
transitionTime,
- optionMask,
- optionOverride,
+ optionsMask,
+ optionsOverride,
null);
}
@@ -1582,8 +1582,8 @@
Integer stepMode,
Integer stepSize,
Integer transitionTime,
- Integer optionMask,
- Integer optionOverride,
+ Integer optionsMask,
+ Integer optionsOverride,
int timedInvokeTimeoutMs) {
step(
chipClusterPtr,
@@ -1591,51 +1591,75 @@
stepMode,
stepSize,
transitionTime,
- optionMask,
- optionOverride,
+ optionsMask,
+ optionsOverride,
timedInvokeTimeoutMs);
}
- public void stop(DefaultClusterCallback callback, Integer optionMask, Integer optionOverride) {
- stop(chipClusterPtr, callback, optionMask, optionOverride, null);
+ public void stop(
+ DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride) {
+ stop(chipClusterPtr, callback, optionsMask, optionsOverride, null);
}
public void stop(
DefaultClusterCallback callback,
- Integer optionMask,
- Integer optionOverride,
+ Integer optionsMask,
+ Integer optionsOverride,
int timedInvokeTimeoutMs) {
- stop(chipClusterPtr, callback, optionMask, optionOverride, timedInvokeTimeoutMs);
- }
-
- public void moveToLevelWithOnOff(
- DefaultClusterCallback callback, Integer level, Integer transitionTime) {
- moveToLevelWithOnOff(chipClusterPtr, callback, level, transitionTime, null);
+ stop(chipClusterPtr, callback, optionsMask, optionsOverride, timedInvokeTimeoutMs);
}
public void moveToLevelWithOnOff(
DefaultClusterCallback callback,
Integer level,
Integer transitionTime,
- int timedInvokeTimeoutMs) {
- moveToLevelWithOnOff(chipClusterPtr, callback, level, transitionTime, timedInvokeTimeoutMs);
+ Integer optionsMask,
+ Integer optionsOverride) {
+ moveToLevelWithOnOff(
+ chipClusterPtr, callback, level, transitionTime, optionsMask, optionsOverride, null);
}
- public void moveWithOnOff(DefaultClusterCallback callback, Integer moveMode, Integer rate) {
- moveWithOnOff(chipClusterPtr, callback, moveMode, rate, null);
+ public void moveToLevelWithOnOff(
+ DefaultClusterCallback callback,
+ Integer level,
+ Integer transitionTime,
+ Integer optionsMask,
+ Integer optionsOverride,
+ int timedInvokeTimeoutMs) {
+ moveToLevelWithOnOff(
+ chipClusterPtr,
+ callback,
+ level,
+ transitionTime,
+ optionsMask,
+ optionsOverride,
+ timedInvokeTimeoutMs);
}
public void moveWithOnOff(
- DefaultClusterCallback callback, Integer moveMode, Integer rate, int timedInvokeTimeoutMs) {
- moveWithOnOff(chipClusterPtr, callback, moveMode, rate, timedInvokeTimeoutMs);
+ DefaultClusterCallback callback,
+ Integer moveMode,
+ Integer rate,
+ Integer optionsMask,
+ Integer optionsOverride) {
+ moveWithOnOff(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
}
- public void stepWithOnOff(
+ public void moveWithOnOff(
DefaultClusterCallback callback,
- Integer stepMode,
- Integer stepSize,
- Integer transitionTime) {
- stepWithOnOff(chipClusterPtr, callback, stepMode, stepSize, transitionTime, null);
+ Integer moveMode,
+ Integer rate,
+ Integer optionsMask,
+ Integer optionsOverride,
+ int timedInvokeTimeoutMs) {
+ moveWithOnOff(
+ chipClusterPtr,
+ callback,
+ moveMode,
+ rate,
+ optionsMask,
+ optionsOverride,
+ timedInvokeTimeoutMs);
}
public void stepWithOnOff(
@@ -1643,18 +1667,49 @@
Integer stepMode,
Integer stepSize,
Integer transitionTime,
+ Integer optionsMask,
+ Integer optionsOverride) {
+ stepWithOnOff(
+ chipClusterPtr,
+ callback,
+ stepMode,
+ stepSize,
+ transitionTime,
+ optionsMask,
+ optionsOverride,
+ null);
+ }
+
+ public void stepWithOnOff(
+ DefaultClusterCallback callback,
+ Integer stepMode,
+ Integer stepSize,
+ Integer transitionTime,
+ Integer optionsMask,
+ Integer optionsOverride,
int timedInvokeTimeoutMs) {
stepWithOnOff(
- chipClusterPtr, callback, stepMode, stepSize, transitionTime, timedInvokeTimeoutMs);
+ chipClusterPtr,
+ callback,
+ stepMode,
+ stepSize,
+ transitionTime,
+ optionsMask,
+ optionsOverride,
+ timedInvokeTimeoutMs);
}
- public void stopWithOnOff(DefaultClusterCallback callback) {
- stopWithOnOff(chipClusterPtr, callback, null);
+ public void stopWithOnOff(
+ DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride) {
+ stopWithOnOff(chipClusterPtr, callback, optionsMask, optionsOverride, null);
}
- public void stopWithOnOff(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-
- stopWithOnOff(chipClusterPtr, callback, timedInvokeTimeoutMs);
+ public void stopWithOnOff(
+ DefaultClusterCallback callback,
+ Integer optionsMask,
+ Integer optionsOverride,
+ int timedInvokeTimeoutMs) {
+ stopWithOnOff(chipClusterPtr, callback, optionsMask, optionsOverride, timedInvokeTimeoutMs);
}
private native void moveToLevel(
@@ -1662,8 +1717,8 @@
DefaultClusterCallback Callback,
Integer level,
Integer transitionTime,
- Integer optionMask,
- Integer optionOverride,
+ Integer optionsMask,
+ Integer optionsOverride,
@Nullable Integer timedInvokeTimeoutMs);
private native void move(
@@ -1671,8 +1726,8 @@
DefaultClusterCallback Callback,
Integer moveMode,
Integer rate,
- Integer optionMask,
- Integer optionOverride,
+ Integer optionsMask,
+ Integer optionsOverride,
@Nullable Integer timedInvokeTimeoutMs);
private native void step(
@@ -1681,15 +1736,15 @@
Integer stepMode,
Integer stepSize,
Integer transitionTime,
- Integer optionMask,
- Integer optionOverride,
+ Integer optionsMask,
+ Integer optionsOverride,
@Nullable Integer timedInvokeTimeoutMs);
private native void stop(
long chipClusterPtr,
DefaultClusterCallback Callback,
- Integer optionMask,
- Integer optionOverride,
+ Integer optionsMask,
+ Integer optionsOverride,
@Nullable Integer timedInvokeTimeoutMs);
private native void moveToLevelWithOnOff(
@@ -1697,6 +1752,8 @@
DefaultClusterCallback Callback,
Integer level,
Integer transitionTime,
+ Integer optionsMask,
+ Integer optionsOverride,
@Nullable Integer timedInvokeTimeoutMs);
private native void moveWithOnOff(
@@ -1704,6 +1761,8 @@
DefaultClusterCallback Callback,
Integer moveMode,
Integer rate,
+ Integer optionsMask,
+ Integer optionsOverride,
@Nullable Integer timedInvokeTimeoutMs);
private native void stepWithOnOff(
@@ -1712,11 +1771,15 @@
Integer stepMode,
Integer stepSize,
Integer transitionTime,
+ Integer optionsMask,
+ Integer optionsOverride,
@Nullable Integer timedInvokeTimeoutMs);
private native void stopWithOnOff(
long chipClusterPtr,
DefaultClusterCallback Callback,
+ Integer optionsMask,
+ Integer optionsOverride,
@Nullable Integer timedInvokeTimeoutMs);
public interface OnLevelAttributeCallback {
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 7c58785..a7431df 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -8007,15 +8007,15 @@
levelControlmoveToLevelCommandParams.put(
"transitionTime", levelControlmoveToLeveltransitionTimeCommandParameterInfo);
- CommandParameterInfo levelControlmoveToLeveloptionMaskCommandParameterInfo =
- new CommandParameterInfo("optionMask", Integer.class, Integer.class);
+ CommandParameterInfo levelControlmoveToLeveloptionsMaskCommandParameterInfo =
+ new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
levelControlmoveToLevelCommandParams.put(
- "optionMask", levelControlmoveToLeveloptionMaskCommandParameterInfo);
+ "optionsMask", levelControlmoveToLeveloptionsMaskCommandParameterInfo);
- CommandParameterInfo levelControlmoveToLeveloptionOverrideCommandParameterInfo =
- new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
+ CommandParameterInfo levelControlmoveToLeveloptionsOverrideCommandParameterInfo =
+ new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
levelControlmoveToLevelCommandParams.put(
- "optionOverride", levelControlmoveToLeveloptionOverrideCommandParameterInfo);
+ "optionsOverride", levelControlmoveToLeveloptionsOverrideCommandParameterInfo);
InteractionInfo levelControlmoveToLevelInteractionInfo =
new InteractionInfo(
@@ -8025,8 +8025,8 @@
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("level"),
(Integer) commandArguments.get("transitionTime"),
- (Integer) commandArguments.get("optionMask"),
- (Integer) commandArguments.get("optionOverride"));
+ (Integer) commandArguments.get("optionsMask"),
+ (Integer) commandArguments.get("optionsOverride"));
},
() -> new DelegatedDefaultClusterCallback(),
levelControlmoveToLevelCommandParams);
@@ -8042,14 +8042,15 @@
new CommandParameterInfo("rate", Integer.class, Integer.class);
levelControlmoveCommandParams.put("rate", levelControlmoverateCommandParameterInfo);
- CommandParameterInfo levelControlmoveoptionMaskCommandParameterInfo =
- new CommandParameterInfo("optionMask", Integer.class, Integer.class);
- levelControlmoveCommandParams.put("optionMask", levelControlmoveoptionMaskCommandParameterInfo);
-
- CommandParameterInfo levelControlmoveoptionOverrideCommandParameterInfo =
- new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
+ CommandParameterInfo levelControlmoveoptionsMaskCommandParameterInfo =
+ new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
levelControlmoveCommandParams.put(
- "optionOverride", levelControlmoveoptionOverrideCommandParameterInfo);
+ "optionsMask", levelControlmoveoptionsMaskCommandParameterInfo);
+
+ CommandParameterInfo levelControlmoveoptionsOverrideCommandParameterInfo =
+ new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+ levelControlmoveCommandParams.put(
+ "optionsOverride", levelControlmoveoptionsOverrideCommandParameterInfo);
InteractionInfo levelControlmoveInteractionInfo =
new InteractionInfo(
@@ -8059,8 +8060,8 @@
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("moveMode"),
(Integer) commandArguments.get("rate"),
- (Integer) commandArguments.get("optionMask"),
- (Integer) commandArguments.get("optionOverride"));
+ (Integer) commandArguments.get("optionsMask"),
+ (Integer) commandArguments.get("optionsOverride"));
},
() -> new DelegatedDefaultClusterCallback(),
levelControlmoveCommandParams);
@@ -8080,14 +8081,15 @@
levelControlstepCommandParams.put(
"transitionTime", levelControlsteptransitionTimeCommandParameterInfo);
- CommandParameterInfo levelControlstepoptionMaskCommandParameterInfo =
- new CommandParameterInfo("optionMask", Integer.class, Integer.class);
- levelControlstepCommandParams.put("optionMask", levelControlstepoptionMaskCommandParameterInfo);
-
- CommandParameterInfo levelControlstepoptionOverrideCommandParameterInfo =
- new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
+ CommandParameterInfo levelControlstepoptionsMaskCommandParameterInfo =
+ new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
levelControlstepCommandParams.put(
- "optionOverride", levelControlstepoptionOverrideCommandParameterInfo);
+ "optionsMask", levelControlstepoptionsMaskCommandParameterInfo);
+
+ CommandParameterInfo levelControlstepoptionsOverrideCommandParameterInfo =
+ new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+ levelControlstepCommandParams.put(
+ "optionsOverride", levelControlstepoptionsOverrideCommandParameterInfo);
InteractionInfo levelControlstepInteractionInfo =
new InteractionInfo(
@@ -8098,22 +8100,23 @@
(Integer) commandArguments.get("stepMode"),
(Integer) commandArguments.get("stepSize"),
(Integer) commandArguments.get("transitionTime"),
- (Integer) commandArguments.get("optionMask"),
- (Integer) commandArguments.get("optionOverride"));
+ (Integer) commandArguments.get("optionsMask"),
+ (Integer) commandArguments.get("optionsOverride"));
},
() -> new DelegatedDefaultClusterCallback(),
levelControlstepCommandParams);
levelControlClusterInteractionInfoMap.put("step", levelControlstepInteractionInfo);
Map<String, CommandParameterInfo> levelControlstopCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo levelControlstopoptionMaskCommandParameterInfo =
- new CommandParameterInfo("optionMask", Integer.class, Integer.class);
- levelControlstopCommandParams.put("optionMask", levelControlstopoptionMaskCommandParameterInfo);
-
- CommandParameterInfo levelControlstopoptionOverrideCommandParameterInfo =
- new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
+ CommandParameterInfo levelControlstopoptionsMaskCommandParameterInfo =
+ new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
levelControlstopCommandParams.put(
- "optionOverride", levelControlstopoptionOverrideCommandParameterInfo);
+ "optionsMask", levelControlstopoptionsMaskCommandParameterInfo);
+
+ CommandParameterInfo levelControlstopoptionsOverrideCommandParameterInfo =
+ new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+ levelControlstopCommandParams.put(
+ "optionsOverride", levelControlstopoptionsOverrideCommandParameterInfo);
InteractionInfo levelControlstopInteractionInfo =
new InteractionInfo(
@@ -8121,8 +8124,8 @@
((ChipClusters.LevelControlCluster) cluster)
.stop(
(DefaultClusterCallback) callback,
- (Integer) commandArguments.get("optionMask"),
- (Integer) commandArguments.get("optionOverride"));
+ (Integer) commandArguments.get("optionsMask"),
+ (Integer) commandArguments.get("optionsOverride"));
},
() -> new DelegatedDefaultClusterCallback(),
levelControlstopCommandParams);
@@ -8139,6 +8142,16 @@
levelControlmoveToLevelWithOnOffCommandParams.put(
"transitionTime", levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo);
+ CommandParameterInfo levelControlmoveToLevelWithOnOffoptionsMaskCommandParameterInfo =
+ new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+ levelControlmoveToLevelWithOnOffCommandParams.put(
+ "optionsMask", levelControlmoveToLevelWithOnOffoptionsMaskCommandParameterInfo);
+
+ CommandParameterInfo levelControlmoveToLevelWithOnOffoptionsOverrideCommandParameterInfo =
+ new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+ levelControlmoveToLevelWithOnOffCommandParams.put(
+ "optionsOverride", levelControlmoveToLevelWithOnOffoptionsOverrideCommandParameterInfo);
+
InteractionInfo levelControlmoveToLevelWithOnOffInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
@@ -8146,7 +8159,9 @@
.moveToLevelWithOnOff(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("level"),
- (Integer) commandArguments.get("transitionTime"));
+ (Integer) commandArguments.get("transitionTime"),
+ (Integer) commandArguments.get("optionsMask"),
+ (Integer) commandArguments.get("optionsOverride"));
},
() -> new DelegatedDefaultClusterCallback(),
levelControlmoveToLevelWithOnOffCommandParams);
@@ -8164,6 +8179,16 @@
levelControlmoveWithOnOffCommandParams.put(
"rate", levelControlmoveWithOnOffrateCommandParameterInfo);
+ CommandParameterInfo levelControlmoveWithOnOffoptionsMaskCommandParameterInfo =
+ new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+ levelControlmoveWithOnOffCommandParams.put(
+ "optionsMask", levelControlmoveWithOnOffoptionsMaskCommandParameterInfo);
+
+ CommandParameterInfo levelControlmoveWithOnOffoptionsOverrideCommandParameterInfo =
+ new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+ levelControlmoveWithOnOffCommandParams.put(
+ "optionsOverride", levelControlmoveWithOnOffoptionsOverrideCommandParameterInfo);
+
InteractionInfo levelControlmoveWithOnOffInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
@@ -8171,7 +8196,9 @@
.moveWithOnOff(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("moveMode"),
- (Integer) commandArguments.get("rate"));
+ (Integer) commandArguments.get("rate"),
+ (Integer) commandArguments.get("optionsMask"),
+ (Integer) commandArguments.get("optionsOverride"));
},
() -> new DelegatedDefaultClusterCallback(),
levelControlmoveWithOnOffCommandParams);
@@ -8194,6 +8221,16 @@
levelControlstepWithOnOffCommandParams.put(
"transitionTime", levelControlstepWithOnOfftransitionTimeCommandParameterInfo);
+ CommandParameterInfo levelControlstepWithOnOffoptionsMaskCommandParameterInfo =
+ new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+ levelControlstepWithOnOffCommandParams.put(
+ "optionsMask", levelControlstepWithOnOffoptionsMaskCommandParameterInfo);
+
+ CommandParameterInfo levelControlstepWithOnOffoptionsOverrideCommandParameterInfo =
+ new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+ levelControlstepWithOnOffCommandParams.put(
+ "optionsOverride", levelControlstepWithOnOffoptionsOverrideCommandParameterInfo);
+
InteractionInfo levelControlstepWithOnOffInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
@@ -8202,7 +8239,9 @@
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("stepMode"),
(Integer) commandArguments.get("stepSize"),
- (Integer) commandArguments.get("transitionTime"));
+ (Integer) commandArguments.get("transitionTime"),
+ (Integer) commandArguments.get("optionsMask"),
+ (Integer) commandArguments.get("optionsOverride"));
},
() -> new DelegatedDefaultClusterCallback(),
levelControlstepWithOnOffCommandParams);
@@ -8210,11 +8249,24 @@
"stepWithOnOff", levelControlstepWithOnOffInteractionInfo);
Map<String, CommandParameterInfo> levelControlstopWithOnOffCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
+ CommandParameterInfo levelControlstopWithOnOffoptionsMaskCommandParameterInfo =
+ new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+ levelControlstopWithOnOffCommandParams.put(
+ "optionsMask", levelControlstopWithOnOffoptionsMaskCommandParameterInfo);
+
+ CommandParameterInfo levelControlstopWithOnOffoptionsOverrideCommandParameterInfo =
+ new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+ levelControlstopWithOnOffCommandParams.put(
+ "optionsOverride", levelControlstopWithOnOffoptionsOverrideCommandParameterInfo);
+
InteractionInfo levelControlstopWithOnOffInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.LevelControlCluster) cluster)
- .stopWithOnOff((DefaultClusterCallback) callback);
+ .stopWithOnOff(
+ (DefaultClusterCallback) callback,
+ (Integer) commandArguments.get("optionsMask"),
+ (Integer) commandArguments.get("optionsOverride"));
},
() -> new DelegatedDefaultClusterCallback(),
levelControlstopWithOnOffCommandParams);
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index b729e83..ea60bc8 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -480,8 +480,8 @@
"args": {
"level": "int",
"transitionTime": "int",
- "optionMask": "int",
- "optionOverride": "int",
+ "optionsMask": "int",
+ "optionsOverride": "int",
},
},
0x00000001: {
@@ -490,8 +490,8 @@
"args": {
"moveMode": "int",
"rate": "int",
- "optionMask": "int",
- "optionOverride": "int",
+ "optionsMask": "int",
+ "optionsOverride": "int",
},
},
0x00000002: {
@@ -501,16 +501,16 @@
"stepMode": "int",
"stepSize": "int",
"transitionTime": "int",
- "optionMask": "int",
- "optionOverride": "int",
+ "optionsMask": "int",
+ "optionsOverride": "int",
},
},
0x00000003: {
"commandId": 0x00000003,
"commandName": "Stop",
"args": {
- "optionMask": "int",
- "optionOverride": "int",
+ "optionsMask": "int",
+ "optionsOverride": "int",
},
},
0x00000004: {
@@ -519,6 +519,8 @@
"args": {
"level": "int",
"transitionTime": "int",
+ "optionsMask": "int",
+ "optionsOverride": "int",
},
},
0x00000005: {
@@ -527,6 +529,8 @@
"args": {
"moveMode": "int",
"rate": "int",
+ "optionsMask": "int",
+ "optionsOverride": "int",
},
},
0x00000006: {
@@ -536,12 +540,16 @@
"stepMode": "int",
"stepSize": "int",
"transitionTime": "int",
+ "optionsMask": "int",
+ "optionsOverride": "int",
},
},
0x00000007: {
"commandId": 0x00000007,
"commandName": "StopWithOnOff",
"args": {
+ "optionsMask": "int",
+ "optionsOverride": "int",
},
},
},
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 709299e..4951b40 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -1649,14 +1649,14 @@
Fields = [
ClusterObjectFieldDescriptor(Label="level", Tag=0, Type=uint),
ClusterObjectFieldDescriptor(Label="transitionTime", Tag=1, Type=uint),
- ClusterObjectFieldDescriptor(Label="optionMask", Tag=2, Type=uint),
- ClusterObjectFieldDescriptor(Label="optionOverride", Tag=3, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsMask", Tag=2, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=3, Type=uint),
])
level: 'uint' = 0
transitionTime: 'uint' = 0
- optionMask: 'uint' = 0
- optionOverride: 'uint' = 0
+ optionsMask: 'uint' = 0
+ optionsOverride: 'uint' = 0
@dataclass
class Move(ClusterCommand):
@@ -1670,14 +1670,14 @@
Fields = [
ClusterObjectFieldDescriptor(Label="moveMode", Tag=0, Type=LevelControl.Enums.MoveMode),
ClusterObjectFieldDescriptor(Label="rate", Tag=1, Type=uint),
- ClusterObjectFieldDescriptor(Label="optionMask", Tag=2, Type=uint),
- ClusterObjectFieldDescriptor(Label="optionOverride", Tag=3, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsMask", Tag=2, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=3, Type=uint),
])
moveMode: 'LevelControl.Enums.MoveMode' = 0
rate: 'uint' = 0
- optionMask: 'uint' = 0
- optionOverride: 'uint' = 0
+ optionsMask: 'uint' = 0
+ optionsOverride: 'uint' = 0
@dataclass
class Step(ClusterCommand):
@@ -1692,15 +1692,15 @@
ClusterObjectFieldDescriptor(Label="stepMode", Tag=0, Type=LevelControl.Enums.StepMode),
ClusterObjectFieldDescriptor(Label="stepSize", Tag=1, Type=uint),
ClusterObjectFieldDescriptor(Label="transitionTime", Tag=2, Type=uint),
- ClusterObjectFieldDescriptor(Label="optionMask", Tag=3, Type=uint),
- ClusterObjectFieldDescriptor(Label="optionOverride", Tag=4, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsMask", Tag=3, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=4, Type=uint),
])
stepMode: 'LevelControl.Enums.StepMode' = 0
stepSize: 'uint' = 0
transitionTime: 'uint' = 0
- optionMask: 'uint' = 0
- optionOverride: 'uint' = 0
+ optionsMask: 'uint' = 0
+ optionsOverride: 'uint' = 0
@dataclass
class Stop(ClusterCommand):
@@ -1712,12 +1712,12 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
- ClusterObjectFieldDescriptor(Label="optionMask", Tag=0, Type=uint),
- ClusterObjectFieldDescriptor(Label="optionOverride", Tag=1, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsMask", Tag=0, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=1, Type=uint),
])
- optionMask: 'uint' = 0
- optionOverride: 'uint' = 0
+ optionsMask: 'uint' = 0
+ optionsOverride: 'uint' = 0
@dataclass
class MoveToLevelWithOnOff(ClusterCommand):
@@ -1731,10 +1731,14 @@
Fields = [
ClusterObjectFieldDescriptor(Label="level", Tag=0, Type=uint),
ClusterObjectFieldDescriptor(Label="transitionTime", Tag=1, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsMask", Tag=2, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=3, Type=uint),
])
level: 'uint' = 0
transitionTime: 'uint' = 0
+ optionsMask: 'uint' = 0
+ optionsOverride: 'uint' = 0
@dataclass
class MoveWithOnOff(ClusterCommand):
@@ -1748,10 +1752,14 @@
Fields = [
ClusterObjectFieldDescriptor(Label="moveMode", Tag=0, Type=LevelControl.Enums.MoveMode),
ClusterObjectFieldDescriptor(Label="rate", Tag=1, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsMask", Tag=2, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=3, Type=uint),
])
moveMode: 'LevelControl.Enums.MoveMode' = 0
rate: 'uint' = 0
+ optionsMask: 'uint' = 0
+ optionsOverride: 'uint' = 0
@dataclass
class StepWithOnOff(ClusterCommand):
@@ -1766,11 +1774,15 @@
ClusterObjectFieldDescriptor(Label="stepMode", Tag=0, Type=LevelControl.Enums.StepMode),
ClusterObjectFieldDescriptor(Label="stepSize", Tag=1, Type=uint),
ClusterObjectFieldDescriptor(Label="transitionTime", Tag=2, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsMask", Tag=3, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=4, Type=uint),
])
stepMode: 'LevelControl.Enums.StepMode' = 0
stepSize: 'uint' = 0
transitionTime: 'uint' = 0
+ optionsMask: 'uint' = 0
+ optionsOverride: 'uint' = 0
@dataclass
class StopWithOnOff(ClusterCommand):
@@ -1782,8 +1794,12 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
+ ClusterObjectFieldDescriptor(Label="optionsMask", Tag=0, Type=uint),
+ ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=1, Type=uint),
])
+ optionsMask: 'uint' = 0
+ optionsOverride: 'uint' = 0
@dataclass
class MoveToClosestFrequency(ClusterCommand):
diff --git a/src/controller/python/test/test_scripts/base.py b/src/controller/python/test/test_scripts/base.py
index bc81553..636f298 100644
--- a/src/controller/python/test/test_scripts/base.py
+++ b/src/controller/python/test/test_scripts/base.py
@@ -845,7 +845,7 @@
self.logger.info(
f"Sending MoveToLevel command to device {nodeid} endpoint {endpoint}")
try:
- commonArgs = dict(transitionTime=0, optionMask=1, optionOverride=1)
+ commonArgs = dict(transitionTime=0, optionsMask=1, optionsOverride=1)
# Move to 1
self.devCtrl.ZCLSend("LevelControl", "MoveToLevel", nodeid,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index cd23e90..ed0d190 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -941,9 +941,8 @@
completionHandler:(StatusCompletion)completionHandler;
- (void)stepWithOnOffWithParams:(MTRLevelControlClusterStepWithOnOffParams *)params
completionHandler:(StatusCompletion)completionHandler;
-- (void)stopWithOnOffWithParams:(MTRLevelControlClusterStopWithOnOffParams * _Nullable)params
+- (void)stopWithOnOffWithParams:(MTRLevelControlClusterStopWithOnOffParams *)params
completionHandler:(StatusCompletion)completionHandler;
-- (void)stopWithOnOffWithCompletionHandler:(StatusCompletion)completionHandler;
- (void)moveToClosestFrequencyWithParams:(MTRLevelControlClusterMoveToClosestFrequencyParams *)params
completionHandler:(StatusCompletion)completionHandler;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index 0a98774..a4d48da 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -3769,8 +3769,8 @@
}
request.level = params.level.unsignedCharValue;
request.transitionTime = params.transitionTime.unsignedShortValue;
- request.optionMask = params.optionMask.unsignedCharValue;
- request.optionOverride = params.optionOverride.unsignedCharValue;
+ request.optionsMask = params.optionsMask.unsignedCharValue;
+ request.optionsOverride = params.optionsOverride.unsignedCharValue;
new MTRCommandSuccessCallbackBridge(
self.callbackQueue,
@@ -3797,8 +3797,8 @@
}
request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
request.rate = params.rate.unsignedCharValue;
- request.optionMask = params.optionMask.unsignedCharValue;
- request.optionOverride = params.optionOverride.unsignedCharValue;
+ request.optionsMask = params.optionsMask.unsignedCharValue;
+ request.optionsOverride = params.optionsOverride.unsignedCharValue;
new MTRCommandSuccessCallbackBridge(
self.callbackQueue,
@@ -3826,8 +3826,8 @@
request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
request.stepSize = params.stepSize.unsignedCharValue;
request.transitionTime = params.transitionTime.unsignedShortValue;
- request.optionMask = params.optionMask.unsignedCharValue;
- request.optionOverride = params.optionOverride.unsignedCharValue;
+ request.optionsMask = params.optionsMask.unsignedCharValue;
+ request.optionsOverride = params.optionsOverride.unsignedCharValue;
new MTRCommandSuccessCallbackBridge(
self.callbackQueue,
@@ -3852,8 +3852,8 @@
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
}
}
- request.optionMask = params.optionMask.unsignedCharValue;
- request.optionOverride = params.optionOverride.unsignedCharValue;
+ request.optionsMask = params.optionsMask.unsignedCharValue;
+ request.optionsOverride = params.optionsOverride.unsignedCharValue;
new MTRCommandSuccessCallbackBridge(
self.callbackQueue,
@@ -3881,6 +3881,8 @@
}
request.level = params.level.unsignedCharValue;
request.transitionTime = params.transitionTime.unsignedShortValue;
+ request.optionsMask = params.optionsMask.unsignedCharValue;
+ request.optionsOverride = params.optionsOverride.unsignedCharValue;
new MTRCommandSuccessCallbackBridge(
self.callbackQueue,
@@ -3908,6 +3910,8 @@
}
request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
request.rate = params.rate.unsignedCharValue;
+ request.optionsMask = params.optionsMask.unsignedCharValue;
+ request.optionsOverride = params.optionsOverride.unsignedCharValue;
new MTRCommandSuccessCallbackBridge(
self.callbackQueue,
@@ -3936,6 +3940,8 @@
request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
request.stepSize = params.stepSize.unsignedCharValue;
request.transitionTime = params.transitionTime.unsignedShortValue;
+ request.optionsMask = params.optionsMask.unsignedCharValue;
+ request.optionsOverride = params.optionsOverride.unsignedCharValue;
new MTRCommandSuccessCallbackBridge(
self.callbackQueue,
@@ -3950,11 +3956,7 @@
});
}
-- (void)stopWithOnOffWithCompletionHandler:(StatusCompletion)completionHandler
-{
- [self stopWithOnOffWithParams:nil completionHandler:completionHandler];
-}
-- (void)stopWithOnOffWithParams:(MTRLevelControlClusterStopWithOnOffParams * _Nullable)params
+- (void)stopWithOnOffWithParams:(MTRLevelControlClusterStopWithOnOffParams *)params
completionHandler:(StatusCompletion)completionHandler
{
chip::Optional<uint16_t> timedInvokeTimeoutMs;
@@ -3965,6 +3967,8 @@
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
}
}
+ request.optionsMask = params.optionsMask.unsignedCharValue;
+ request.optionsOverride = params.optionsOverride.unsignedCharValue;
new MTRCommandSuccessCallbackBridge(
self.callbackQueue,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
index a006465..b8978b5 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
@@ -938,9 +938,9 @@
@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-@property (strong, nonatomic) NSNumber * _Nonnull optionMask;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-@property (strong, nonatomic) NSNumber * _Nonnull optionOverride;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
@@ -966,9 +966,9 @@
@property (strong, nonatomic) NSNumber * _Nonnull rate;
-@property (strong, nonatomic) NSNumber * _Nonnull optionMask;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-@property (strong, nonatomic) NSNumber * _Nonnull optionOverride;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
@@ -996,9 +996,9 @@
@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-@property (strong, nonatomic) NSNumber * _Nonnull optionMask;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-@property (strong, nonatomic) NSNumber * _Nonnull optionOverride;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
@@ -1020,9 +1020,9 @@
@end
@interface MTRLevelControlClusterStopParams : NSObject
-@property (strong, nonatomic) NSNumber * _Nonnull optionMask;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-@property (strong, nonatomic) NSNumber * _Nonnull optionOverride;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
@@ -1047,6 +1047,10 @@
@property (strong, nonatomic) NSNumber * _Nonnull level;
@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
@@ -1071,6 +1075,10 @@
@property (strong, nonatomic) NSNumber * _Nonnull moveMode;
@property (strong, nonatomic) NSNumber * _Nonnull rate;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
@@ -1097,6 +1105,10 @@
@property (strong, nonatomic) NSNumber * _Nonnull stepSize;
@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
@@ -1117,6 +1129,10 @@
@end
@interface MTRLevelControlClusterStopWithOnOffParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
index cdd9a5d..9a4382d 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
@@ -824,9 +824,9 @@
_transitionTime = @(0);
- _optionMask = @(0);
+ _optionsMask = @(0);
- _optionOverride = @(0);
+ _optionsOverride = @(0);
_timedInvokeTimeoutMs = nil;
}
return self;
@@ -835,8 +835,8 @@
- (NSString *)description
{
NSString * descriptionString =
- [NSString stringWithFormat:@"<%@: level:%@; transitionTime:%@; optionMask:%@; optionOverride:%@; >",
- NSStringFromClass([self class]), _level, _transitionTime, _optionMask, _optionOverride];
+ [NSString stringWithFormat:@"<%@: level:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+ NSStringFromClass([self class]), _level, _transitionTime, _optionsMask, _optionsOverride];
return descriptionString;
}
@@ -850,9 +850,9 @@
_rate = @(0);
- _optionMask = @(0);
+ _optionsMask = @(0);
- _optionOverride = @(0);
+ _optionsOverride = @(0);
_timedInvokeTimeoutMs = nil;
}
return self;
@@ -860,8 +860,8 @@
- (NSString *)description
{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: moveMode:%@; rate:%@; optionMask:%@; optionOverride:%@; >",
- NSStringFromClass([self class]), _moveMode, _rate, _optionMask, _optionOverride];
+ NSString * descriptionString = [NSString stringWithFormat:@"<%@: moveMode:%@; rate:%@; optionsMask:%@; optionsOverride:%@; >",
+ NSStringFromClass([self class]), _moveMode, _rate, _optionsMask, _optionsOverride];
return descriptionString;
}
@@ -877,9 +877,9 @@
_transitionTime = @(0);
- _optionMask = @(0);
+ _optionsMask = @(0);
- _optionOverride = @(0);
+ _optionsOverride = @(0);
_timedInvokeTimeoutMs = nil;
}
return self;
@@ -888,8 +888,8 @@
- (NSString *)description
{
NSString * descriptionString =
- [NSString stringWithFormat:@"<%@: stepMode:%@; stepSize:%@; transitionTime:%@; optionMask:%@; optionOverride:%@; >",
- NSStringFromClass([self class]), _stepMode, _stepSize, _transitionTime, _optionMask, _optionOverride];
+ [NSString stringWithFormat:@"<%@: stepMode:%@; stepSize:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+ NSStringFromClass([self class]), _stepMode, _stepSize, _transitionTime, _optionsMask, _optionsOverride];
return descriptionString;
}
@@ -899,9 +899,9 @@
{
if (self = [super init]) {
- _optionMask = @(0);
+ _optionsMask = @(0);
- _optionOverride = @(0);
+ _optionsOverride = @(0);
_timedInvokeTimeoutMs = nil;
}
return self;
@@ -909,8 +909,8 @@
- (NSString *)description
{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: optionMask:%@; optionOverride:%@; >",
- NSStringFromClass([self class]), _optionMask, _optionOverride];
+ NSString * descriptionString = [NSString stringWithFormat:@"<%@: optionsMask:%@; optionsOverride:%@; >",
+ NSStringFromClass([self class]), _optionsMask, _optionsOverride];
return descriptionString;
}
@@ -923,6 +923,10 @@
_level = @(0);
_transitionTime = @(0);
+
+ _optionsMask = @(0);
+
+ _optionsOverride = @(0);
_timedInvokeTimeoutMs = nil;
}
return self;
@@ -930,8 +934,9 @@
- (NSString *)description
{
- NSString * descriptionString = [NSString
- stringWithFormat:@"<%@: level:%@; transitionTime:%@; >", NSStringFromClass([self class]), _level, _transitionTime];
+ NSString * descriptionString =
+ [NSString stringWithFormat:@"<%@: level:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+ NSStringFromClass([self class]), _level, _transitionTime, _optionsMask, _optionsOverride];
return descriptionString;
}
@@ -944,6 +949,10 @@
_moveMode = @(0);
_rate = @(0);
+
+ _optionsMask = @(0);
+
+ _optionsOverride = @(0);
_timedInvokeTimeoutMs = nil;
}
return self;
@@ -951,8 +960,8 @@
- (NSString *)description
{
- NSString * descriptionString =
- [NSString stringWithFormat:@"<%@: moveMode:%@; rate:%@; >", NSStringFromClass([self class]), _moveMode, _rate];
+ NSString * descriptionString = [NSString stringWithFormat:@"<%@: moveMode:%@; rate:%@; optionsMask:%@; optionsOverride:%@; >",
+ NSStringFromClass([self class]), _moveMode, _rate, _optionsMask, _optionsOverride];
return descriptionString;
}
@@ -967,6 +976,10 @@
_stepSize = @(0);
_transitionTime = @(0);
+
+ _optionsMask = @(0);
+
+ _optionsOverride = @(0);
_timedInvokeTimeoutMs = nil;
}
return self;
@@ -974,8 +987,9 @@
- (NSString *)description
{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: stepMode:%@; stepSize:%@; transitionTime:%@; >",
- NSStringFromClass([self class]), _stepMode, _stepSize, _transitionTime];
+ NSString * descriptionString =
+ [NSString stringWithFormat:@"<%@: stepMode:%@; stepSize:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+ NSStringFromClass([self class]), _stepMode, _stepSize, _transitionTime, _optionsMask, _optionsOverride];
return descriptionString;
}
@@ -984,6 +998,10 @@
- (instancetype)init
{
if (self = [super init]) {
+
+ _optionsMask = @(0);
+
+ _optionsOverride = @(0);
_timedInvokeTimeoutMs = nil;
}
return self;
@@ -991,7 +1009,8 @@
- (NSString *)description
{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+ NSString * descriptionString = [NSString stringWithFormat:@"<%@: optionsMask:%@; optionsOverride:%@; >",
+ NSStringFromClass([self class]), _optionsMask, _optionsOverride];
return descriptionString;
}
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index a915098..058787f 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -1972,8 +1972,8 @@
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLevel)), level));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionMask)), optionMask));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionOverride)), optionOverride));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -1998,11 +1998,11 @@
case to_underlying(Fields::kTransitionTime):
ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
break;
- case to_underlying(Fields::kOptionMask):
- ReturnErrorOnFailure(DataModel::Decode(reader, optionMask));
+ case to_underlying(Fields::kOptionsMask):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
break;
- case to_underlying(Fields::kOptionOverride):
- ReturnErrorOnFailure(DataModel::Decode(reader, optionOverride));
+ case to_underlying(Fields::kOptionsOverride):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
break;
default:
break;
@@ -2021,8 +2021,8 @@
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMoveMode)), moveMode));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRate)), rate));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionMask)), optionMask));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionOverride)), optionOverride));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -2047,11 +2047,11 @@
case to_underlying(Fields::kRate):
ReturnErrorOnFailure(DataModel::Decode(reader, rate));
break;
- case to_underlying(Fields::kOptionMask):
- ReturnErrorOnFailure(DataModel::Decode(reader, optionMask));
+ case to_underlying(Fields::kOptionsMask):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
break;
- case to_underlying(Fields::kOptionOverride):
- ReturnErrorOnFailure(DataModel::Decode(reader, optionOverride));
+ case to_underlying(Fields::kOptionsOverride):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
break;
default:
break;
@@ -2071,8 +2071,8 @@
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepMode)), stepMode));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepSize)), stepSize));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionMask)), optionMask));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionOverride)), optionOverride));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -2100,11 +2100,11 @@
case to_underlying(Fields::kTransitionTime):
ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
break;
- case to_underlying(Fields::kOptionMask):
- ReturnErrorOnFailure(DataModel::Decode(reader, optionMask));
+ case to_underlying(Fields::kOptionsMask):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
break;
- case to_underlying(Fields::kOptionOverride):
- ReturnErrorOnFailure(DataModel::Decode(reader, optionOverride));
+ case to_underlying(Fields::kOptionsOverride):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
break;
default:
break;
@@ -2121,8 +2121,8 @@
{
TLV::TLVType outer;
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionMask)), optionMask));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionOverride)), optionOverride));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -2141,11 +2141,11 @@
}
switch (TLV::TagNumFromTag(reader.GetTag()))
{
- case to_underlying(Fields::kOptionMask):
- ReturnErrorOnFailure(DataModel::Decode(reader, optionMask));
+ case to_underlying(Fields::kOptionsMask):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
break;
- case to_underlying(Fields::kOptionOverride):
- ReturnErrorOnFailure(DataModel::Decode(reader, optionOverride));
+ case to_underlying(Fields::kOptionsOverride):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
break;
default:
break;
@@ -2164,6 +2164,8 @@
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLevel)), level));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -2188,6 +2190,12 @@
case to_underlying(Fields::kTransitionTime):
ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
break;
+ case to_underlying(Fields::kOptionsMask):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+ break;
+ case to_underlying(Fields::kOptionsOverride):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
+ break;
default:
break;
}
@@ -2205,6 +2213,8 @@
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMoveMode)), moveMode));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRate)), rate));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -2229,6 +2239,12 @@
case to_underlying(Fields::kRate):
ReturnErrorOnFailure(DataModel::Decode(reader, rate));
break;
+ case to_underlying(Fields::kOptionsMask):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+ break;
+ case to_underlying(Fields::kOptionsOverride):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
+ break;
default:
break;
}
@@ -2247,6 +2263,8 @@
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepMode)), stepMode));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepSize)), stepSize));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -2274,6 +2292,12 @@
case to_underlying(Fields::kTransitionTime):
ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
break;
+ case to_underlying(Fields::kOptionsMask):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+ break;
+ case to_underlying(Fields::kOptionsOverride):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
+ break;
default:
break;
}
@@ -2289,6 +2313,8 @@
{
TLV::TLVType outer;
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -2307,6 +2333,12 @@
}
switch (TLV::TagNumFromTag(reader.GetTag()))
{
+ case to_underlying(Fields::kOptionsMask):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+ break;
+ case to_underlying(Fields::kOptionsOverride):
+ ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
+ break;
default:
break;
}
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index 1e894a9..397bb89 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -2260,10 +2260,10 @@
namespace MoveToLevel {
enum class Fields
{
- kLevel = 0,
- kTransitionTime = 1,
- kOptionMask = 2,
- kOptionOverride = 3,
+ kLevel = 0,
+ kTransitionTime = 1,
+ kOptionsMask = 2,
+ kOptionsOverride = 3,
};
struct Type
@@ -2275,8 +2275,8 @@
uint8_t level = static_cast<uint8_t>(0);
uint16_t transitionTime = static_cast<uint16_t>(0);
- uint8_t optionMask = static_cast<uint8_t>(0);
- uint8_t optionOverride = static_cast<uint8_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -2293,18 +2293,18 @@
uint8_t level = static_cast<uint8_t>(0);
uint16_t transitionTime = static_cast<uint16_t>(0);
- uint8_t optionMask = static_cast<uint8_t>(0);
- uint8_t optionOverride = static_cast<uint8_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace MoveToLevel
namespace Move {
enum class Fields
{
- kMoveMode = 0,
- kRate = 1,
- kOptionMask = 2,
- kOptionOverride = 3,
+ kMoveMode = 0,
+ kRate = 1,
+ kOptionsMask = 2,
+ kOptionsOverride = 3,
};
struct Type
@@ -2314,10 +2314,10 @@
static constexpr CommandId GetCommandId() { return Commands::Move::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
- MoveMode moveMode = static_cast<MoveMode>(0);
- uint8_t rate = static_cast<uint8_t>(0);
- uint8_t optionMask = static_cast<uint8_t>(0);
- uint8_t optionOverride = static_cast<uint8_t>(0);
+ MoveMode moveMode = static_cast<MoveMode>(0);
+ uint8_t rate = static_cast<uint8_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -2332,21 +2332,21 @@
static constexpr CommandId GetCommandId() { return Commands::Move::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
- MoveMode moveMode = static_cast<MoveMode>(0);
- uint8_t rate = static_cast<uint8_t>(0);
- uint8_t optionMask = static_cast<uint8_t>(0);
- uint8_t optionOverride = static_cast<uint8_t>(0);
+ MoveMode moveMode = static_cast<MoveMode>(0);
+ uint8_t rate = static_cast<uint8_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace Move
namespace Step {
enum class Fields
{
- kStepMode = 0,
- kStepSize = 1,
- kTransitionTime = 2,
- kOptionMask = 3,
- kOptionOverride = 4,
+ kStepMode = 0,
+ kStepSize = 1,
+ kTransitionTime = 2,
+ kOptionsMask = 3,
+ kOptionsOverride = 4,
};
struct Type
@@ -2359,8 +2359,8 @@
StepMode stepMode = static_cast<StepMode>(0);
uint8_t stepSize = static_cast<uint8_t>(0);
uint16_t transitionTime = static_cast<uint16_t>(0);
- uint8_t optionMask = static_cast<uint8_t>(0);
- uint8_t optionOverride = static_cast<uint8_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -2378,16 +2378,16 @@
StepMode stepMode = static_cast<StepMode>(0);
uint8_t stepSize = static_cast<uint8_t>(0);
uint16_t transitionTime = static_cast<uint16_t>(0);
- uint8_t optionMask = static_cast<uint8_t>(0);
- uint8_t optionOverride = static_cast<uint8_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace Step
namespace Stop {
enum class Fields
{
- kOptionMask = 0,
- kOptionOverride = 1,
+ kOptionsMask = 0,
+ kOptionsOverride = 1,
};
struct Type
@@ -2397,8 +2397,8 @@
static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
- uint8_t optionMask = static_cast<uint8_t>(0);
- uint8_t optionOverride = static_cast<uint8_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -2413,16 +2413,18 @@
static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
- uint8_t optionMask = static_cast<uint8_t>(0);
- uint8_t optionOverride = static_cast<uint8_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace Stop
namespace MoveToLevelWithOnOff {
enum class Fields
{
- kLevel = 0,
- kTransitionTime = 1,
+ kLevel = 0,
+ kTransitionTime = 1,
+ kOptionsMask = 2,
+ kOptionsOverride = 3,
};
struct Type
@@ -2434,6 +2436,8 @@
uint8_t level = static_cast<uint8_t>(0);
uint16_t transitionTime = static_cast<uint16_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -2450,14 +2454,18 @@
uint8_t level = static_cast<uint8_t>(0);
uint16_t transitionTime = static_cast<uint16_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace MoveToLevelWithOnOff
namespace MoveWithOnOff {
enum class Fields
{
- kMoveMode = 0,
- kRate = 1,
+ kMoveMode = 0,
+ kRate = 1,
+ kOptionsMask = 2,
+ kOptionsOverride = 3,
};
struct Type
@@ -2467,8 +2475,10 @@
static constexpr CommandId GetCommandId() { return Commands::MoveWithOnOff::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
- MoveMode moveMode = static_cast<MoveMode>(0);
- uint8_t rate = static_cast<uint8_t>(0);
+ MoveMode moveMode = static_cast<MoveMode>(0);
+ uint8_t rate = static_cast<uint8_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -2483,17 +2493,21 @@
static constexpr CommandId GetCommandId() { return Commands::MoveWithOnOff::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
- MoveMode moveMode = static_cast<MoveMode>(0);
- uint8_t rate = static_cast<uint8_t>(0);
+ MoveMode moveMode = static_cast<MoveMode>(0);
+ uint8_t rate = static_cast<uint8_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace MoveWithOnOff
namespace StepWithOnOff {
enum class Fields
{
- kStepMode = 0,
- kStepSize = 1,
- kTransitionTime = 2,
+ kStepMode = 0,
+ kStepSize = 1,
+ kTransitionTime = 2,
+ kOptionsMask = 3,
+ kOptionsOverride = 4,
};
struct Type
@@ -2506,6 +2520,8 @@
StepMode stepMode = static_cast<StepMode>(0);
uint8_t stepSize = static_cast<uint8_t>(0);
uint16_t transitionTime = static_cast<uint16_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -2523,12 +2539,16 @@
StepMode stepMode = static_cast<StepMode>(0);
uint8_t stepSize = static_cast<uint8_t>(0);
uint16_t transitionTime = static_cast<uint16_t>(0);
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace StepWithOnOff
namespace StopWithOnOff {
enum class Fields
{
+ kOptionsMask = 0,
+ kOptionsOverride = 1,
};
struct Type
@@ -2538,6 +2558,9 @@
static constexpr CommandId GetCommandId() { return Commands::StopWithOnOff::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
+
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
using ResponseType = DataModel::NullObjectType;
@@ -2551,6 +2574,8 @@
static constexpr CommandId GetCommandId() { return Commands::StopWithOnOff::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
+ uint8_t optionsMask = static_cast<uint8_t>(0);
+ uint8_t optionsOverride = static_cast<uint8_t>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace StopWithOnOff
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index 2bbbd0f..6082f3c 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -1018,8 +1018,8 @@
{
AddArgument("Level", 0, UINT8_MAX, &mRequest.level);
AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
- AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
- AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -1051,8 +1051,8 @@
{
AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
- AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
- AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -1085,8 +1085,8 @@
AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
- AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
- AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -1116,8 +1116,8 @@
public:
LevelControlStop(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop", credsIssuerConfig)
{
- AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
- AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -1150,6 +1150,8 @@
{
AddArgument("Level", 0, UINT8_MAX, &mRequest.level);
AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -1181,6 +1183,8 @@
{
AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -1213,6 +1217,8 @@
AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -1242,6 +1248,8 @@
public:
LevelControlStopWithOnOff(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop-with-on-off", credsIssuerConfig)
{
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index e02f8c0..85b525d 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -14507,8 +14507,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Type value;
- value.level = 64U;
- value.transitionTime = 0U;
+ value.level = 64U;
+ value.transitionTime = 0U;
+ value.optionsMask = 0U;
+ value.optionsOverride = 0U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::MoveToLevelWithOnOff::Id,
value, chip::NullOptional
@@ -14532,10 +14534,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::MoveToLevel::Type value;
- value.level = 100U;
- value.transitionTime = 0U;
- value.optionMask = 0U;
- value.optionOverride = 0U;
+ value.level = 100U;
+ value.transitionTime = 0U;
+ value.optionsMask = 0U;
+ value.optionsOverride = 0U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::MoveToLevel::Id, value,
chip::NullOptional
@@ -14559,10 +14561,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C00.Rsp && LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::MoveToLevel::Type value;
- value.level = 128U;
- value.transitionTime = 100U;
- value.optionMask = 0U;
- value.optionOverride = 0U;
+ value.level = 128U;
+ value.transitionTime = 100U;
+ value.optionsMask = 0U;
+ value.optionsOverride = 0U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::MoveToLevel::Id, value,
chip::NullOptional
@@ -14593,10 +14595,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C00.Rsp && LVL.S.A0010"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::MoveToLevel::Type value;
- value.level = 64U;
- value.transitionTime = 65535U;
- value.optionMask = 0U;
- value.optionOverride = 0U;
+ value.level = 64U;
+ value.transitionTime = 65535U;
+ value.optionsMask = 0U;
+ value.optionsOverride = 0U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::MoveToLevel::Id, value,
chip::NullOptional
@@ -14846,8 +14848,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Type value;
- value.level = 1U;
- value.transitionTime = 0U;
+ value.level = 1U;
+ value.transitionTime = 0U;
+ value.optionsMask = 1U;
+ value.optionsOverride = 1U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::MoveToLevelWithOnOff::Id,
value, chip::NullOptional
@@ -14864,10 +14868,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::Move::Type value;
- value.moveMode = static_cast<chip::app::Clusters::LevelControl::MoveMode>(0);
- value.rate = 32U;
- value.optionMask = 1U;
- value.optionOverride = 1U;
+ value.moveMode = static_cast<chip::app::Clusters::LevelControl::MoveMode>(0);
+ value.rate = 32U;
+ value.optionsMask = 1U;
+ value.optionsOverride = 1U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::Move::Id, value,
chip::NullOptional
@@ -14903,10 +14907,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C05.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::Move::Type value;
- value.moveMode = static_cast<chip::app::Clusters::LevelControl::MoveMode>(1);
- value.rate = 64U;
- value.optionMask = 1U;
- value.optionOverride = 1U;
+ value.moveMode = static_cast<chip::app::Clusters::LevelControl::MoveMode>(1);
+ value.rate = 64U;
+ value.optionsMask = 1U;
+ value.optionsOverride = 1U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::Move::Id, value,
chip::NullOptional
@@ -14948,10 +14952,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C05.Rsp && LVL.S.A0014"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::Move::Type value;
- value.moveMode = static_cast<chip::app::Clusters::LevelControl::MoveMode>(0);
- value.rate = 255U;
- value.optionMask = 1U;
- value.optionOverride = 1U;
+ value.moveMode = static_cast<chip::app::Clusters::LevelControl::MoveMode>(0);
+ value.rate = 255U;
+ value.optionsMask = 1U;
+ value.optionsOverride = 1U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::Move::Id, value,
chip::NullOptional
@@ -15230,8 +15234,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C04.Rsp && LVL.S.A0002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Type value;
- value.level = static_cast<uint8_t>(MinlevelValue + 1);
- value.transitionTime = 0U;
+ value.level = static_cast<uint8_t>(MinlevelValue + 1);
+ value.transitionTime = 0U;
+ value.optionsMask = 0U;
+ value.optionsOverride = 0U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::MoveToLevelWithOnOff::Id,
value, chip::NullOptional
@@ -15242,8 +15248,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C04.Rsp && !LVL.S.A0002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Type value;
- value.level = 2U;
- value.transitionTime = 0U;
+ value.level = 2U;
+ value.transitionTime = 0U;
+ value.optionsMask = 0U;
+ value.optionsOverride = 0U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::MoveToLevelWithOnOff::Id,
value, chip::NullOptional
@@ -15266,11 +15274,11 @@
VerifyOrDo(!ShouldSkip("LVL.S.C02.Rsp && LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::Step::Type value;
- value.stepMode = static_cast<chip::app::Clusters::LevelControl::StepMode>(0);
- value.stepSize = 64U;
- value.transitionTime = 20U;
- value.optionMask = 0U;
- value.optionOverride = 0U;
+ value.stepMode = static_cast<chip::app::Clusters::LevelControl::StepMode>(0);
+ value.stepSize = 64U;
+ value.transitionTime = 20U;
+ value.optionsMask = 0U;
+ value.optionsOverride = 0U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::Step::Id, value,
chip::NullOptional
@@ -15281,11 +15289,11 @@
VerifyOrDo(!ShouldSkip("LVL.S.C02.Rsp && !LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::Step::Type value;
- value.stepMode = static_cast<chip::app::Clusters::LevelControl::StepMode>(0);
- value.stepSize = 64U;
- value.transitionTime = 20U;
- value.optionMask = 0U;
- value.optionOverride = 0U;
+ value.stepMode = static_cast<chip::app::Clusters::LevelControl::StepMode>(0);
+ value.stepSize = 64U;
+ value.transitionTime = 20U;
+ value.optionsMask = 0U;
+ value.optionsOverride = 0U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::Step::Id, value,
chip::NullOptional
@@ -15317,9 +15325,11 @@
VerifyOrDo(!ShouldSkip("LVL.S.C06.Rsp && LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::StepWithOnOff::Type value;
- value.stepMode = static_cast<chip::app::Clusters::LevelControl::StepMode>(1);
- value.stepSize = 64U;
- value.transitionTime = 20U;
+ value.stepMode = static_cast<chip::app::Clusters::LevelControl::StepMode>(1);
+ value.stepSize = 64U;
+ value.transitionTime = 20U;
+ value.optionsMask = 0U;
+ value.optionsOverride = 0U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::StepWithOnOff::Id, value,
chip::NullOptional
@@ -15330,9 +15340,11 @@
VerifyOrDo(!ShouldSkip("LVL.S.C06.Rsp && !LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::StepWithOnOff::Type value;
- value.stepMode = static_cast<chip::app::Clusters::LevelControl::StepMode>(1);
- value.stepSize = 64U;
- value.transitionTime = 20U;
+ value.stepMode = static_cast<chip::app::Clusters::LevelControl::StepMode>(1);
+ value.stepSize = 64U;
+ value.transitionTime = 20U;
+ value.optionsMask = 0U;
+ value.optionsOverride = 0U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::StepWithOnOff::Id, value,
chip::NullOptional
@@ -15588,8 +15600,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C04.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Type value;
- value.level = 1U;
- value.transitionTime = 0U;
+ value.level = 1U;
+ value.transitionTime = 0U;
+ value.optionsMask = 1U;
+ value.optionsOverride = 1U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::MoveToLevelWithOnOff::Id,
value, chip::NullOptional
@@ -15606,10 +15620,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::Move::Type value;
- value.moveMode = static_cast<chip::app::Clusters::LevelControl::MoveMode>(0);
- value.rate = 5U;
- value.optionMask = 1U;
- value.optionOverride = 1U;
+ value.moveMode = static_cast<chip::app::Clusters::LevelControl::MoveMode>(0);
+ value.rate = 5U;
+ value.optionsMask = 1U;
+ value.optionsOverride = 1U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::Move::Id, value,
chip::NullOptional
@@ -15627,8 +15641,8 @@
VerifyOrDo(!ShouldSkip("LVL.S.C03.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::Stop::Type value;
- value.optionMask = 1U;
- value.optionOverride = 1U;
+ value.optionsMask = 1U;
+ value.optionsOverride = 1U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::Stop::Id, value,
chip::NullOptional
@@ -15656,10 +15670,10 @@
VerifyOrDo(!ShouldSkip("LVL.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::Move::Type value;
- value.moveMode = static_cast<chip::app::Clusters::LevelControl::MoveMode>(0);
- value.rate = 5U;
- value.optionMask = 1U;
- value.optionOverride = 1U;
+ value.moveMode = static_cast<chip::app::Clusters::LevelControl::MoveMode>(0);
+ value.rate = 5U;
+ value.optionsMask = 1U;
+ value.optionsOverride = 1U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::Move::Id, value,
chip::NullOptional
@@ -15677,6 +15691,8 @@
VerifyOrDo(!ShouldSkip("LVL.S.C07.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::StopWithOnOff::Type value;
+ value.optionsMask = 1U;
+ value.optionsOverride = 1U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::StopWithOnOff::Id, value,
chip::NullOptional
@@ -55308,10 +55324,10 @@
LogStep(1, "Sends a MoveToLevel command to set current level to min value");
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::MoveToLevel::Type value;
- value.level = 1U;
- value.transitionTime = 0U;
- value.optionMask = 1U;
- value.optionOverride = 1U;
+ value.level = 1U;
+ value.transitionTime = 0U;
+ value.optionsMask = 1U;
+ value.optionsOverride = 1U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::MoveToLevel::Id, value,
chip::NullOptional
@@ -55427,10 +55443,10 @@
LogStep(19, "Sends a MoveToLevel command to set current level to a mid value");
ListFreer listFreer;
chip::app::Clusters::LevelControl::Commands::MoveToLevel::Type value;
- value.level = 127U;
- value.transitionTime = 0U;
- value.optionMask = 1U;
- value.optionOverride = 1U;
+ value.level = 127U;
+ value.transitionTime = 0U;
+ value.optionsMask = 1U;
+ value.optionsOverride = 1U;
return SendCommand(kIdentityAlpha, GetEndpoint(1), LevelControl::Id, LevelControl::Commands::MoveToLevel::Id, value,
chip::NullOptional
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 938eb20..bf587ab 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -4357,8 +4357,8 @@
{
AddArgument("Level", 0, UINT8_MAX, &mRequest.level);
AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
- AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
- AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -4375,8 +4375,8 @@
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.level = [NSNumber numberWithUnsignedChar:mRequest.level];
params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
- params.optionMask = [NSNumber numberWithUnsignedChar:mRequest.optionMask];
- params.optionOverride = [NSNumber numberWithUnsignedChar:mRequest.optionOverride];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
uint16_t repeatCount = mRepeatCount.ValueOr(1);
uint16_t __block responsesNeeded = repeatCount;
while (repeatCount--) {
@@ -4409,8 +4409,8 @@
{
AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
- AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
- AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -4427,8 +4427,8 @@
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
params.rate = [NSNumber numberWithUnsignedChar:mRequest.rate];
- params.optionMask = [NSNumber numberWithUnsignedChar:mRequest.optionMask];
- params.optionOverride = [NSNumber numberWithUnsignedChar:mRequest.optionOverride];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
uint16_t repeatCount = mRepeatCount.ValueOr(1);
uint16_t __block responsesNeeded = repeatCount;
while (repeatCount--) {
@@ -4462,8 +4462,8 @@
AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
- AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
- AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -4481,8 +4481,8 @@
params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
params.stepSize = [NSNumber numberWithUnsignedChar:mRequest.stepSize];
params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
- params.optionMask = [NSNumber numberWithUnsignedChar:mRequest.optionMask];
- params.optionOverride = [NSNumber numberWithUnsignedChar:mRequest.optionOverride];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
uint16_t repeatCount = mRepeatCount.ValueOr(1);
uint16_t __block responsesNeeded = repeatCount;
while (repeatCount--) {
@@ -4513,8 +4513,8 @@
LevelControlStop()
: ClusterCommand("stop")
{
- AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
- AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -4529,8 +4529,8 @@
__auto_type * params = [[MTRLevelControlClusterStopParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
- params.optionMask = [NSNumber numberWithUnsignedChar:mRequest.optionMask];
- params.optionOverride = [NSNumber numberWithUnsignedChar:mRequest.optionOverride];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
uint16_t repeatCount = mRepeatCount.ValueOr(1);
uint16_t __block responsesNeeded = repeatCount;
while (repeatCount--) {
@@ -4563,6 +4563,8 @@
{
AddArgument("Level", 0, UINT8_MAX, &mRequest.level);
AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -4579,6 +4581,8 @@
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.level = [NSNumber numberWithUnsignedChar:mRequest.level];
params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
uint16_t repeatCount = mRepeatCount.ValueOr(1);
uint16_t __block responsesNeeded = repeatCount;
while (repeatCount--) {
@@ -4611,6 +4615,8 @@
{
AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -4627,6 +4633,8 @@
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
params.rate = [NSNumber numberWithUnsignedChar:mRequest.rate];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
uint16_t repeatCount = mRepeatCount.ValueOr(1);
uint16_t __block responsesNeeded = repeatCount;
while (repeatCount--) {
@@ -4660,6 +4668,8 @@
AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -4677,6 +4687,8 @@
params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
params.stepSize = [NSNumber numberWithUnsignedChar:mRequest.stepSize];
params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
uint16_t repeatCount = mRepeatCount.ValueOr(1);
uint16_t __block responsesNeeded = repeatCount;
while (repeatCount--) {
@@ -4707,6 +4719,8 @@
LevelControlStopWithOnOff()
: ClusterCommand("stop-with-on-off")
{
+ AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+ AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
ClusterCommand::AddArguments();
}
@@ -4721,6 +4735,8 @@
__auto_type * params = [[MTRLevelControlClusterStopWithOnOffParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+ params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
uint16_t repeatCount = mRepeatCount.ValueOr(1);
uint16_t __block responsesNeeded = repeatCount;
while (repeatCount--) {
@@ -4740,6 +4756,7 @@
}
private:
+ chip::app::Clusters::LevelControl::Commands::StopWithOnOff::Type mRequest;
};
/*
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index e7f77a9..dc305cd 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -23344,6 +23344,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveToLevelWithOnOffParams alloc] init];
params.level = [NSNumber numberWithUnsignedChar:64U];
params.transitionTime = [NSNumber numberWithUnsignedShort:0U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:0U];
[cluster moveToLevelWithOnOffWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"sends a MoveToLevelWithOnOff command Error: %@", err);
@@ -23398,8 +23400,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveToLevelParams alloc] init];
params.level = [NSNumber numberWithUnsignedChar:100U];
params.transitionTime = [NSNumber numberWithUnsignedShort:0U];
- params.optionMask = [NSNumber numberWithUnsignedChar:0U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:0U];
[cluster moveToLevelWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"sends a Move to level command Error: %@", err);
@@ -23454,8 +23456,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveToLevelParams alloc] init];
params.level = [NSNumber numberWithUnsignedChar:128U];
params.transitionTime = [NSNumber numberWithUnsignedShort:100U];
- params.optionMask = [NSNumber numberWithUnsignedChar:0U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:0U];
[cluster moveToLevelWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"sends a Move to level command Error: %@", err);
@@ -23533,8 +23535,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveToLevelParams alloc] init];
params.level = [NSNumber numberWithUnsignedChar:64U];
params.transitionTime = [NSNumber numberWithUnsignedShort:65535U];
- params.optionMask = [NSNumber numberWithUnsignedChar:0U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:0U];
[cluster moveToLevelWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"sends a Move to level command Error: %@", err);
@@ -24014,6 +24016,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveToLevelWithOnOffParams alloc] init];
params.level = [NSNumber numberWithUnsignedChar:1U];
params.transitionTime = [NSNumber numberWithUnsignedShort:0U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:1U];
[cluster moveToLevelWithOnOffWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"sends a MoveToLevelWithOnOff command Error: %@", err);
@@ -24064,8 +24068,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveParams alloc] init];
params.moveMode = [NSNumber numberWithUnsignedChar:0U];
params.rate = [NSNumber numberWithUnsignedChar:32U];
- params.optionMask = [NSNumber numberWithUnsignedChar:1U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:1U];
[cluster moveWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"sends a Move up command Error: %@", err);
@@ -24130,8 +24134,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveParams alloc] init];
params.moveMode = [NSNumber numberWithUnsignedChar:1U];
params.rate = [NSNumber numberWithUnsignedChar:64U];
- params.optionMask = [NSNumber numberWithUnsignedChar:1U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:1U];
[cluster moveWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"sends a Move command Error: %@", err);
@@ -24229,8 +24233,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveParams alloc] init];
params.moveMode = [NSNumber numberWithUnsignedChar:0U];
params.rate = [NSNumber numberWithUnsignedChar:255U];
- params.optionMask = [NSNumber numberWithUnsignedChar:1U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:1U];
[cluster moveWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"sends a Move up command at default move rate Error: %@", err);
@@ -24715,6 +24719,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveToLevelWithOnOffParams alloc] init];
params.level = [NSNumber numberWithUnsignedChar:[MinlevelValue unsignedCharValue] + 1U];
params.transitionTime = [NSNumber numberWithUnsignedShort:0U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:0U];
[cluster moveToLevelWithOnOffWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"Sends MoveToLevelWithOnOff command to DUT Error: %@", err);
@@ -24738,6 +24744,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveToLevelWithOnOffParams alloc] init];
params.level = [NSNumber numberWithUnsignedChar:2U];
params.transitionTime = [NSNumber numberWithUnsignedShort:0U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:0U];
[cluster moveToLevelWithOnOffWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"Sends MoveToLevelWithOnOff command to DUT Error: %@", err);
@@ -24822,8 +24830,8 @@
params.stepMode = [NSNumber numberWithUnsignedChar:0U];
params.stepSize = [NSNumber numberWithUnsignedChar:64U];
params.transitionTime = [NSNumber numberWithUnsignedShort:20U];
- params.optionMask = [NSNumber numberWithUnsignedChar:0U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:0U];
[cluster stepWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"Sends step up command to DUT Error: %@", err);
@@ -24848,8 +24856,8 @@
params.stepMode = [NSNumber numberWithUnsignedChar:0U];
params.stepSize = [NSNumber numberWithUnsignedChar:64U];
params.transitionTime = [NSNumber numberWithUnsignedShort:20U];
- params.optionMask = [NSNumber numberWithUnsignedChar:0U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:0U];
[cluster stepWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"Sends step up command to DUT Error: %@", err);
@@ -24931,6 +24939,8 @@
params.stepMode = [NSNumber numberWithUnsignedChar:1U];
params.stepSize = [NSNumber numberWithUnsignedChar:64U];
params.transitionTime = [NSNumber numberWithUnsignedShort:20U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:0U];
[cluster stepWithOnOffWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"Sends a StepWithOnOff command Error: %@", err);
@@ -24955,6 +24965,8 @@
params.stepMode = [NSNumber numberWithUnsignedChar:1U];
params.stepSize = [NSNumber numberWithUnsignedChar:64U];
params.transitionTime = [NSNumber numberWithUnsignedShort:20U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:0U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:0U];
[cluster stepWithOnOffWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"Sends a StepWithOnOff command Error: %@", err);
@@ -25482,6 +25494,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveToLevelWithOnOffParams alloc] init];
params.level = [NSNumber numberWithUnsignedChar:1U];
params.transitionTime = [NSNumber numberWithUnsignedShort:0U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:1U];
[cluster moveToLevelWithOnOffWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"Sends MoveToLevelWithOnOff command to DUT Error: %@", err);
@@ -25531,8 +25545,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveParams alloc] init];
params.moveMode = [NSNumber numberWithUnsignedChar:0U];
params.rate = [NSNumber numberWithUnsignedChar:5U];
- params.optionMask = [NSNumber numberWithUnsignedChar:1U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:1U];
[cluster moveWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"Sends a move up command to DUT Error: %@", err);
@@ -25561,8 +25575,8 @@
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
__auto_type * params = [[MTRLevelControlClusterStopParams alloc] init];
- params.optionMask = [NSNumber numberWithUnsignedChar:1U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:1U];
[cluster stopWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"Sends stop command to DUT Error: %@", err);
@@ -25618,8 +25632,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveParams alloc] init];
params.moveMode = [NSNumber numberWithUnsignedChar:0U];
params.rate = [NSNumber numberWithUnsignedChar:5U];
- params.optionMask = [NSNumber numberWithUnsignedChar:1U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:1U];
[cluster moveWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"Sends a move up command to DUT Error: %@", err);
@@ -25647,13 +25661,17 @@
queue:mCallbackQueue];
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
- [cluster stopWithOnOffWithCompletionHandler:^(NSError * _Nullable err) {
- NSLog(@"Sends StopWithOnOff command to DUT Error: %@", err);
+ __auto_type * params = [[MTRLevelControlClusterStopWithOnOffParams alloc] init];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:1U];
+ [cluster stopWithOnOffWithParams:params
+ completionHandler:^(NSError * _Nullable err) {
+ NSLog(@"Sends StopWithOnOff command to DUT Error: %@", err);
- VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+ VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
- NextTest();
- }];
+ NextTest();
+ }];
return CHIP_NO_ERROR;
}
@@ -95019,8 +95037,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveToLevelParams alloc] init];
params.level = [NSNumber numberWithUnsignedChar:1U];
params.transitionTime = [NSNumber numberWithUnsignedShort:0U];
- params.optionMask = [NSNumber numberWithUnsignedChar:1U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:1U];
[cluster moveToLevelWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"Sends a MoveToLevel command to set current level to min value Error: %@", err);
@@ -95346,8 +95364,8 @@
__auto_type * params = [[MTRLevelControlClusterMoveToLevelParams alloc] init];
params.level = [NSNumber numberWithUnsignedChar:127U];
params.transitionTime = [NSNumber numberWithUnsignedShort:0U];
- params.optionMask = [NSNumber numberWithUnsignedChar:1U];
- params.optionOverride = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsMask = [NSNumber numberWithUnsignedChar:1U];
+ params.optionsOverride = [NSNumber numberWithUnsignedChar:1U];
[cluster moveToLevelWithParams:params
completionHandler:^(NSError * _Nullable err) {
NSLog(@"Sends a MoveToLevel command to set current level to a mid value Error: %@", err);
