Skip to content

Commit

Permalink
Enable featuremap for color control server and update cluster revision (
Browse files Browse the repository at this point in the history
project-chip#17082)

(cherry picked from commit 42d1e4d)
  • Loading branch information
jmartinez-silabs authored and mspang committed Apr 21, 2022
1 parent 08d5bed commit b3c47ab
Show file tree
Hide file tree
Showing 25 changed files with 1,249 additions and 996 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
31 changes: 23 additions & 8 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -12909,11 +12909,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
Expand All @@ -12924,11 +12924,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
Expand All @@ -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
Expand Down Expand Up @@ -14045,6 +14045,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,
Expand All @@ -14054,7 +14069,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -21557,4 +21572,4 @@
}
],
"log": []
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 9 additions & 0 deletions examples/lighting-app/lighting-common/lighting-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit b3c47ab

Please sign in to comment.