Skip to content

Commit a3f84d5

Browse files
mkardous-silabsmkardous-silabs
committed
fix zap file
1 parent f69f96c commit a3f84d5

File tree

4 files changed

+63
-42
lines changed

4 files changed

+63
-42
lines changed

‎examples/multi-sensor-app/silabs/data_model/multi-sensor-thread-app.matter

+33-25
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,7 @@ cluster GeneralCommissioning = 48 {
800800
provisional readonly attribute access(read: administer) optional int16u TCMinRequiredVersion = 6;
801801
provisional readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
802802
provisional readonly attribute access(read: administer) optional boolean TCAcknowledgementsRequired = 8;
803+
provisional readonly attribute access(read: administer) optional nullable int32u TCUpdateDeadline = 9;
803804
readonly attribute command_id generatedCommandList[] = 65528;
804805
readonly attribute command_id acceptedCommandList[] = 65529;
805806
readonly attribute event_id eventList[] = 65530;
@@ -1160,7 +1161,7 @@ cluster GeneralDiagnostics = 51 {
11601161
/** Take a snapshot of system time and epoch time. */
11611162
command TimeSnapshot(): TimeSnapshotResponse = 1;
11621163
/** Request a variable length payload response. */
1163-
command PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
1164+
command access(invoke: manage) PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
11641165
}
11651166

11661167
/** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
@@ -1444,12 +1445,14 @@ cluster OperationalCredentials = 62 {
14441445
fabric_id fabricID = 3;
14451446
node_id nodeID = 4;
14461447
char_string<32> label = 5;
1448+
optional octet_string<85> vidVerificationStatement = 6;
14471449
fabric_idx fabricIndex = 254;
14481450
}
14491451

14501452
fabric_scoped struct NOCStruct {
1451-
fabric_sensitive octet_string noc = 1;
1452-
nullable fabric_sensitive octet_string icac = 2;
1453+
octet_string noc = 1;
1454+
nullable octet_string icac = 2;
1455+
optional octet_string vvsc = 3;
14531456
fabric_idx fabricIndex = 254;
14541457
}
14551458

@@ -1524,6 +1527,23 @@ cluster OperationalCredentials = 62 {
15241527
octet_string rootCACertificate = 0;
15251528
}
15261529

1530+
request struct SetVidVerificationStatementRequest {
1531+
optional vendor_id vendorID = 0;
1532+
optional octet_string vidVerificationStatement = 1;
1533+
optional octet_string vvsc = 2;
1534+
}
1535+
1536+
request struct SignVidVerificationRequestRequest {
1537+
fabric_idx fabricIndex = 0;
1538+
octet_string<32> clientChallenge = 1;
1539+
}
1540+
1541+
response struct SignVidVerificationResponse = 14 {
1542+
fabric_idx fabricIndex = 0;
1543+
int8u fabricBindingVersion = 1;
1544+
octet_string signature = 2;
1545+
}
1546+
15271547
/** Sender is requesting attestation information from the receiver. */
15281548
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
15291549
/** Sender is requesting a device attestation certificate from the receiver. */
@@ -1540,6 +1560,10 @@ cluster OperationalCredentials = 62 {
15401560
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
15411561
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
15421562
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
1563+
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
1564+
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
1565+
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
1566+
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
15431567
}
15441568

15451569
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
@@ -1711,10 +1735,10 @@ cluster IcdManagement = 70 {
17111735
readonly attribute access(read: administer) optional MonitoringRegistrationStruct registeredClients[] = 3;
17121736
readonly attribute access(read: administer) optional int32u ICDCounter = 4;
17131737
readonly attribute optional int16u clientsSupportedPerFabric = 5;
1714-
provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
1715-
provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
1716-
provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
1717-
provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
1738+
readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
1739+
readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
1740+
readonly attribute optional OperatingModeEnum operatingMode = 8;
1741+
readonly attribute optional int32u maximumCheckInBackOff = 9;
17181742
readonly attribute command_id generatedCommandList[] = 65528;
17191743
readonly attribute command_id acceptedCommandList[] = 65529;
17201744
readonly attribute event_id eventList[] = 65530;
@@ -1873,7 +1897,6 @@ endpoint 0 {
18731897
callback attribute accessControlEntriesPerFabric;
18741898
callback attribute generatedCommandList;
18751899
callback attribute acceptedCommandList;
1876-
callback attribute eventList;
18771900
callback attribute attributeList;
18781901
ram attribute featureMap default = 0;
18791902
callback attribute clusterRevision;
@@ -1940,7 +1963,6 @@ endpoint 0 {
19401963
callback attribute supportsConcurrentConnection;
19411964
callback attribute generatedCommandList;
19421965
callback attribute acceptedCommandList;
1943-
callback attribute eventList;
19441966
callback attribute attributeList;
19451967
ram attribute featureMap default = 0;
19461968
ram attribute clusterRevision default = 1;
@@ -1966,7 +1988,6 @@ endpoint 0 {
19661988
callback attribute threadVersion;
19671989
callback attribute generatedCommandList;
19681990
callback attribute acceptedCommandList;
1969-
callback attribute eventList;
19701991
callback attribute attributeList;
19711992
ram attribute featureMap default = 2;
19721993
ram attribute clusterRevision default = 1;
@@ -2083,7 +2104,6 @@ endpoint 0 {
20832104
callback attribute adminVendorId;
20842105
callback attribute generatedCommandList;
20852106
callback attribute acceptedCommandList;
2086-
callback attribute eventList;
20872107
callback attribute attributeList;
20882108
ram attribute featureMap default = 0;
20892109
ram attribute clusterRevision default = 1;
@@ -2102,7 +2122,6 @@ endpoint 0 {
21022122
callback attribute currentFabricIndex;
21032123
callback attribute generatedCommandList;
21042124
callback attribute acceptedCommandList;
2105-
callback attribute eventList;
21062125
callback attribute attributeList;
21072126
ram attribute featureMap default = 0;
21082127
ram attribute clusterRevision default = 1;
@@ -2128,7 +2147,6 @@ endpoint 0 {
21282147
callback attribute maxGroupKeysPerFabric;
21292148
callback attribute generatedCommandList;
21302149
callback attribute acceptedCommandList;
2131-
callback attribute eventList;
21322150
callback attribute attributeList;
21332151
callback attribute featureMap;
21342152
callback attribute clusterRevision;
@@ -2162,13 +2180,12 @@ endpoint 0 {
21622180
callback attribute clientsSupportedPerFabric;
21632181
ram attribute userActiveModeTriggerHint default = 0x1115;
21642182
ram attribute userActiveModeTriggerInstruction default = "Power Cycle";
2165-
ram attribute operatingMode default = 0;
2183+
callback attribute operatingMode;
21662184
callback attribute maximumCheckInBackOff;
21672185
callback attribute generatedCommandList;
21682186
callback attribute acceptedCommandList;
2169-
callback attribute eventList;
21702187
callback attribute attributeList;
2171-
ram attribute featureMap default = 7;
2188+
callback attribute featureMap;
21722189
ram attribute clusterRevision default = 3;
21732190

21742191
handle command RegisterClient;
@@ -2187,7 +2204,6 @@ endpoint 1 {
21872204
ram attribute identifyType default = 0x0;
21882205
callback attribute generatedCommandList;
21892206
callback attribute acceptedCommandList;
2190-
callback attribute eventList;
21912207
callback attribute attributeList;
21922208
ram attribute featureMap default = 0;
21932209
ram attribute clusterRevision default = 4;
@@ -2203,7 +2219,6 @@ endpoint 1 {
22032219
callback attribute partsList;
22042220
callback attribute generatedCommandList;
22052221
callback attribute acceptedCommandList;
2206-
callback attribute eventList;
22072222
callback attribute attributeList;
22082223
callback attribute featureMap;
22092224
callback attribute clusterRevision;
@@ -2215,7 +2230,6 @@ endpoint 1 {
22152230
ram attribute occupancySensorTypeBitmap default = 0x04;
22162231
callback attribute generatedCommandList;
22172232
callback attribute acceptedCommandList;
2218-
callback attribute eventList;
22192233
callback attribute attributeList;
22202234
callback attribute featureMap;
22212235
ram attribute clusterRevision default = 3;
@@ -2230,7 +2244,6 @@ endpoint 2 {
22302244
ram attribute identifyType default = 0x00;
22312245
callback attribute generatedCommandList;
22322246
callback attribute acceptedCommandList;
2233-
callback attribute eventList;
22342247
callback attribute attributeList;
22352248
ram attribute featureMap default = 0;
22362249
ram attribute clusterRevision default = 4;
@@ -2246,7 +2259,6 @@ endpoint 2 {
22462259
callback attribute partsList;
22472260
callback attribute generatedCommandList;
22482261
callback attribute acceptedCommandList;
2249-
callback attribute eventList;
22502262
callback attribute attributeList;
22512263
callback attribute featureMap;
22522264
callback attribute clusterRevision;
@@ -2259,7 +2271,6 @@ endpoint 2 {
22592271
ram attribute tolerance default = 40;
22602272
callback attribute generatedCommandList;
22612273
callback attribute acceptedCommandList;
2262-
callback attribute eventList;
22632274
callback attribute attributeList;
22642275
ram attribute featureMap default = 0;
22652276
ram attribute clusterRevision default = 4;
@@ -2274,7 +2285,6 @@ endpoint 3 {
22742285
ram attribute identifyType default = 0x00;
22752286
callback attribute generatedCommandList;
22762287
callback attribute acceptedCommandList;
2277-
callback attribute eventList;
22782288
callback attribute attributeList;
22792289
ram attribute featureMap default = 0;
22802290
ram attribute clusterRevision default = 4;
@@ -2290,7 +2300,6 @@ endpoint 3 {
22902300
callback attribute partsList;
22912301
callback attribute generatedCommandList;
22922302
callback attribute acceptedCommandList;
2293-
callback attribute eventList;
22942303
callback attribute attributeList;
22952304
callback attribute featureMap;
22962305
callback attribute clusterRevision;
@@ -2303,7 +2312,6 @@ endpoint 3 {
23032312
ram attribute tolerance default = 300;
23042313
callback attribute generatedCommandList;
23052314
callback attribute acceptedCommandList;
2306-
callback attribute eventList;
23072315
callback attribute attributeList;
23082316
ram attribute featureMap default = 0;
23092317
ram attribute clusterRevision default = 3;

‎examples/multi-sensor-app/silabs/data_model/multi-sensor-thread-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"package": [
2020
{
2121
"pathRelativity": "relativeToZap",
22-
"path": "../../../src/app/zap-templates/zcl/zcl.json",
22+
"path": "../../../../src/app/zap-templates/zcl/zcl.json",
2323
"type": "zcl-properties",
2424
"category": "matter",
2525
"version": 1,

‎examples/multi-sensor-app/silabs/data_model/multi-sensor-wifi-app.matter

+27-14
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,7 @@ cluster GeneralCommissioning = 48 {
800800
provisional readonly attribute access(read: administer) optional int16u TCMinRequiredVersion = 6;
801801
provisional readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
802802
provisional readonly attribute access(read: administer) optional boolean TCAcknowledgementsRequired = 8;
803+
provisional readonly attribute access(read: administer) optional nullable int32u TCUpdateDeadline = 9;
803804
readonly attribute command_id generatedCommandList[] = 65528;
804805
readonly attribute command_id acceptedCommandList[] = 65529;
805806
readonly attribute event_id eventList[] = 65530;
@@ -1160,7 +1161,7 @@ cluster GeneralDiagnostics = 51 {
11601161
/** Take a snapshot of system time and epoch time. */
11611162
command TimeSnapshot(): TimeSnapshotResponse = 1;
11621163
/** Request a variable length payload response. */
1163-
command PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
1164+
command access(invoke: manage) PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
11641165
}
11651166

11661167
/** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
@@ -1355,12 +1356,14 @@ cluster OperationalCredentials = 62 {
13551356
fabric_id fabricID = 3;
13561357
node_id nodeID = 4;
13571358
char_string<32> label = 5;
1359+
optional octet_string<85> vidVerificationStatement = 6;
13581360
fabric_idx fabricIndex = 254;
13591361
}
13601362

13611363
fabric_scoped struct NOCStruct {
1362-
fabric_sensitive octet_string noc = 1;
1363-
nullable fabric_sensitive octet_string icac = 2;
1364+
octet_string noc = 1;
1365+
nullable octet_string icac = 2;
1366+
optional octet_string vvsc = 3;
13641367
fabric_idx fabricIndex = 254;
13651368
}
13661369

@@ -1435,6 +1438,23 @@ cluster OperationalCredentials = 62 {
14351438
octet_string rootCACertificate = 0;
14361439
}
14371440

1441+
request struct SetVidVerificationStatementRequest {
1442+
optional vendor_id vendorID = 0;
1443+
optional octet_string vidVerificationStatement = 1;
1444+
optional octet_string vvsc = 2;
1445+
}
1446+
1447+
request struct SignVidVerificationRequestRequest {
1448+
fabric_idx fabricIndex = 0;
1449+
octet_string<32> clientChallenge = 1;
1450+
}
1451+
1452+
response struct SignVidVerificationResponse = 14 {
1453+
fabric_idx fabricIndex = 0;
1454+
int8u fabricBindingVersion = 1;
1455+
octet_string signature = 2;
1456+
}
1457+
14381458
/** Sender is requesting attestation information from the receiver. */
14391459
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
14401460
/** Sender is requesting a device attestation certificate from the receiver. */
@@ -1451,6 +1471,10 @@ cluster OperationalCredentials = 62 {
14511471
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
14521472
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
14531473
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
1474+
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
1475+
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
1476+
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
1477+
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
14541478
}
14551479

14561480
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
@@ -1676,7 +1700,6 @@ endpoint 0 {
16761700
callback attribute partsList;
16771701
callback attribute generatedCommandList;
16781702
callback attribute acceptedCommandList;
1679-
callback attribute eventList;
16801703
callback attribute attributeList;
16811704
callback attribute featureMap;
16821705
callback attribute clusterRevision;
@@ -1752,7 +1775,6 @@ endpoint 0 {
17521775
callback attribute supportsConcurrentConnection;
17531776
callback attribute generatedCommandList;
17541777
callback attribute acceptedCommandList;
1755-
callback attribute eventList;
17561778
callback attribute attributeList;
17571779
ram attribute featureMap default = 0;
17581780
ram attribute clusterRevision default = 1;
@@ -1905,7 +1927,6 @@ endpoint 1 {
19051927
ram attribute identifyType default = 0x0;
19061928
callback attribute generatedCommandList;
19071929
callback attribute acceptedCommandList;
1908-
callback attribute eventList;
19091930
callback attribute attributeList;
19101931
ram attribute featureMap default = 0;
19111932
ram attribute clusterRevision default = 4;
@@ -1921,7 +1942,6 @@ endpoint 1 {
19211942
callback attribute partsList;
19221943
callback attribute generatedCommandList;
19231944
callback attribute acceptedCommandList;
1924-
callback attribute eventList;
19251945
callback attribute attributeList;
19261946
callback attribute featureMap;
19271947
callback attribute clusterRevision;
@@ -1933,7 +1953,6 @@ endpoint 1 {
19331953
ram attribute occupancySensorTypeBitmap;
19341954
callback attribute generatedCommandList;
19351955
callback attribute acceptedCommandList;
1936-
callback attribute eventList;
19371956
callback attribute attributeList;
19381957
callback attribute featureMap;
19391958
ram attribute clusterRevision default = 3;
@@ -1948,7 +1967,6 @@ endpoint 2 {
19481967
ram attribute identifyType default = 0x00;
19491968
callback attribute generatedCommandList;
19501969
callback attribute acceptedCommandList;
1951-
callback attribute eventList;
19521970
callback attribute attributeList;
19531971
ram attribute featureMap default = 0;
19541972
ram attribute clusterRevision default = 4;
@@ -1964,7 +1982,6 @@ endpoint 2 {
19641982
callback attribute partsList;
19651983
callback attribute generatedCommandList;
19661984
callback attribute acceptedCommandList;
1967-
callback attribute eventList;
19681985
callback attribute attributeList;
19691986
callback attribute featureMap;
19701987
callback attribute clusterRevision;
@@ -1977,7 +1994,6 @@ endpoint 2 {
19771994
ram attribute tolerance default = 40;
19781995
callback attribute generatedCommandList;
19791996
callback attribute acceptedCommandList;
1980-
callback attribute eventList;
19811997
callback attribute attributeList;
19821998
ram attribute featureMap default = 0;
19831999
ram attribute clusterRevision default = 4;
@@ -1992,7 +2008,6 @@ endpoint 3 {
19922008
ram attribute identifyType default = 0x00;
19932009
callback attribute generatedCommandList;
19942010
callback attribute acceptedCommandList;
1995-
callback attribute eventList;
19962011
callback attribute attributeList;
19972012
ram attribute featureMap default = 0;
19982013
ram attribute clusterRevision default = 4;
@@ -2008,7 +2023,6 @@ endpoint 3 {
20082023
callback attribute partsList;
20092024
callback attribute generatedCommandList;
20102025
callback attribute acceptedCommandList;
2011-
callback attribute eventList;
20122026
callback attribute attributeList;
20132027
callback attribute featureMap;
20142028
callback attribute clusterRevision;
@@ -2021,7 +2035,6 @@ endpoint 3 {
20212035
ram attribute tolerance default = 300;
20222036
callback attribute generatedCommandList;
20232037
callback attribute acceptedCommandList;
2024-
callback attribute eventList;
20252038
callback attribute attributeList;
20262039
ram attribute featureMap default = 0;
20272040
ram attribute clusterRevision default = 3;

0 commit comments

Comments
 (0)