Skip to content

Commit 276036f

Browse files
tcarmelveilleuxrestyled-commits
authored and
j-ororke
committed
Fix TC-SWTCH-1.1 (project-chip#34642)
* Fix TC-SWTCH-1.1 - Cluster revision 2 was not properly checked - Fixed all samples to have latest switch cluster revision - Validated different configurations of the switch cluster - Updated PICS files for CI Fixes project-chip#34201 Testing done: - Updated TC-SWTCH-1.1, still passes in different configs. * Restyled by prettier-yaml * Remove old TC-SWTCH-2.2 * Restyled by prettier-json * Fix PICS.yaml --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 3b4f374 commit 276036f

24 files changed

+89
-1536
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8097,7 +8097,7 @@ endpoint 1 {
80978097
ram attribute numberOfPositions default = 2;
80988098
ram attribute currentPosition;
80998099
ram attribute featureMap default = 1;
8100-
ram attribute clusterRevision default = 1;
8100+
ram attribute clusterRevision default = 2;
81018101
}
81028102

81038103
server cluster FixedLabel {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -8029,7 +8029,7 @@
80298029
"storageOption": "RAM",
80308030
"singleton": 0,
80318031
"bounded": 0,
8032-
"defaultValue": "1",
8032+
"defaultValue": "2",
80338033
"reportable": 1,
80348034
"minInterval": 0,
80358035
"maxInterval": 65344,
@@ -26135,4 +26135,4 @@
2613526135
"parentEndpointIdentifier": null
2613626136
}
2613726137
]
26138-
}
26138+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6467,7 +6467,7 @@ endpoint 1 {
64676467
ram attribute numberOfPositions default = 2;
64686468
ram attribute currentPosition;
64696469
ram attribute featureMap default = 1;
6470-
ram attribute clusterRevision default = 1;
6470+
ram attribute clusterRevision default = 2;
64716471
}
64726472

64736473
server cluster FixedLabel {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5593,7 +5593,7 @@
55935593
"storageOption": "RAM",
55945594
"singleton": 0,
55955595
"bounded": 0,
5596-
"defaultValue": "1",
5596+
"defaultValue": "2",
55975597
"reportable": 1,
55985598
"minInterval": 0,
55995599
"maxInterval": 65344,
@@ -12408,4 +12408,4 @@
1240812408
"parentEndpointIdentifier": null
1240912409
}
1241012410
]
12411-
}
12411+
}

‎examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1585,7 +1585,7 @@ endpoint 1 {
15851585
callback attribute eventList;
15861586
callback attribute attributeList;
15871587
ram attribute featureMap default = 0xE;
1588-
ram attribute clusterRevision default = 1;
1588+
ram attribute clusterRevision default = 2;
15891589
}
15901590
}
15911591

‎examples/chef/devices/rootnode_genericswitch_2dfff6e516.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -2742,7 +2742,7 @@
27422742
"storageOption": "RAM",
27432743
"singleton": 0,
27442744
"bounded": 0,
2745-
"defaultValue": "1",
2745+
"defaultValue": "2",
27462746
"reportable": 1,
27472747
"minInterval": 1,
27482748
"maxInterval": 65534,
@@ -2801,4 +2801,4 @@
28012801
"parentEndpointIdentifier": null
28022802
}
28032803
]
2804-
}
2804+
}

‎examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@ endpoint 1 {
15821582
callback attribute eventList;
15831583
callback attribute attributeList;
15841584
ram attribute featureMap default = 1;
1585-
ram attribute clusterRevision default = 1;
1585+
ram attribute clusterRevision default = 2;
15861586
}
15871587
}
15881588

‎examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -2742,7 +2742,7 @@
27422742
"storageOption": "RAM",
27432743
"singleton": 0,
27442744
"bounded": 0,
2745-
"defaultValue": "1",
2745+
"defaultValue": "2",
27462746
"reportable": 1,
27472747
"minInterval": 1,
27482748
"maxInterval": 65534,
@@ -2780,4 +2780,4 @@
27802780
"parentEndpointIdentifier": null
27812781
}
27822782
]
2783-
}
2783+
}

‎examples/light-switch-app/light-switch-common/light-switch-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -3072,7 +3072,7 @@ endpoint 2 {
30723072
callback attribute acceptedCommandList;
30733073
callback attribute attributeList;
30743074
ram attribute featureMap default = 2;
3075-
ram attribute clusterRevision default = 1;
3075+
ram attribute clusterRevision default = 2;
30763076
}
30773077
}
30783078

‎examples/light-switch-app/light-switch-common/light-switch-app.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -5857,7 +5857,7 @@
58575857
"storageOption": "RAM",
58585858
"singleton": 0,
58595859
"bounded": 0,
5860-
"defaultValue": "1",
5860+
"defaultValue": "2",
58615861
"reportable": 1,
58625862
"minInterval": 1,
58635863
"maxInterval": 65534,
@@ -5903,4 +5903,4 @@
59035903
"parentEndpointIdentifier": null
59045904
}
59055905
]
5906-
}
5906+
}

‎examples/light-switch-app/qpg/zap/switch.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -3156,7 +3156,7 @@ endpoint 2 {
31563156
callback attribute eventList;
31573157
callback attribute attributeList;
31583158
ram attribute featureMap default = 30;
3159-
ram attribute clusterRevision default = 1;
3159+
ram attribute clusterRevision default = 2;
31603160
}
31613161
}
31623162

‎examples/light-switch-app/qpg/zap/switch.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -6488,7 +6488,7 @@
64886488
"storageOption": "RAM",
64896489
"singleton": 0,
64906490
"bounded": 0,
6491-
"defaultValue": "1",
6491+
"defaultValue": "2",
64926492
"reportable": 1,
64936493
"minInterval": 1,
64946494
"maxInterval": 65534,
@@ -6569,4 +6569,4 @@
65696569
"parentEndpointIdentifier": null
65706570
}
65716571
]
6572-
}
6572+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2749,7 +2749,7 @@ endpoint 0 {
27492749
ram attribute numberOfPositions default = 2;
27502750
ram attribute currentPosition;
27512751
ram attribute featureMap default = 0;
2752-
ram attribute clusterRevision default = 1;
2752+
ram attribute clusterRevision default = 2;
27532753
}
27542754

27552755
server cluster AdministratorCommissioning {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3524,7 +3524,7 @@
35243524
"storageOption": "RAM",
35253525
"singleton": 0,
35263526
"bounded": 0,
3527-
"defaultValue": "1",
3527+
"defaultValue": "2",
35283528
"reportable": 1,
35293529
"minInterval": 1,
35303530
"maxInterval": 65534,
@@ -5932,4 +5932,4 @@
59325932
"parentEndpointIdentifier": null
59335933
}
59345934
]
5935-
}
5935+
}

‎examples/placeholder/linux/apps/app1/config.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -8653,7 +8653,7 @@ endpoint 0 {
86538653
callback attribute acceptedCommandList;
86548654
callback attribute attributeList;
86558655
ram attribute featureMap default = 0;
8656-
ram attribute clusterRevision default = 1;
8656+
ram attribute clusterRevision default = 2;
86578657
}
86588658

86598659
server cluster AdministratorCommissioning {

‎examples/placeholder/linux/apps/app1/config.zap

+3-3
Original file line numberDiff line numberDiff line change
@@ -4890,7 +4890,7 @@
48904890
"storageOption": "RAM",
48914891
"singleton": 0,
48924892
"bounded": 0,
4893-
"defaultValue": "1",
4893+
"defaultValue": "2",
48944894
"reportable": 1,
48954895
"minInterval": 1,
48964896
"maxInterval": 65534,
@@ -5028,7 +5028,7 @@
50285028
"storageOption": "RAM",
50295029
"singleton": 0,
50305030
"bounded": 0,
5031-
"defaultValue": "1",
5031+
"defaultValue": "2",
50325032
"reportable": 1,
50335033
"minInterval": 1,
50345034
"maxInterval": 65534,
@@ -15129,4 +15129,4 @@
1512915129
"parentEndpointIdentifier": null
1513015130
}
1513115131
]
15132-
}
15132+
}

‎examples/placeholder/linux/apps/app2/config.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -8611,7 +8611,7 @@ endpoint 0 {
86118611
callback attribute acceptedCommandList;
86128612
callback attribute attributeList;
86138613
ram attribute featureMap default = 0;
8614-
ram attribute clusterRevision default = 1;
8614+
ram attribute clusterRevision default = 2;
86158615
}
86168616

86178617
server cluster AdministratorCommissioning {

‎examples/placeholder/linux/apps/app2/config.zap

+3-3
Original file line numberDiff line numberDiff line change
@@ -4906,7 +4906,7 @@
49064906
"storageOption": "RAM",
49074907
"singleton": 0,
49084908
"bounded": 0,
4909-
"defaultValue": "1",
4909+
"defaultValue": "2",
49104910
"reportable": 1,
49114911
"minInterval": 1,
49124912
"maxInterval": 65534,
@@ -5044,7 +5044,7 @@
50445044
"storageOption": "RAM",
50455045
"singleton": 0,
50465046
"bounded": 0,
5047-
"defaultValue": "1",
5047+
"defaultValue": "2",
50485048
"reportable": 1,
50495049
"minInterval": 1,
50505050
"maxInterval": 65534,
@@ -14889,4 +14889,4 @@
1488914889
"parentEndpointIdentifier": null
1489014890
}
1489114891
]
14892-
}
14892+
}

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

+8-5
Original file line numberDiff line numberDiff line change
@@ -6143,21 +6143,24 @@ PICS:
61436143
#
61446144
# server / features
61456145
#
6146-
- label: "Does the device represent a Latching Switch?"
6146+
- label: "Does the device represent a Latching Switch (LS)?"
61476147
id: SWTCH.S.F00
61486148

6149-
- label: "Does the device represent a Momentary Switch?"
6149+
- label: "Does the device represent a Momentary Switch (MS)?"
61506150
id: SWTCH.S.F01
61516151

6152-
- label: "Does the MS device support Momentary Switch Release?"
6152+
- label: "Does the MS device support Momentary Switch Release (MSR)?"
61536153
id: SWTCH.S.F02
61546154

6155-
- label: "Does the MS device support Momentary Switch LongPress?"
6155+
- label: "Does the MS device support Momentary Switch LongPress (MSL)?"
61566156
id: SWTCH.S.F03
61576157

6158-
- label: "Does the MS device support Momentary Switch MultiPress?"
6158+
- label: "Does the MS device support Momentary Switch MultiPress (MSM)?"
61596159
id: SWTCH.S.F04
61606160

6161+
- label: "Does the device support ActionSwitch feature (AS)?"
6162+
id: SWTCH.S.F05
6163+
61616164
#
61626165
# client / features
61636166
#

0 commit comments

Comments
 (0)