Skip to content

Commit

Permalink
Update Mode Select ClusterRevision to 2. (#29140)
Browse files Browse the repository at this point in the history
Fixes #26445
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed May 10, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent b68dc04 commit 5405890
Showing 18 changed files with 33 additions and 42 deletions.
Original file line number Diff line number Diff line change
@@ -6722,7 +6722,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 1;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
ram attribute manufacturerExtension default = 255;
}

Original file line number Diff line number Diff line change
@@ -14787,7 +14787,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -14973,7 +14973,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -35392,6 +35392,5 @@
"endpointId": 65534,
"networkId": 0
}
],
"log": []
]
}
Original file line number Diff line number Diff line change
@@ -4426,7 +4426,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster TemperatureControl {
Original file line number Diff line number Diff line change
@@ -13821,7 +13821,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -14007,7 +14007,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
Original file line number Diff line number Diff line change
@@ -8395,7 +8395,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -8597,7 +8597,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
Original file line number Diff line number Diff line change
@@ -8411,7 +8411,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -8613,7 +8613,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Original file line number Diff line number Diff line change
@@ -8475,7 +8475,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -8677,7 +8677,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
15 changes: 2 additions & 13 deletions examples/chef/sample_app_util/test_files/sample_zap_file.zap
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 97,
"featureLevel": 98,
"creator": "zap",
"keyValuePairs": [
{
@@ -36,24 +36,19 @@
"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
],
@@ -5372,24 +5367,19 @@
"id": 2,
"name": "MA-dimmablelight",
"deviceTypeRef": {
"id": 9,
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
"name": "MA-dimmablelight"
},
"deviceTypes": [
{
"id": 9,
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
"name": "MA-dimmablelight"
}
],
"deviceTypeRefs": [
9
],
"deviceVersions": [
1
],
@@ -7782,6 +7772,5 @@
"endpointId": 1,
"networkId": 0
}
],
"log": []
]
}
4 changes: 2 additions & 2 deletions examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
Original file line number Diff line number Diff line change
@@ -8395,7 +8395,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -8597,7 +8597,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app1/config.matter
Original file line number Diff line number Diff line change
@@ -6940,7 +6940,7 @@ endpoint 0 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster DoorLock {
4 changes: 2 additions & 2 deletions examples/placeholder/linux/apps/app1/config.zap
Original file line number Diff line number Diff line change
@@ -6657,7 +6657,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -6827,7 +6827,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app2/config.matter
Original file line number Diff line number Diff line change
@@ -6906,7 +6906,7 @@ endpoint 0 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster DoorLock {
4 changes: 2 additions & 2 deletions examples/placeholder/linux/apps/app2/config.zap
Original file line number Diff line number Diff line change
@@ -6741,7 +6741,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -6911,7 +6911,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Original file line number Diff line number Diff line change
@@ -8475,7 +8475,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -8677,7 +8677,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
4 changes: 2 additions & 2 deletions scripts/tools/zap/tests/inputs/all-clusters-app.zap
Original file line number Diff line number Diff line change
@@ -14053,7 +14053,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -14239,7 +14239,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Original file line number Diff line number Diff line change
@@ -884,7 +884,7 @@
{ ZAP_SIMPLE_DEFAULT(255), 0x00000005, 1, ZAP_TYPE(INT8U), \
ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */ \
{ ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
{ ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
{ ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Door Lock (server) */ \
{ ZAP_SIMPLE_DEFAULT(2), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LockState */ \
Original file line number Diff line number Diff line change
@@ -37,6 +37,9 @@ limitations under the License.
<define>MODE_SELECT_CLUSTER</define>
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>

<globalAttribute side="either" code="0xFFFD" value="2"/>

<description>Attributes and commands for selecting a mode from a list of supported options.</description>
<!-- Base data types -->
<attribute side="server" code="0x0000" define="MODE_DESCRIPTION" type="CHAR_STRING" length="64" writable="false" optional="false" isNullable="false">Description</attribute>
4 changes: 2 additions & 2 deletions src/controller/data_model/controller-clusters.zap
Original file line number Diff line number Diff line change
@@ -10532,7 +10532,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -10734,7 +10734,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,

0 comments on commit 5405890

Please sign in to comment.