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

[LVL control] Return invalid command on move when rate is 0 or rate is null and de… #33204

Merged
merged 9 commits into from
Jul 20, 2024
+258 −239
Merged

[LVL control] Return invalid command on move when rate is 0 or rate is null and de… #33204

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b81998f
Return invalid command on move when rate is 0 or rate is null and de…
jmartinez-silabs Apr 26, 2024
1168d91
Update src/app/clusters/level-control/level-control.cpp
jmartinez-silabs Apr 29, 2024
727f193
Add check for stepSize and stepMode and move the parameters validatio…
jmartinez-silabs Apr 30, 2024
42de461
Update level-control-cluster.xml to bump revision to 6 and set the mi…
jmartinez-silabs Apr 30, 2024
396116e
Update level control cluster revision from 5 to 6 in all zap files us…
jmartinez-silabs Apr 30, 2024
b2ab160
bump expected cluster revision in test TC_LVL_1_1 and min default Mov…
jmartinez-silabs Apr 30, 2024
d8de73f
rebase and regen all
jmartinez-silabs Jun 17, 2024
2a1bc4f
Zap regen post rebase
jmartinez-silabs Jul 10, 2024
7dd44a2
address comments
jmartinez-silabs Jul 19, 2024
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
4 changes: 2 additions & 2 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 @@ -288,7 +288,7 @@ deprecated cluster OnOffSwitchConfiguration = 7 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down Expand Up @@ -7847,7 +7847,7 @@ endpoint 1 {
ram attribute defaultMoveRate default = 50;
persist attribute startUpCurrentLevel default = 255;
ram attribute featureMap default = 3;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;

handle command MoveToLevel;
handle command Move;
Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7303,7 +7303,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 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 @@ -202,7 +202,7 @@ cluster OnOff = 6 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down Expand Up @@ -6340,7 +6340,7 @@ endpoint 1 {
ram attribute onLevel default = 0xFF;
persist attribute startUpCurrentLevel default = 255;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;

handle command MoveToLevel;
handle command Move;
Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5047,7 +5047,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 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 @@ -125,7 +125,7 @@ cluster OnOff = 6 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down Expand Up @@ -2330,7 +2330,7 @@ endpoint 2 {
ram attribute defaultMoveRate;
persist attribute startUpCurrentLevel default = 255;
ram attribute featureMap default = 3;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;

handle command MoveToLevel;
handle command Move;
Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/bridge-common/bridge-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5387,7 +5387,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 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 @@ -202,7 +202,7 @@ cluster OnOff = 6 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down Expand Up @@ -2041,7 +2041,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x03;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;

handle command MoveToLevel;
handle command Move;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4564,7 +4564,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ cluster OnOff = 6 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down Expand Up @@ -2407,7 +2407,7 @@ endpoint 2 {
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;

handle command MoveToLevel;
handle command Move;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4666,7 +4666,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ cluster OnOff = 6 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down Expand Up @@ -1988,7 +1988,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;

handle command MoveToLevel;
handle command Move;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3047,7 +3047,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ cluster OnOff = 6 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down Expand Up @@ -1852,7 +1852,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x03;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;

handle command MoveToLevel;
handle command Move;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3301,7 +3301,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ cluster OnOff = 6 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ cluster OnOff = 6 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down Expand Up @@ -2109,7 +2109,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x03;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;

handle command MoveToLevel;
handle command Move;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3269,7 +3269,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ cluster OnOff = 6 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down Expand Up @@ -2237,7 +2237,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 1;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;

handle command MoveToLevel;
handle command Move;
Expand Down
16 changes: 8 additions & 8 deletions examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
"package": [
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
"version": "chip-v1"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
"category": "matter",
"version": "chip-v1"
"version": 1,
"description": "Matter SDK ZCL data"
}
],
"endpointTypes": [
Expand Down Expand Up @@ -3173,7 +3173,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ cluster OnOff = 6 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down Expand Up @@ -1789,7 +1789,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 3;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;

handle command MoveToLevel;
handle command Move;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3269,7 +3269,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_onofflight_samplemei.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ cluster OnOff = 6 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down Expand Up @@ -1821,7 +1821,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 3;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;

handle command MoveToLevel;
handle command Move;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onofflight_samplemei.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3269,7 +3269,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
7 changes: 0 additions & 7 deletions examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
"endpointTypes": [
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ cluster OnOff = 6 {

/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
cluster LevelControl = 8 {
revision 5;
revision 6;

enum MoveModeEnum : enum8 {
kUp = 0;
Expand Down Expand Up @@ -1686,7 +1686,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x1;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;

handle command MoveToLevel;
handle command Move;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2985,7 +2985,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
5 changes: 3 additions & 2 deletions examples/chef/sample_app_util/test_files/sample_zap_file.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 102,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down Expand Up @@ -4925,7 +4926,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
Loading
Loading