Skip to content

Commit fdacd16

Browse files
tcarmelveilleuxrestyled-commits
tcarmelveilleux
and
restyled-commits
authored
Bump some cluster revisions in examples (#38905)
* Update General Commissioning Version in XML * ZAP regen * Restyled by clang-format * Remove invalid constraints from matter-devices.xml * Bump RootNode/Aggregator/Dishwasher dev type revs and regen * Made ClusterRevision External on General Commissioning * Fix TestDescriptorCluster --------- Co-authored-by: Restyled.io <[email protected]>
1 parent ebe16b7 commit fdacd16

File tree

248 files changed

+929
-927
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+929
-927
lines changed

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
822822

823823
/** This cluster is used to manage global aspects of the Commissioning flow. */
824824
cluster GeneralCommissioning = 48 {
825-
revision 1; // NOTE: Default/not specifically set
825+
revision 2;
826826

827827
enum CommissioningErrorEnum : enum8 {
828828
kOK = 0 [spec_name = "OK"];
@@ -2695,7 +2695,7 @@ cluster RadonConcentrationMeasurement = 1071 {
26952695
}
26962696

26972697
endpoint 0 {
2698-
device type ma_rootdevice = 22, version 1;
2698+
device type ma_rootdevice = 22, version 3;
26992699

27002700
binding cluster OtaSoftwareUpdateProvider;
27012701

@@ -2772,7 +2772,7 @@ endpoint 0 {
27722772
callback attribute locationCapability;
27732773
callback attribute supportsConcurrentConnection;
27742774
ram attribute featureMap default = 0;
2775-
ram attribute clusterRevision default = 0x0001;
2775+
callback attribute clusterRevision default = 0x0001;
27762776

27772777
handle command ArmFailSafe;
27782778
handle command ArmFailSafeResponse;
@@ -2896,7 +2896,7 @@ endpoint 1 {
28962896
callback attribute acceptedCommandList;
28972897
callback attribute attributeList;
28982898
ram attribute featureMap default = 0;
2899-
ram attribute clusterRevision default = 6;
2899+
ram attribute clusterRevision default = 0x0005;
29002900

29012901
handle command Identify;
29022902
handle command TriggerEffect;
@@ -2992,7 +2992,7 @@ endpoint 2 {
29922992
callback attribute acceptedCommandList;
29932993
callback attribute attributeList;
29942994
ram attribute featureMap default = 0;
2995-
ram attribute clusterRevision default = 6;
2995+
ram attribute clusterRevision default = 0x0005;
29962996

29972997
handle command Identify;
29982998
}
@@ -3219,7 +3219,7 @@ endpoint 3 {
32193219
callback attribute acceptedCommandList;
32203220
callback attribute attributeList;
32213221
ram attribute featureMap default = 0;
3222-
ram attribute clusterRevision default = 6;
3222+
ram attribute clusterRevision default = 0x0005;
32233223

32243224
handle command Identify;
32253225
handle command TriggerEffect;
@@ -3260,7 +3260,7 @@ endpoint 4 {
32603260
callback attribute acceptedCommandList;
32613261
callback attribute attributeList;
32623262
ram attribute featureMap default = 0;
3263-
ram attribute clusterRevision default = 6;
3263+
ram attribute clusterRevision default = 0x0005;
32643264

32653265
handle command Identify;
32663266
handle command TriggerEffect;
@@ -3301,7 +3301,7 @@ endpoint 5 {
33013301
callback attribute acceptedCommandList;
33023302
callback attribute attributeList;
33033303
ram attribute featureMap default = 0;
3304-
ram attribute clusterRevision default = 6;
3304+
ram attribute clusterRevision default = 0x0005;
33053305

33063306
handle command Identify;
33073307
handle command TriggerEffect;

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.zap

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
}
5555
],
5656
"deviceVersions": [
57-
1
57+
3
5858
],
5959
"deviceIdentifiers": [
6060
22
@@ -1090,7 +1090,7 @@
10901090
"side": "server",
10911091
"type": "int16u",
10921092
"included": 1,
1093-
"storageOption": "RAM",
1093+
"storageOption": "External",
10941094
"singleton": 0,
10951095
"bounded": 0,
10961096
"defaultValue": "0x0001",
@@ -2305,7 +2305,7 @@
23052305
"storageOption": "RAM",
23062306
"singleton": 0,
23072307
"bounded": 0,
2308-
"defaultValue": "6",
2308+
"defaultValue": "0x0005",
23092309
"reportable": 1,
23102310
"minInterval": 1,
23112311
"maxInterval": 65534,
@@ -3438,7 +3438,7 @@
34383438
"storageOption": "RAM",
34393439
"singleton": 0,
34403440
"bounded": 0,
3441-
"defaultValue": "6",
3441+
"defaultValue": "0x0005",
34423442
"reportable": 1,
34433443
"minInterval": 1,
34443444
"maxInterval": 65534,
@@ -6529,7 +6529,7 @@
65296529
"storageOption": "RAM",
65306530
"singleton": 0,
65316531
"bounded": 0,
6532-
"defaultValue": "6",
6532+
"defaultValue": "0x0005",
65336533
"reportable": 1,
65346534
"minInterval": 1,
65356535
"maxInterval": 65534,
@@ -7008,7 +7008,7 @@
70087008
"storageOption": "RAM",
70097009
"singleton": 0,
70107010
"bounded": 0,
7011-
"defaultValue": "6",
7011+
"defaultValue": "0x0005",
70127012
"reportable": 1,
70137013
"minInterval": 1,
70147014
"maxInterval": 65534,
@@ -7487,7 +7487,7 @@
74877487
"storageOption": "RAM",
74887488
"singleton": 0,
74897489
"bounded": 0,
7490-
"defaultValue": "6",
7490+
"defaultValue": "0x0005",
74917491
"reportable": 1,
74927492
"minInterval": 1,
74937493
"maxInterval": 65534,

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
751751

752752
/** This cluster is used to manage global aspects of the Commissioning flow. */
753753
cluster GeneralCommissioning = 48 {
754-
revision 1; // NOTE: Default/not specifically set
754+
revision 2;
755755

756756
enum CommissioningErrorEnum : enum8 {
757757
kOK = 0 [spec_name = "OK"];
@@ -2363,7 +2363,7 @@ cluster RadonConcentrationMeasurement = 1071 {
23632363
}
23642364

23652365
endpoint 0 {
2366-
device type ma_rootdevice = 22, version 1;
2366+
device type ma_rootdevice = 22, version 3;
23672367

23682368
binding cluster OtaSoftwareUpdateProvider;
23692369

@@ -2440,7 +2440,7 @@ endpoint 0 {
24402440
callback attribute locationCapability;
24412441
callback attribute supportsConcurrentConnection;
24422442
ram attribute featureMap default = 0;
2443-
ram attribute clusterRevision default = 1;
2443+
callback attribute clusterRevision default = 1;
24442444

24452445
handle command ArmFailSafe;
24462446
handle command ArmFailSafeResponse;
@@ -2678,7 +2678,7 @@ endpoint 1 {
26782678
callback attribute acceptedCommandList;
26792679
callback attribute attributeList;
26802680
ram attribute featureMap default = 0;
2681-
ram attribute clusterRevision default = 6;
2681+
ram attribute clusterRevision default = 0x0005;
26822682

26832683
handle command Identify;
26842684
}

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
}
5555
],
5656
"deviceVersions": [
57-
1
57+
3
5858
],
5959
"deviceIdentifiers": [
6060
22
@@ -1090,7 +1090,7 @@
10901090
"side": "server",
10911091
"type": "int16u",
10921092
"included": 1,
1093-
"storageOption": "RAM",
1093+
"storageOption": "External",
10941094
"singleton": 0,
10951095
"bounded": 0,
10961096
"defaultValue": "1",
@@ -3908,7 +3908,7 @@
39083908
"storageOption": "RAM",
39093909
"singleton": 0,
39103910
"bounded": 0,
3911-
"defaultValue": "6",
3911+
"defaultValue": "0x0005",
39123912
"reportable": 1,
39133913
"minInterval": 1,
39143914
"maxInterval": 65534,

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1644,7 +1644,7 @@ cluster PowerSource = 47 {
16441644

16451645
/** This cluster is used to manage global aspects of the Commissioning flow. */
16461646
cluster GeneralCommissioning = 48 {
1647-
revision 1; // NOTE: Default/not specifically set
1647+
revision 2;
16481648

16491649
enum CommissioningErrorEnum : enum8 {
16501650
kOK = 0 [spec_name = "OK"];
@@ -7958,7 +7958,7 @@ internal cluster FaultInjection = 4294048774 {
79587958
}
79597959

79607960
endpoint 0 {
7961-
device type ma_rootdevice = 22, version 1;
7961+
device type ma_rootdevice = 22, version 3;
79627962
device type ma_powersource = 17, version 1;
79637963

79647964
binding cluster OtaSoftwareUpdateProvider;
@@ -8124,7 +8124,7 @@ endpoint 0 {
81248124
callback attribute acceptedCommandList;
81258125
callback attribute attributeList;
81268126
ram attribute featureMap default = 0;
8127-
ram attribute clusterRevision default = 1;
8127+
callback attribute clusterRevision default = 1;
81288128

81298129
handle command ArmFailSafe;
81308130
handle command ArmFailSafeResponse;
@@ -8462,7 +8462,7 @@ endpoint 1 {
84628462
callback attribute acceptedCommandList;
84638463
callback attribute attributeList;
84648464
ram attribute featureMap default = 0;
8465-
ram attribute clusterRevision default = 6;
8465+
ram attribute clusterRevision default = 0x0005;
84668466

84678467
handle command Identify;
84688468
handle command TriggerEffect;
@@ -9889,7 +9889,7 @@ endpoint 2 {
98899889
callback attribute acceptedCommandList;
98909890
callback attribute attributeList;
98919891
ram attribute featureMap default = 0;
9892-
ram attribute clusterRevision default = 6;
9892+
ram attribute clusterRevision default = 0x0005;
98939893

98949894
handle command Identify;
98959895
handle command TriggerEffect;
@@ -10011,7 +10011,7 @@ endpoint 3 {
1001110011
callback attribute acceptedCommandList;
1001210012
callback attribute attributeList;
1001310013
ram attribute featureMap default = 0;
10014-
ram attribute clusterRevision default = 6;
10014+
ram attribute clusterRevision default = 0x0005;
1001510015

1001610016
handle command Identify;
1001710017
handle command TriggerEffect;
@@ -10053,7 +10053,7 @@ endpoint 4 {
1005310053
callback attribute acceptedCommandList;
1005410054
callback attribute attributeList;
1005510055
ram attribute featureMap default = 0;
10056-
ram attribute clusterRevision default = 6;
10056+
ram attribute clusterRevision default = 0x0005;
1005710057
}
1005810058

1005910059
server cluster Descriptor {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
],
6363
"deviceVersions": [
6464
1,
65-
1
65+
3
6666
],
6767
"deviceIdentifiers": [
6868
17,
@@ -2139,7 +2139,7 @@
21392139
"side": "server",
21402140
"type": "int16u",
21412141
"included": 1,
2142-
"storageOption": "RAM",
2142+
"storageOption": "External",
21432143
"singleton": 0,
21442144
"bounded": 0,
21452145
"defaultValue": "1",
@@ -6100,7 +6100,7 @@
61006100
"storageOption": "RAM",
61016101
"singleton": 0,
61026102
"bounded": 0,
6103-
"defaultValue": "6",
6103+
"defaultValue": "0x0005",
61046104
"reportable": 1,
61056105
"minInterval": 0,
61066106
"maxInterval": 65344,
@@ -23672,7 +23672,7 @@
2367223672
"storageOption": "RAM",
2367323673
"singleton": 0,
2367423674
"bounded": 0,
23675-
"defaultValue": "6",
23675+
"defaultValue": "0x0005",
2367623676
"reportable": 1,
2367723677
"minInterval": 0,
2367823678
"maxInterval": 65344,
@@ -25006,7 +25006,7 @@
2500625006
"storageOption": "RAM",
2500725007
"singleton": 0,
2500825008
"bounded": 0,
25009-
"defaultValue": "6",
25009+
"defaultValue": "0x0005",
2501025010
"reportable": 1,
2501125011
"minInterval": 0,
2501225012
"maxInterval": 65344,
@@ -25449,7 +25449,7 @@
2544925449
"storageOption": "RAM",
2545025450
"singleton": 0,
2545125451
"bounded": 0,
25452-
"defaultValue": "6",
25452+
"defaultValue": "0x0005",
2545325453
"reportable": 1,
2545425454
"minInterval": 0,
2545525455
"maxInterval": 65344,

‎examples/all-clusters-app/realtek_bee/data_model/all-clusters-app.matter

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1644,7 +1644,7 @@ cluster PowerSource = 47 {
16441644

16451645
/** This cluster is used to manage global aspects of the Commissioning flow. */
16461646
cluster GeneralCommissioning = 48 {
1647-
revision 1; // NOTE: Default/not specifically set
1647+
revision 2;
16481648

16491649
enum CommissioningErrorEnum : enum8 {
16501650
kOK = 0 [spec_name = "OK"];
@@ -7620,7 +7620,7 @@ internal cluster FaultInjection = 4294048774 {
76207620
}
76217621

76227622
endpoint 0 {
7623-
device type ma_rootdevice = 22, version 1;
7623+
device type ma_rootdevice = 22, version 3;
76247624
device type ma_powersource = 17, version 1;
76257625

76267626
binding cluster OtaSoftwareUpdateProvider;
@@ -7785,7 +7785,7 @@ endpoint 0 {
77857785
callback attribute acceptedCommandList;
77867786
callback attribute attributeList;
77877787
ram attribute featureMap default = 0;
7788-
ram attribute clusterRevision default = 1;
7788+
callback attribute clusterRevision default = 1;
77897789

77907790
handle command ArmFailSafe;
77917791
handle command ArmFailSafeResponse;
@@ -8133,7 +8133,7 @@ endpoint 1 {
81338133
callback attribute acceptedCommandList;
81348134
callback attribute attributeList;
81358135
ram attribute featureMap default = 0;
8136-
ram attribute clusterRevision default = 4;
8136+
ram attribute clusterRevision default = 0x0005;
81378137

81388138
handle command Identify;
81398139
handle command TriggerEffect;
@@ -9474,7 +9474,7 @@ endpoint 2 {
94749474
callback attribute acceptedCommandList;
94759475
callback attribute attributeList;
94769476
ram attribute featureMap default = 0;
9477-
ram attribute clusterRevision default = 4;
9477+
ram attribute clusterRevision default = 0x0005;
94789478

94799479
handle command Identify;
94809480
handle command TriggerEffect;
@@ -9596,7 +9596,7 @@ endpoint 3 {
95969596
callback attribute acceptedCommandList;
95979597
callback attribute attributeList;
95989598
ram attribute featureMap default = 0;
9599-
ram attribute clusterRevision default = 4;
9599+
ram attribute clusterRevision default = 0x0005;
96009600

96019601
handle command Identify;
96029602
handle command TriggerEffect;
@@ -9638,7 +9638,7 @@ endpoint 4 {
96389638
callback attribute acceptedCommandList;
96399639
callback attribute attributeList;
96409640
ram attribute featureMap default = 0;
9641-
ram attribute clusterRevision default = 4;
9641+
ram attribute clusterRevision default = 0x0005;
96429642
}
96439643

96449644
server cluster Descriptor {

0 commit comments

Comments
 (0)