Skip to content

Commit 1deb779

Browse files
committed
Clear invalid array default value from ZAP
* The `SupportedLocales` which has `en-US` as default value is invalid because it is Array type. * `DefaultOtaProviders` containing default value 0 is also cleared * Regenerate *.matter file from modified ZAP file
1 parent 6735cec commit 1deb779

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

examples/chef/devices/rootnode_fan_7N2TobIlOX.matter

+21-21
Original file line numberDiff line numberDiff line change
@@ -261,30 +261,30 @@ client cluster OtaSoftwareUpdateProvider = 41 {
261261
INT32U softwareVersion = 2;
262262
OTADownloadProtocol protocolsSupported[] = 3;
263263
optional INT16U hardwareVersion = 4;
264-
optional CHAR_STRING location = 5;
264+
optional CHAR_STRING<2> location = 5;
265265
optional BOOLEAN requestorCanConsent = 6;
266-
optional OCTET_STRING metadataForProvider = 7;
266+
optional OCTET_STRING<512> metadataForProvider = 7;
267267
}
268268

269269
request struct ApplyUpdateRequestRequest {
270-
OCTET_STRING updateToken = 0;
270+
OCTET_STRING<32> updateToken = 0;
271271
INT32U newVersion = 1;
272272
}
273273

274274
request struct NotifyUpdateAppliedRequest {
275-
OCTET_STRING updateToken = 0;
275+
OCTET_STRING<32> updateToken = 0;
276276
INT32U softwareVersion = 1;
277277
}
278278

279279
response struct QueryImageResponse = 1 {
280280
OTAQueryStatus status = 0;
281281
optional INT32U delayedActionTime = 1;
282-
optional CHAR_STRING imageURI = 2;
282+
optional CHAR_STRING<256> imageURI = 2;
283283
optional INT32U softwareVersion = 3;
284-
optional CHAR_STRING softwareVersionString = 4;
285-
optional OCTET_STRING updateToken = 5;
284+
optional CHAR_STRING<64> softwareVersionString = 4;
285+
optional OCTET_STRING<32> updateToken = 5;
286286
optional BOOLEAN userConsentNeeded = 6;
287-
optional OCTET_STRING metadataForRequestor = 7;
287+
optional OCTET_STRING<512> metadataForRequestor = 7;
288288
}
289289

290290
response struct ApplyUpdateResponse = 3 {
@@ -360,7 +360,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
360360
node_id providerNodeId = 0;
361361
vendor_id vendorId = 1;
362362
OTAAnnouncementReason announcementReason = 2;
363-
optional OCTET_STRING metadataForNode = 3;
363+
optional OCTET_STRING<512> metadataForNode = 3;
364364
endpoint_no endpoint = 4;
365365
}
366366

@@ -535,33 +535,33 @@ server cluster NetworkCommissioning = 49 {
535535
readonly attribute int16u clusterRevision = 65533;
536536

537537
request struct ScanNetworksRequest {
538-
optional nullable OCTET_STRING ssid = 0;
538+
optional nullable OCTET_STRING<32> ssid = 0;
539539
optional INT64U breadcrumb = 1;
540540
}
541541

542542
request struct AddOrUpdateWiFiNetworkRequest {
543-
OCTET_STRING ssid = 0;
544-
OCTET_STRING credentials = 1;
543+
OCTET_STRING<32> ssid = 0;
544+
OCTET_STRING<64> credentials = 1;
545545
optional INT64U breadcrumb = 2;
546546
}
547547

548548
request struct AddOrUpdateThreadNetworkRequest {
549-
OCTET_STRING operationalDataset = 0;
549+
OCTET_STRING<254> operationalDataset = 0;
550550
optional INT64U breadcrumb = 1;
551551
}
552552

553553
request struct RemoveNetworkRequest {
554-
OCTET_STRING networkID = 0;
554+
OCTET_STRING<32> networkID = 0;
555555
optional INT64U breadcrumb = 1;
556556
}
557557

558558
request struct ConnectNetworkRequest {
559-
OCTET_STRING networkID = 0;
559+
OCTET_STRING<32> networkID = 0;
560560
optional INT64U breadcrumb = 1;
561561
}
562562

563563
request struct ReorderNetworkRequest {
564-
OCTET_STRING networkID = 0;
564+
OCTET_STRING<32> networkID = 0;
565565
INT8U networkIndex = 1;
566566
optional INT64U breadcrumb = 2;
567567
}
@@ -575,7 +575,7 @@ server cluster NetworkCommissioning = 49 {
575575

576576
response struct NetworkConfigResponse = 5 {
577577
NetworkCommissioningStatus networkingStatus = 0;
578-
optional CHAR_STRING debugText = 1;
578+
optional CHAR_STRING<512> debugText = 1;
579579
optional INT8U networkIndex = 2;
580580
}
581581

@@ -619,7 +619,7 @@ server cluster DiagnosticLogs = 50 {
619619
request struct RetrieveLogsRequestRequest {
620620
LogsIntent intent = 0;
621621
LogsTransferProtocol requestedProtocol = 1;
622-
OCTET_STRING transferFileDesignator = 2;
622+
OCTET_STRING<32> transferFileDesignator = 2;
623623
}
624624

625625
command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
@@ -718,7 +718,7 @@ server cluster GeneralDiagnostics = 51 {
718718
readonly attribute int16u clusterRevision = 65533;
719719

720720
request struct TestEventTriggerRequest {
721-
OCTET_STRING enableKey = 0;
721+
OCTET_STRING<16> enableKey = 0;
722722
INT64U eventTrigger = 1;
723723
}
724724

@@ -1140,7 +1140,7 @@ server cluster OperationalCredentials = 62 {
11401140
}
11411141

11421142
request struct UpdateFabricLabelRequest {
1143-
CHAR_STRING label = 0;
1143+
CHAR_STRING<32> label = 0;
11441144
}
11451145

11461146
request struct RemoveFabricRequest {
@@ -1382,7 +1382,7 @@ endpoint 0 {
13821382
}
13831383

13841384
server cluster LocalizationConfiguration {
1385-
callback attribute supportedLocales default = en-US;
1385+
callback attribute supportedLocales;
13861386
ram attribute featureMap;
13871387
ram attribute clusterRevision default = 1;
13881388
}

examples/chef/devices/rootnode_fan_7N2TobIlOX.zap

+3-3
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@
16381638
"storageOption": "External",
16391639
"singleton": 0,
16401640
"bounded": 0,
1641-
"defaultValue": "0",
1641+
"defaultValue": "",
16421642
"reportable": 1,
16431643
"minInterval": 1,
16441644
"maxInterval": 65534,
@@ -1768,7 +1768,7 @@
17681768
"storageOption": "External",
17691769
"singleton": 0,
17701770
"bounded": 0,
1771-
"defaultValue": "en-US",
1771+
"defaultValue": "",
17721772
"reportable": 1,
17731773
"minInterval": 1,
17741774
"maxInterval": 65534,
@@ -6142,4 +6142,4 @@
61426142
}
61436143
],
61446144
"log": []
6145-
}
6145+
}

0 commit comments

Comments
 (0)