Enable featuremap for color control server and update cluster revision (

#17082)
project-chip · Dec 19, 2023 · 1178244 · 1178244
1 parent 77d0df9
commit 1178244
Show file tree

Hide file tree

Showing 16 changed files with 822 additions and 191 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
@@ -412,6 +412,14 @@ server cluster ColorControl = 768 {
  kColorTemperatureSupported = 0x10;
  }
 
+ bitmap ColorControlFeature : BITMAP32 {
+ kHueAndSaturation = 0x1;
+ kEnhancedHue = 0x2;
+ kColorLoop = 0x4;
+ kXy = 0x8;
+ kColorTemperature = 0x10;
+ }
+
  bitmap ColorLoopUpdateFlags : BITMAP8 {
  kUpdateAction = 0x1;
  kUpdateDirection = 0x2;
@@ -471,6 +479,7 @@ server cluster ColorControl = 768 {
  readonly attribute int16u colorTempPhysicalMax = 16396;
  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
  attribute int16u startUpColorTemperatureMireds = 16400;
+ readonly global attribute bitmap32 featureMap = 65532;
  readonly global attribute int16u clusterRevision = 65533;
 
  request struct MoveToHueRequest {

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
@@ -12939,11 +12939,11 @@
  "mfgCode": null,
  "side": "server",
  "included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
  "singleton": 0,
  "bounded": 0,
  "defaultValue": "",
- "reportable": 0,
+ "reportable": 1,
  "minInterval": 1,
  "maxInterval": 65534,
  "reportableChange": 0
@@ -12954,11 +12954,11 @@
  "mfgCode": null,
  "side": "server",
  "included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
  "singleton": 0,
  "bounded": 0,
  "defaultValue": "",
- "reportable": 0,
+ "reportable": 1,
  "minInterval": 1,
  "maxInterval": 65534,
  "reportableChange": 0
@@ -12969,11 +12969,11 @@
  "mfgCode": null,
  "side": "server",
  "included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
  "singleton": 0,
  "bounded": 0,
  "defaultValue": "",
- "reportable": 0,
+ "reportable": 1,
  "minInterval": 1,
  "maxInterval": 65534,
  "reportableChange": 0
@@ -14075,6 +14075,21 @@
  "maxInterval": 65344,
  "reportableChange": 0
  },
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x1F",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
  {
  "name": "ClusterRevision",
  "code": 65533,
@@ -14084,7 +14099,7 @@
  "storageOption": "RAM",
  "singleton": 0,
  "bounded": 0,
- "defaultValue": "3",
+ "defaultValue": "5",
  "reportable": 1,
  "minInterval": 0,
  "maxInterval": 65344,
@@ -21587,4 +21602,4 @@
  }
  ],
  "log": []
-}
+}
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -208,6 +208,14 @@ client cluster ColorControl = 768 {
  kColorTemperatureSupported = 0x10;
  }
 
+ bitmap ColorControlFeature : BITMAP32 {
+ kHueAndSaturation = 0x1;
+ kEnhancedHue = 0x2;
+ kColorLoop = 0x4;
+ kXy = 0x8;
+ kColorTemperature = 0x10;
+ }
+
  bitmap ColorLoopUpdateFlags : BITMAP8 {
  kUpdateAction = 0x1;
  kUpdateDirection = 0x2;

diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -195,6 +195,14 @@ server cluster ColorControl = 768 {
  kColorTemperatureSupported = 0x10;
  }
 
+ bitmap ColorControlFeature : BITMAP32 {
+ kHueAndSaturation = 0x1;
+ kEnhancedHue = 0x2;
+ kColorLoop = 0x4;
+ kXy = 0x8;
+ kColorTemperature = 0x10;
+ }
+
  bitmap ColorLoopUpdateFlags : BITMAP8 {
  kUpdateAction = 0x1;
  kUpdateDirection = 0x2;
@@ -223,6 +231,7 @@ server cluster ColorControl = 768 {
  readonly attribute int16u colorTempPhysicalMax = 16396;
  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
  attribute int16u startUpColorTemperatureMireds = 16400;
+ readonly global attribute bitmap32 featureMap = 65532;
  readonly global attribute int16u clusterRevision = 65533;
 
  request struct MoveToHueRequest {