Fix ColorCapabilities value mismatch with featuremap (#19825)

* Update ColorCapabilities to the same value than the featuremap's * regen * update test TC_CC_2_1 * rebase n regen
project-chip · Jun 22, 2022 · 756e3ab · 756e3ab
1 parent a891cb4
commit 756e3ab
Show file tree

Hide file tree

Showing 12 changed files with 364 additions and 313 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -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;

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -16425,7 +16425,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x1F",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -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;
   }

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -16281,7 +16281,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x1F",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,

diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -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;

diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -7947,7 +7947,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x1F",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,

diff --git a/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml
@@ -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

diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h