Skip to content

Commit

Permalink
Bring LevelControl cluster and its tests into conformance with the sp…
Browse files Browse the repository at this point in the history 
…ec 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>
  • Loading branch information
@robszewczyk @woody-apple
robszewczyk and woody-apple authored Jul 28, 2022
1 parent 8ee4bee commit cc3e2b7
Show file tree
Hide file tree
Showing 38 changed files with 1,092 additions and 606 deletions.
29 changes: 20 additions & 9 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,44 +320,55 @@ server cluster LevelControl = 8 {
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;
Expand All @@ -367,7 +378,7 @@ server cluster LevelControl = 8 {
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 {
Expand Down
29 changes: 20 additions & 9 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,44 +278,55 @@ server cluster LevelControl = 8 {
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;
Expand All @@ -325,7 +336,7 @@ server cluster LevelControl = 8 {
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 {
Expand Down
29 changes: 20 additions & 9 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,44 +125,55 @@ server cluster LevelControl = 8 {
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;
Expand All @@ -172,7 +183,7 @@ server cluster LevelControl = 8 {
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 {
Expand Down
29 changes: 20 additions & 9 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,44 +301,55 @@ server cluster LevelControl = 8 {
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;
Expand All @@ -348,7 +359,7 @@ server cluster LevelControl = 8 {
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 {
Expand Down
29 changes: 20 additions & 9 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,44 +301,55 @@ server cluster LevelControl = 8 {
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;
Expand All @@ -348,7 +359,7 @@ server cluster LevelControl = 8 {
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 {
Expand Down
Loading

0 comments on commit cc3e2b7

Please sign in to comment.