Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed wrong datamodel in Level Cluster #23656

Merged
merged 1 commit into from
Nov 18, 2022
Merged

Fixed wrong datamodel in Level Cluster #23656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,19 @@ server cluster LevelControl = 8 {
kFrequency = 0x4;
}

bitmap LevelControlOptions : BITMAP8 {
kExecuteIfOff = 0x1;
kCoupleColorTempToLevel = 0x2;
}

readonly attribute nullable int8u currentLevel = 0;
readonly attribute int16u remainingTime = 1;
readonly attribute int8u minLevel = 2;
readonly attribute int8u maxLevel = 3;
readonly attribute int16u currentFrequency = 4;
readonly attribute int16u minFrequency = 5;
readonly attribute int16u maxFrequency = 6;
attribute bitmap8 options = 15;
attribute LevelControlOptions options = 15;
attribute int16u onOffTransitionTime = 16;
attribute nullable int8u onLevel = 17;
attribute nullable int16u onTransitionTime = 18;
Expand All @@ -320,55 +325,55 @@ server cluster LevelControl = 8 {
request struct MoveToLevelRequest {
INT8U level = 0;
nullable INT16U transitionTime = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct MoveRequest {
MoveMode moveMode = 0;
nullable INT8U rate = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
nullable INT16U transitionTime = 2;
BITMAP8 optionsMask = 3;
BITMAP8 optionsOverride = 4;
LevelControlOptions optionsMask = 3;
LevelControlOptions optionsOverride = 4;
}

request struct StopRequest {
BITMAP8 optionsMask = 0;
BITMAP8 optionsOverride = 1;
LevelControlOptions optionsMask = 0;
LevelControlOptions optionsOverride = 1;
}

request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
nullable INT16U transitionTime = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
nullable INT8U rate = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
nullable INT16U transitionTime = 2;
BITMAP8 optionsMask = 3;
BITMAP8 optionsOverride = 4;
LevelControlOptions optionsMask = 3;
LevelControlOptions optionsOverride = 4;
}

request struct StopWithOnOffRequest {
BITMAP8 optionsMask = 0;
BITMAP8 optionsOverride = 1;
LevelControlOptions optionsMask = 0;
LevelControlOptions optionsOverride = 1;
}

command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
Expand Down
39 changes: 22 additions & 17 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,64 +269,69 @@ server cluster LevelControl = 8 {
kFrequency = 0x4;
}

bitmap LevelControlOptions : BITMAP8 {
kExecuteIfOff = 0x1;
kCoupleColorTempToLevel = 0x2;
}

readonly attribute nullable int8u currentLevel = 0;
attribute bitmap8 options = 15;
attribute LevelControlOptions options = 15;
attribute nullable int8u onLevel = 17;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct MoveToLevelRequest {
INT8U level = 0;
nullable INT16U transitionTime = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct MoveRequest {
MoveMode moveMode = 0;
nullable INT8U rate = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
nullable INT16U transitionTime = 2;
BITMAP8 optionsMask = 3;
BITMAP8 optionsOverride = 4;
LevelControlOptions optionsMask = 3;
LevelControlOptions optionsOverride = 4;
}

request struct StopRequest {
BITMAP8 optionsMask = 0;
BITMAP8 optionsOverride = 1;
LevelControlOptions optionsMask = 0;
LevelControlOptions optionsOverride = 1;
}

request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
nullable INT16U transitionTime = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
nullable INT8U rate = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
nullable INT16U transitionTime = 2;
BITMAP8 optionsMask = 3;
BITMAP8 optionsOverride = 4;
LevelControlOptions optionsMask = 3;
LevelControlOptions optionsOverride = 4;
}

request struct StopWithOnOffRequest {
BITMAP8 optionsMask = 0;
BITMAP8 optionsOverride = 1;
LevelControlOptions optionsMask = 0;
LevelControlOptions optionsOverride = 1;
}

command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
Expand Down
39 changes: 22 additions & 17 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,19 @@ server cluster LevelControl = 8 {
kFrequency = 0x4;
}

bitmap LevelControlOptions : BITMAP8 {
kExecuteIfOff = 0x1;
kCoupleColorTempToLevel = 0x2;
}

readonly attribute nullable int8u currentLevel = 0;
readonly attribute int16u remainingTime = 1;
readonly attribute int8u minLevel = 2;
readonly attribute int8u maxLevel = 3;
readonly attribute int16u currentFrequency = 4;
readonly attribute int16u minFrequency = 5;
readonly attribute int16u maxFrequency = 6;
attribute bitmap8 options = 15;
attribute LevelControlOptions options = 15;
attribute int16u onOffTransitionTime = 16;
attribute nullable int8u onLevel = 17;
attribute nullable int16u onTransitionTime = 18;
Expand All @@ -125,55 +130,55 @@ server cluster LevelControl = 8 {
request struct MoveToLevelRequest {
INT8U level = 0;
nullable INT16U transitionTime = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct MoveRequest {
MoveMode moveMode = 0;
nullable INT8U rate = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
nullable INT16U transitionTime = 2;
BITMAP8 optionsMask = 3;
BITMAP8 optionsOverride = 4;
LevelControlOptions optionsMask = 3;
LevelControlOptions optionsOverride = 4;
}

request struct StopRequest {
BITMAP8 optionsMask = 0;
BITMAP8 optionsOverride = 1;
LevelControlOptions optionsMask = 0;
LevelControlOptions optionsOverride = 1;
}

request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
nullable INT16U transitionTime = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
nullable INT8U rate = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
nullable INT16U transitionTime = 2;
BITMAP8 optionsMask = 3;
BITMAP8 optionsOverride = 4;
LevelControlOptions optionsMask = 3;
LevelControlOptions optionsOverride = 4;
}

request struct StopWithOnOffRequest {
BITMAP8 optionsMask = 0;
BITMAP8 optionsOverride = 1;
LevelControlOptions optionsMask = 0;
LevelControlOptions optionsOverride = 1;
}

command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
Expand Down
39 changes: 22 additions & 17 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,16 @@ server cluster LevelControl = 8 {
kFrequency = 0x4;
}

bitmap LevelControlOptions : BITMAP8 {
kExecuteIfOff = 0x1;
kCoupleColorTempToLevel = 0x2;
}

readonly attribute nullable int8u currentLevel = 0;
readonly attribute int16u remainingTime = 1;
readonly attribute int8u minLevel = 2;
readonly attribute int8u maxLevel = 3;
attribute bitmap8 options = 15;
attribute LevelControlOptions options = 15;
attribute nullable int8u onLevel = 17;
attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
readonly attribute command_id generatedCommandList[] = 65528;
Expand All @@ -185,55 +190,55 @@ server cluster LevelControl = 8 {
request struct MoveToLevelRequest {
INT8U level = 0;
nullable INT16U transitionTime = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct MoveRequest {
MoveMode moveMode = 0;
nullable INT8U rate = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
nullable INT16U transitionTime = 2;
BITMAP8 optionsMask = 3;
BITMAP8 optionsOverride = 4;
LevelControlOptions optionsMask = 3;
LevelControlOptions optionsOverride = 4;
}

request struct StopRequest {
BITMAP8 optionsMask = 0;
BITMAP8 optionsOverride = 1;
LevelControlOptions optionsMask = 0;
LevelControlOptions optionsOverride = 1;
}

request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
nullable INT16U transitionTime = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
nullable INT8U rate = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
LevelControlOptions optionsMask = 2;
LevelControlOptions optionsOverride = 3;
}

request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
nullable INT16U transitionTime = 2;
BITMAP8 optionsMask = 3;
BITMAP8 optionsOverride = 4;
LevelControlOptions optionsMask = 3;
LevelControlOptions optionsOverride = 4;
}

request struct StopWithOnOffRequest {
BITMAP8 optionsMask = 0;
BITMAP8 optionsOverride = 1;
LevelControlOptions optionsMask = 0;
LevelControlOptions optionsOverride = 1;
}

command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
Expand Down
Loading