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

[ColorControl]Add checks for rate and step size parameters in commands handling #33251

Merged
merged 9 commits into from
Jul 19, 2024
Merged

[ColorControl]Add checks for rate and step size parameters in commands handling #33251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
722f727
Return invalid comamnd on MoveColor command with RateX and RateY both…
jmartinez-silabs Apr 29, 2024
6143979
Add checks for stepSize and bump Color control cluster revision in it…
jmartinez-silabs Apr 30, 2024
5f8c4de
Update CC cluster revision from 6 to 7 in relevant zap files (with up…
jmartinez-silabs May 1, 2024
ed68a4f
Restyled by prettier-yaml
restyled-commits May 1, 2024
8bbc88f
update changes based on latest spec pr changes
jmartinez-silabs Jun 17, 2024
ad394f1
Revert added test in TC_CC_5_2. spec pr change MoveColor with RateX a…
jmartinez-silabs Jun 18, 2024
1abeea1
Add yaml certification test step for the added CC check
jmartinez-silabs Jul 19, 2024
2c41bba
Restyled by whitespace
restyled-commits Jul 19, 2024
2976d52
Restyled by prettier-yaml
restyled-commits 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 @@ -5441,7 +5441,7 @@ cluster ThermostatUserInterfaceConfiguration = 516 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -8698,7 +8698,7 @@ endpoint 1 {
ram attribute coupleColorTempToLevelMinMireds;
persist attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
ram attribute clusterRevision default = 6;
ram attribute clusterRevision default = 7;

handle command MoveToHue;
handle command MoveHue;
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 @@ -17807,7 +17807,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"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 @@ -3986,7 +3986,7 @@ cluster ThermostatUserInterfaceConfiguration = 516 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -6550,7 +6550,7 @@ endpoint 1 {
ram attribute enhancedColorMode default = 0x01;
ram attribute colorCapabilities default = 0x1F;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 6;
ram attribute clusterRevision default = 7;
}

server cluster BallastConfiguration {
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 @@ -7303,7 +7303,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
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 @@ -1404,7 +1404,7 @@ cluster GroupKeyManagement = 63 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -2047,7 +2047,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x0010;
ram attribute clusterRevision default = 6;
ram attribute clusterRevision default = 7;

handle command MoveToHue;
handle command MoveHue;
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 @@ -3925,7 +3925,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
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 @@ -1505,7 +1505,7 @@ cluster FixedLabel = 64 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -2159,7 +2159,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x1f;
ram attribute clusterRevision default = 6;
ram attribute clusterRevision default = 7;

handle command MoveToHue;
handle command MoveHue;
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 @@ -4029,7 +4029,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2189,7 +2189,7 @@ provisional cluster ScenesManagement = 98 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/light-switch-common/light-switch-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5412,7 +5412,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/qpg/zap/switch.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1986,7 +1986,7 @@ provisional cluster ScenesManagement = 98 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/qpg/zap/switch.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5617,7 +5617,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1544,7 +1544,7 @@ cluster UserLabel = 65 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -2223,7 +2223,7 @@ endpoint 1 {
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
ram attribute clusterRevision default = 6;
ram attribute clusterRevision default = 7;

handle command MoveToHue;
handle command MoveHue;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4300,7 +4300,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1668,7 +1668,7 @@ cluster UserLabel = 65 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -2409,7 +2409,7 @@ endpoint 1 {
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
ram attribute clusterRevision default = 6;
ram attribute clusterRevision default = 7;

handle command MoveToHue;
handle command MoveHue;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5276,7 +5276,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1579,7 +1579,7 @@ cluster UserLabel = 65 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -2272,7 +2272,7 @@ endpoint 1 {
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
ram attribute clusterRevision default = 6;
ram attribute clusterRevision default = 7;

handle command MoveToHue;
handle command MoveHue;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4483,7 +4483,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/lighting-common/lighting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1999,7 +1999,7 @@ provisional cluster ScenesManagement = 98 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -2857,7 +2857,7 @@ endpoint 1 {
ram attribute coupleColorTempToLevelMinMireds;
persist attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
ram attribute clusterRevision default = 6;
ram attribute clusterRevision default = 7;

handle command MoveToHue;
handle command MoveHue;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/lighting-common/lighting-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5813,7 +5813,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/qpg/zap/light.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,7 @@ cluster UserLabel = 65 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -2389,7 +2389,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x1F;
ram attribute clusterRevision default = 6;
ram attribute clusterRevision default = 7;

handle command MoveToHue;
handle command MoveHue;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/qpg/zap/light.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6002,7 +6002,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/silabs/data_model/lighting-thread-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1703,7 +1703,7 @@ provisional cluster ScenesManagement = 98 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -2440,7 +2440,7 @@ endpoint 1 {
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0x1F;
ram attribute clusterRevision default = 6;
ram attribute clusterRevision default = 7;

handle command MoveToHue;
handle command MoveHue;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/silabs/data_model/lighting-thread-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5316,7 +5316,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1994,7 +1994,7 @@ provisional cluster ScenesManagement = 98 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -2729,7 +2729,7 @@ endpoint 1 {
ram attribute coupleColorTempToLevelMinMireds;
persist attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
ram attribute clusterRevision default = 6;
ram attribute clusterRevision default = 7;

handle command MoveToHue;
handle command MoveHue;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5027,7 +5027,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
6 changes: 3 additions & 3 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5555,7 +5555,7 @@ cluster ThermostatUserInterfaceConfiguration = 516 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -5875,7 +5875,7 @@ cluster ColorControl = 768 {

/** Attributes and commands for controlling the color properties of a color-capable light. */
cluster ColorControl = 768 {
revision 6;
revision 7;

enum ColorLoopAction : enum8 {
kDeactivate = 0;
Expand Down Expand Up @@ -9238,7 +9238,7 @@ endpoint 1 {
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 6;
ram attribute clusterRevision default = 7;

handle command MoveToHue;
handle command MoveHue;
Expand Down
4 changes: 2 additions & 2 deletions examples/placeholder/linux/apps/app1/config.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13838,7 +13838,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -14866,7 +14866,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "6",
"defaultValue": "7",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
Loading
Loading