Skip to content

Commit

Permalink
Align XML with spec - Update Color control revision (#28763)
Browse files Browse the repository at this point in the history
* Update colorcontrol cluster revision to 6, with scripts/tools/zap/update_cluster_revisions.py --cluster-id 0x0300 --new-revision 6 --old-revision 5

* run regen_all

* rebase and fix conflicts

* rebase and fix conflict 2
  • Loading branch information
jmartinez-silabs authored and pull[bot] committed Nov 9, 2023
1 parent abedb63 commit 2764905
Show file tree
Hide file tree
Showing 79 changed files with 3,066 additions and 834 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 96,
"featureLevel": 97,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -33,7 +33,33 @@
],
"endpointTypes": [
{
"id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 2,
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
},
"deviceTypes": [
{
"id": 2,
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
}
],
"deviceTypeRefs": [
2
],
"deviceVersions": [
1
],
"deviceIdentifiers": [
22
],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
Expand Down Expand Up @@ -2671,7 +2697,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -2687,7 +2713,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -2703,7 +2729,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -2719,7 +2745,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -5509,7 +5535,33 @@
]
},
{
"id": 2,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 46,
"code": 44,
"profileId": 259,
"label": "MA-air-quality-sensor",
"name": "MA-air-quality-sensor"
},
"deviceTypes": [
{
"id": 46,
"code": 44,
"profileId": 259,
"label": "MA-air-quality-sensor",
"name": "MA-air-quality-sensor"
}
],
"deviceTypeRefs": [
46
],
"deviceVersions": [
1
],
"deviceIdentifiers": [
44
],
"deviceTypeName": "MA-air-quality-sensor",
"deviceTypeCode": 44,
"deviceTypeProfileId": 259,
Expand Down Expand Up @@ -9541,18 +9593,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": 22
"networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": 44
"networkId": 0
}
],
"log": []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7090,7 +7090,7 @@ endpoint 1 {
ram attribute coupleColorTempToLevelMinMireds;
persist attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;
}

server cluster BallastConfiguration {
Expand Down
20 changes: 10 additions & 10 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
],
"endpointTypes": [
{
"id": 24,
"id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 3,
Expand Down Expand Up @@ -8653,7 +8653,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -9479,7 +9479,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -10512,7 +10512,7 @@
]
},
{
"id": 21,
"id": 2,
"name": "MA-onofflight",
"deviceTypeRef": {
"id": 8,
Expand Down Expand Up @@ -21612,7 +21612,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -22486,7 +22486,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -30401,7 +30401,7 @@
]
},
{
"id": 23,
"id": 3,
"name": "MA-onofflight",
"deviceTypeRef": {
"id": 8,
Expand Down Expand Up @@ -33616,7 +33616,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -34442,7 +34442,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -34685,7 +34685,7 @@
]
},
{
"id": 22,
"id": 4,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 53,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4508,7 +4508,7 @@ endpoint 1 {
ram attribute enhancedColorMode default = 0x01;
ram attribute colorCapabilities default = 0x1F;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 5;
ram attribute clusterRevision default = 6;
}

server cluster BallastConfiguration {
Expand Down
Loading

0 comments on commit 2764905

Please sign in to comment.