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

Fix ColorCapabilities value mismatch with featuremap #19825

Merged
merged 4 commits into from
Jun 22, 2022
Merged

Fix ColorCapabilities value mismatch with featuremap #19825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95d32c8
Update ColorCapabilities to the same value than the featuremap's
jmartinez-silabs Jun 21, 2022
f32cc21
regen
jmartinez-silabs Jun 21, 2022
082d6f7
update test TC_CC_2_1
jmartinez-silabs Jun 21, 2022
241dc31
rebase n regen
jmartinez-silabs Jun 22, 2022
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
2 changes: 1 addition & 1 deletion 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 @@ -4460,7 +4460,7 @@ endpoint 1 {
ram attribute colorLoopTime default = 0x0019;
ram attribute colorLoopStartEnhancedHue default = 0x2300;
ram attribute colorLoopStoredEnhancedHue;
ram attribute colorCapabilities;
ram attribute colorCapabilities default = 0x1F;
ram attribute colorTempPhysicalMinMireds;
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
ram attribute coupleColorTempToLevelMinMireds;
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 @@ -16425,7 +16425,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
"defaultValue": "0x1F",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -3634,7 +3634,7 @@ endpoint 1 {
ram attribute options;
ram attribute numberOfPrimaries;
ram attribute enhancedColorMode default = 0x01;
ram attribute colorCapabilities;
ram attribute colorCapabilities default = 0x1F;
ram attribute featureMap;
ram attribute clusterRevision default = 5;
}
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 @@ -16281,7 +16281,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
"defaultValue": "0x1F",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -2016,7 +2016,7 @@ endpoint 1 {
ram attribute colorLoopTime default = 0x0019;
ram attribute colorLoopStartEnhancedHue default = 0x2300;
ram attribute colorLoopStoredEnhancedHue;
ram attribute colorCapabilities;
ram attribute colorCapabilities default = 0x1F;
ram attribute colorTempPhysicalMinMireds;
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
ram attribute coupleColorTempToLevelMinMireds;
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 @@ -7947,7 +7947,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
"defaultValue": "0x1F",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
8 changes: 7 additions & 1 deletion src/app/tests/suites/certification/Test_TC_CC_2_1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,18 @@ tests:
constraints:
type: uint16

- label: "read the optional global attribute: FeatureMap"
command: "readAttribute"
attribute: "FeatureMap"
response:
saveAs: FeatureMapValue

- label: "Reads ColorCapabilities attribute from DUT"
PICS: CC.S.A400a
command: "readAttribute"
attribute: "ColorCapabilities"
response:
value: 0
value: FeatureMapValue

- label: "Validate constraints of attribute: ColorCapabilities"
PICS: CC.S.A400a
Expand Down
24 changes: 12 additions & 12 deletions zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading