Skip to content

Commit a5d02de

Browse files
plauricshripad621git
plauric
authored and
shripad621git
committed
Mode-derived clusters: rev update (XMLs + TC 1.1) (project-chip#29964)
* add changes * add Commands.h changes generated by regen * update zap files and fix XML indenting issue * add matter files * add missing chef matter file
1 parent 943f137 commit a5d02de

16 files changed

+36
-30
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+5-5
Original file line numberDiff line numberDiff line change
@@ -5886,7 +5886,7 @@ endpoint 1 {
58865886
callback attribute acceptedCommandList;
58875887
callback attribute attributeList;
58885888
callback attribute featureMap default = 0;
5889-
ram attribute clusterRevision default = 1;
5889+
ram attribute clusterRevision default = 2;
58905890

58915891
handle command ChangeToMode;
58925892
handle command ChangeToModeResponse;
@@ -5901,7 +5901,7 @@ endpoint 1 {
59015901
callback attribute acceptedCommandList;
59025902
callback attribute attributeList;
59035903
callback attribute featureMap default = 0;
5904-
ram attribute clusterRevision default = 1;
5904+
ram attribute clusterRevision default = 2;
59055905

59065906
handle command ChangeToMode;
59075907
handle command ChangeToModeResponse;
@@ -5928,7 +5928,7 @@ endpoint 1 {
59285928
callback attribute acceptedCommandList;
59295929
callback attribute attributeList;
59305930
callback attribute featureMap default = 0;
5931-
ram attribute clusterRevision default = 1;
5931+
ram attribute clusterRevision default = 2;
59325932

59335933
handle command ChangeToMode;
59345934
handle command ChangeToModeResponse;
@@ -5942,7 +5942,7 @@ endpoint 1 {
59425942
callback attribute acceptedCommandList;
59435943
callback attribute attributeList;
59445944
callback attribute featureMap default = 0;
5945-
ram attribute clusterRevision default = 1;
5945+
ram attribute clusterRevision default = 2;
59465946

59475947
handle command ChangeToMode;
59485948
handle command ChangeToModeResponse;
@@ -5981,7 +5981,7 @@ endpoint 1 {
59815981
callback attribute acceptedCommandList;
59825982
callback attribute attributeList;
59835983
callback attribute featureMap default = 0;
5984-
ram attribute clusterRevision default = 1;
5984+
ram attribute clusterRevision default = 2;
59855985

59865986
handle command ChangeToMode;
59875987
handle command ChangeToModeResponse;

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+5-5
Original file line numberDiff line numberDiff line change
@@ -9018,7 +9018,7 @@
90189018
"storageOption": "RAM",
90199019
"singleton": 0,
90209020
"bounded": 0,
9021-
"defaultValue": "1",
9021+
"defaultValue": "2",
90229022
"reportable": 1,
90239023
"minInterval": 1,
90249024
"maxInterval": 65534,
@@ -9190,7 +9190,7 @@
91909190
"storageOption": "RAM",
91919191
"singleton": 0,
91929192
"bounded": 0,
9193-
"defaultValue": "1",
9193+
"defaultValue": "2",
91949194
"reportable": 1,
91959195
"minInterval": 1,
91969196
"maxInterval": 65534,
@@ -9516,7 +9516,7 @@
95169516
"storageOption": "RAM",
95179517
"singleton": 0,
95189518
"bounded": 0,
9519-
"defaultValue": "1",
9519+
"defaultValue": "2",
95209520
"reportable": 1,
95219521
"minInterval": 1,
95229522
"maxInterval": 65534,
@@ -9672,7 +9672,7 @@
96729672
"storageOption": "RAM",
96739673
"singleton": 0,
96749674
"bounded": 0,
9675-
"defaultValue": "1",
9675+
"defaultValue": "2",
96769676
"reportable": 1,
96779677
"minInterval": 1,
96789678
"maxInterval": 65534,
@@ -10123,7 +10123,7 @@
1012310123
"storageOption": "RAM",
1012410124
"singleton": 0,
1012510125
"bounded": 0,
10126-
"defaultValue": "1",
10126+
"defaultValue": "2",
1012710127
"reportable": 1,
1012810128
"minInterval": 1,
1012910129
"maxInterval": 65534,

‎examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,7 @@ endpoint 1 {
12861286
callback attribute eventList;
12871287
callback attribute attributeList;
12881288
callback attribute featureMap default = 0;
1289-
ram attribute clusterRevision default = 1;
1289+
ram attribute clusterRevision default = 2;
12901290

12911291
handle command ChangeToMode;
12921292
handle command ChangeToModeResponse;
@@ -1301,7 +1301,7 @@ endpoint 1 {
13011301
callback attribute eventList;
13021302
callback attribute attributeList;
13031303
callback attribute featureMap default = 0;
1304-
ram attribute clusterRevision default = 1;
1304+
ram attribute clusterRevision default = 2;
13051305

13061306
handle command ChangeToMode;
13071307
handle command ChangeToModeResponse;

‎examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap

+4-3
Original file line numberDiff line numberDiff line change
@@ -2593,7 +2593,7 @@
25932593
"storageOption": "RAM",
25942594
"singleton": 0,
25952595
"bounded": 0,
2596-
"defaultValue": "1",
2596+
"defaultValue": "2",
25972597
"reportable": 1,
25982598
"minInterval": 1,
25992599
"maxInterval": 65534,
@@ -2765,7 +2765,7 @@
27652765
"storageOption": "RAM",
27662766
"singleton": 0,
27672767
"bounded": 0,
2768-
"defaultValue": "1",
2768+
"defaultValue": "2",
27692769
"reportable": 1,
27702770
"minInterval": 1,
27712771
"maxInterval": 65534,
@@ -3035,5 +3035,6 @@
30353035
"endpointId": 1,
30363036
"networkId": 0
30373037
}
3038-
]
3038+
],
3039+
"log": []
30393040
}

‎examples/rvc-app/rvc-common/rvc-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,7 @@ endpoint 1 {
11921192
callback attribute eventList;
11931193
callback attribute attributeList;
11941194
callback attribute featureMap default = 0;
1195-
ram attribute clusterRevision default = 1;
1195+
ram attribute clusterRevision default = 2;
11961196

11971197
handle command ChangeToMode;
11981198
handle command ChangeToModeResponse;
@@ -1206,7 +1206,7 @@ endpoint 1 {
12061206
callback attribute eventList;
12071207
callback attribute attributeList;
12081208
callback attribute featureMap default = 0;
1209-
ram attribute clusterRevision default = 1;
1209+
ram attribute clusterRevision default = 2;
12101210

12111211
handle command ChangeToMode;
12121212
handle command ChangeToModeResponse;

‎examples/rvc-app/rvc-common/rvc-app.zap

+4-3
Original file line numberDiff line numberDiff line change
@@ -2373,7 +2373,7 @@
23732373
"storageOption": "RAM",
23742374
"singleton": 0,
23752375
"bounded": 0,
2376-
"defaultValue": "1",
2376+
"defaultValue": "2",
23772377
"reportable": 1,
23782378
"minInterval": 1,
23792379
"maxInterval": 65534,
@@ -2529,7 +2529,7 @@
25292529
"storageOption": "RAM",
25302530
"singleton": 0,
25312531
"bounded": 0,
2532-
"defaultValue": "1",
2532+
"defaultValue": "2",
25332533
"reportable": 1,
25342534
"minInterval": 1,
25352535
"maxInterval": 65534,
@@ -2783,5 +2783,6 @@
27832783
"endpointId": 1,
27842784
"networkId": 0
27852785
}
2786-
]
2786+
],
2787+
"log": []
27872788
}

‎src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ tests:
3535
verification: |
3636
./chip-tool dishwashermode read cluster-revision 1 1
3737
38-
Verify the "ClusterRevision" value is of unit16 and reflects the highest revision number 1 on the TH(Chip-tool) and below is the sample log provided for the raspi platform:
38+
Verify the "ClusterRevision" value is of unit16 and reflects the highest revision number (2) on the TH(Chip-tool) and below is the sample log provided for the raspi platform:
3939
4040
[1690365584.246794][27436:27438] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0059 Attribute 0x0000_FFFD DataVersion: 1130015440
41-
[1690365584.246860][27436:27438] CHIP:TOO: ClusterRevision: 1
41+
[1690365584.246860][27436:27438] CHIP:TOO: ClusterRevision: 2
4242
disabled: true
4343

4444
- label: "Step 3: TH reads from the DUT the FeatureMap attribute."

‎src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tests:
3535
command: "readAttribute"
3636
attribute: "ClusterRevision"
3737
response:
38-
value: 1
38+
value: 2
3939
constraints:
4040
type: int16u
4141

‎src/app/tests/suites/certification/Test_TC_RVCCLEANM_1_1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tests:
3535
command: "readAttribute"
3636
attribute: "ClusterRevision"
3737
response:
38-
value: 1
38+
value: 2
3939
constraints:
4040
type: int16u
4141

‎src/app/tests/suites/certification/Test_TC_RVCRUNM_1_1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tests:
3535
command: "readAttribute"
3636
attribute: "ClusterRevision"
3737
response:
38-
value: 1
38+
value: 2
3939
constraints:
4040
type: int16u
4141

‎src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tests:
3535
command: "readAttribute"
3636
attribute: "ClusterRevision"
3737
response:
38-
value: 1
38+
value: 2
3939
constraints:
4040
type: int16u
4141

‎src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ limitations under the License.
3333
<client init="false" tick="false">true</client>
3434
<server init="false" tick="false">true</server>
3535
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
36+
<globalAttribute side="either" code="0xFFFD" value="2"/>
3637
<!-- Base data types -->
3738
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
3839
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>

‎src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ limitations under the License.
3131
<client init="false" tick="false">true</client>
3232
<server init="false" tick="false">true</server>
3333
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
34+
<globalAttribute side="either" code="0xFFFD" value="2"/>
3435
<!-- Base data types -->
3536
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
3637
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>

‎src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ limitations under the License.
3737
<client init="false" tick="false">true</client>
3838
<server init="false" tick="false">true</server>
3939
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
40+
<globalAttribute side="either" code="0xFFFD" value="2"/>
4041
<!-- Base data types -->
4142
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
4243
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>

‎src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ limitations under the License.
4343
<client init="false" tick="false">true</client>
4444
<server init="false" tick="false">true</server>
4545
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
46+
<globalAttribute side="either" code="0xFFFD" value="2"/>
4647
<!-- Base data types -->
4748
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
4849
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>

‎zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)