Skip to content

Commit 47836d2

Browse files
authored
Change all ZAP XML basic data types to lowercase (project-chip#29706)
* Replace bitmaps and enums * Replace all the rest * Zap regen * Replace Percent with percent in yaml tests * Regenerate zap * More type updates
1 parent 814bceb commit 47836d2

File tree

176 files changed

+10948
-10948
lines changed

Some content is hidden

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

176 files changed

+10948
-10948
lines changed

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

+93-93
Large diffs are not rendered by default.

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

+353-353
Large diffs are not rendered by default.

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

+191-191
Large diffs are not rendered by default.

examples/bridge-app/bridge-common/bridge-app.matter

+96-96
Large diffs are not rendered by default.

examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

+93-93
Large diffs are not rendered by default.

examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter

+73-73
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ server cluster Identify = 3 {
3535
readonly attribute int16u clusterRevision = 65533;
3636

3737
request struct IdentifyRequest {
38-
INT16U identifyTime = 0;
38+
int16u identifyTime = 0;
3939
}
4040

4141
request struct TriggerEffectRequest {
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
6767

6868
request struct AddGroupRequest {
6969
group_id groupID = 0;
70-
CHAR_STRING groupName = 1;
70+
char_string groupName = 1;
7171
}
7272

7373
request struct ViewGroupRequest {
@@ -84,27 +84,27 @@ server cluster Groups = 4 {
8484

8585
request struct AddGroupIfIdentifyingRequest {
8686
group_id groupID = 0;
87-
CHAR_STRING groupName = 1;
87+
char_string groupName = 1;
8888
}
8989

9090
response struct AddGroupResponse = 0 {
91-
ENUM8 status = 0;
91+
enum8 status = 0;
9292
group_id groupID = 1;
9393
}
9494

9595
response struct ViewGroupResponse = 1 {
96-
ENUM8 status = 0;
96+
enum8 status = 0;
9797
group_id groupID = 1;
98-
CHAR_STRING groupName = 2;
98+
char_string groupName = 2;
9999
}
100100

101101
response struct GetGroupMembershipResponse = 2 {
102-
nullable INT8U capacity = 0;
102+
nullable int8u capacity = 0;
103103
group_id groupList[] = 1;
104104
}
105105

106106
response struct RemoveGroupResponse = 3 {
107-
ENUM8 status = 0;
107+
enum8 status = 0;
108108
group_id groupID = 1;
109109
}
110110

@@ -135,9 +135,9 @@ server cluster Descriptor = 29 {
135135
}
136136

137137
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
138-
readonly attribute CLUSTER_ID serverList[] = 1;
139-
readonly attribute CLUSTER_ID clientList[] = 2;
140-
readonly attribute ENDPOINT_NO partsList[] = 3;
138+
readonly attribute cluster_id serverList[] = 1;
139+
readonly attribute cluster_id clientList[] = 2;
140+
readonly attribute endpoint_no partsList[] = 3;
141141
readonly attribute command_id generatedCommandList[] = 65528;
142142
readonly attribute command_id acceptedCommandList[] = 65529;
143143
readonly attribute event_id eventList[] = 65530;
@@ -192,15 +192,15 @@ server cluster AccessControl = 31 {
192192

193193
fabric_sensitive info event access(read: administer) AccessControlEntryChanged = 0 {
194194
nullable node_id adminNodeID = 1;
195-
nullable INT16U adminPasscodeID = 2;
195+
nullable int16u adminPasscodeID = 2;
196196
ChangeTypeEnum changeType = 3;
197197
nullable AccessControlEntryStruct latestValue = 4;
198198
fabric_idx fabricIndex = 254;
199199
}
200200

201201
fabric_sensitive info event access(read: administer) AccessControlExtensionChanged = 1 {
202202
nullable node_id adminNodeID = 1;
203-
nullable INT16U adminPasscodeID = 2;
203+
nullable int16u adminPasscodeID = 2;
204204
ChangeTypeEnum changeType = 3;
205205
nullable AccessControlExtensionStruct latestValue = 4;
206206
fabric_idx fabricIndex = 254;
@@ -267,7 +267,7 @@ server cluster BasicInformation = 40 {
267267
}
268268

269269
critical event StartUp = 0 {
270-
INT32U softwareVersion = 0;
270+
int32u softwareVersion = 0;
271271
}
272272

273273
critical event ShutDown = 1 {
@@ -342,29 +342,29 @@ server cluster GeneralCommissioning = 48 {
342342
readonly attribute int16u clusterRevision = 65533;
343343

344344
request struct ArmFailSafeRequest {
345-
INT16U expiryLengthSeconds = 0;
346-
INT64U breadcrumb = 1;
345+
int16u expiryLengthSeconds = 0;
346+
int64u breadcrumb = 1;
347347
}
348348

349349
request struct SetRegulatoryConfigRequest {
350350
RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
351-
CHAR_STRING countryCode = 1;
352-
INT64U breadcrumb = 2;
351+
char_string countryCode = 1;
352+
int64u breadcrumb = 2;
353353
}
354354

355355
response struct ArmFailSafeResponse = 1 {
356356
CommissioningErrorEnum errorCode = 0;
357-
CHAR_STRING debugText = 1;
357+
char_string debugText = 1;
358358
}
359359

360360
response struct SetRegulatoryConfigResponse = 3 {
361361
CommissioningErrorEnum errorCode = 0;
362-
CHAR_STRING debugText = 1;
362+
char_string debugText = 1;
363363
}
364364

365365
response struct CommissioningCompleteResponse = 5 {
366366
CommissioningErrorEnum errorCode = 0;
367-
CHAR_STRING debugText = 1;
367+
char_string debugText = 1;
368368
}
369369

370370
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
@@ -454,54 +454,54 @@ server cluster NetworkCommissioning = 49 {
454454
readonly attribute int16u clusterRevision = 65533;
455455

456456
request struct ScanNetworksRequest {
457-
optional nullable OCTET_STRING<32> ssid = 0;
458-
optional INT64U breadcrumb = 1;
457+
optional nullable octet_string<32> ssid = 0;
458+
optional int64u breadcrumb = 1;
459459
}
460460

461461
request struct AddOrUpdateWiFiNetworkRequest {
462-
OCTET_STRING<32> ssid = 0;
463-
OCTET_STRING<64> credentials = 1;
464-
optional INT64U breadcrumb = 2;
462+
octet_string<32> ssid = 0;
463+
octet_string<64> credentials = 1;
464+
optional int64u breadcrumb = 2;
465465
}
466466

467467
request struct AddOrUpdateThreadNetworkRequest {
468-
OCTET_STRING<254> operationalDataset = 0;
469-
optional INT64U breadcrumb = 1;
468+
octet_string<254> operationalDataset = 0;
469+
optional int64u breadcrumb = 1;
470470
}
471471

472472
request struct RemoveNetworkRequest {
473-
OCTET_STRING<32> networkID = 0;
474-
optional INT64U breadcrumb = 1;
473+
octet_string<32> networkID = 0;
474+
optional int64u breadcrumb = 1;
475475
}
476476

477477
request struct ConnectNetworkRequest {
478-
OCTET_STRING<32> networkID = 0;
479-
optional INT64U breadcrumb = 1;
478+
octet_string<32> networkID = 0;
479+
optional int64u breadcrumb = 1;
480480
}
481481

482482
request struct ReorderNetworkRequest {
483-
OCTET_STRING<32> networkID = 0;
484-
INT8U networkIndex = 1;
485-
optional INT64U breadcrumb = 2;
483+
octet_string<32> networkID = 0;
484+
int8u networkIndex = 1;
485+
optional int64u breadcrumb = 2;
486486
}
487487

488488
response struct ScanNetworksResponse = 1 {
489489
NetworkCommissioningStatusEnum networkingStatus = 0;
490-
optional CHAR_STRING debugText = 1;
490+
optional char_string debugText = 1;
491491
optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2;
492492
optional ThreadInterfaceScanResultStruct threadScanResults[] = 3;
493493
}
494494

495495
response struct NetworkConfigResponse = 5 {
496496
NetworkCommissioningStatusEnum networkingStatus = 0;
497-
optional CHAR_STRING<512> debugText = 1;
498-
optional INT8U networkIndex = 2;
497+
optional char_string<512> debugText = 1;
498+
optional int8u networkIndex = 2;
499499
}
500500

501501
response struct ConnectNetworkResponse = 7 {
502502
NetworkCommissioningStatusEnum networkingStatus = 0;
503-
optional CHAR_STRING debugText = 1;
504-
nullable INT32S errorValue = 2;
503+
optional char_string debugText = 1;
504+
nullable int32s errorValue = 2;
505505
}
506506

507507
command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
@@ -543,7 +543,7 @@ server cluster DiagnosticLogs = 50 {
543543
request struct RetrieveLogsRequestRequest {
544544
IntentEnum intent = 0;
545545
TransferProtocolEnum requestedProtocol = 1;
546-
optional CHAR_STRING<32> transferFileDesignator = 2;
546+
optional char_string<32> transferFileDesignator = 2;
547547
}
548548

549549
command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
@@ -647,8 +647,8 @@ server cluster GeneralDiagnostics = 51 {
647647
readonly attribute int16u clusterRevision = 65533;
648648

649649
request struct TestEventTriggerRequest {
650-
OCTET_STRING<16> enableKey = 0;
651-
INT64U eventTrigger = 1;
650+
octet_string<16> enableKey = 0;
651+
int64u eventTrigger = 1;
652652
}
653653

654654
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
@@ -679,15 +679,15 @@ server cluster AdministratorCommissioning = 60 {
679679
readonly attribute int16u clusterRevision = 65533;
680680

681681
request struct OpenCommissioningWindowRequest {
682-
INT16U commissioningTimeout = 0;
683-
OCTET_STRING PAKEPasscodeVerifier = 1;
684-
INT16U discriminator = 2;
685-
INT32U iterations = 3;
686-
OCTET_STRING salt = 4;
682+
int16u commissioningTimeout = 0;
683+
octet_string PAKEPasscodeVerifier = 1;
684+
int16u discriminator = 2;
685+
int32u iterations = 3;
686+
octet_string salt = 4;
687687
}
688688

689689
request struct OpenBasicCommissioningWindowRequest {
690-
INT16U commissioningTimeout = 0;
690+
int16u commissioningTimeout = 0;
691691
}
692692

693693
timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
@@ -734,7 +734,7 @@ server cluster OperationalCredentials = 62 {
734734
readonly attribute FabricDescriptorStruct fabrics[] = 1;
735735
readonly attribute int8u supportedFabrics = 2;
736736
readonly attribute int8u commissionedFabrics = 3;
737-
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
737+
readonly attribute octet_string trustedRootCertificates[] = 4;
738738
readonly attribute int8u currentFabricIndex = 5;
739739
readonly attribute command_id generatedCommandList[] = 65528;
740740
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -744,61 +744,61 @@ server cluster OperationalCredentials = 62 {
744744
readonly attribute int16u clusterRevision = 65533;
745745

746746
request struct AttestationRequestRequest {
747-
OCTET_STRING attestationNonce = 0;
747+
octet_string attestationNonce = 0;
748748
}
749749

750750
request struct CertificateChainRequestRequest {
751751
CertificateChainTypeEnum certificateType = 0;
752752
}
753753

754754
request struct CSRRequestRequest {
755-
OCTET_STRING CSRNonce = 0;
755+
octet_string CSRNonce = 0;
756756
optional boolean isForUpdateNOC = 1;
757757
}
758758

759759
request struct AddNOCRequest {
760-
OCTET_STRING NOCValue = 0;
761-
optional OCTET_STRING ICACValue = 1;
762-
OCTET_STRING IPKValue = 2;
763-
Int64u caseAdminSubject = 3;
764-
VENDOR_ID adminVendorId = 4;
760+
octet_string NOCValue = 0;
761+
optional octet_string ICACValue = 1;
762+
octet_string IPKValue = 2;
763+
int64u caseAdminSubject = 3;
764+
vendor_id adminVendorId = 4;
765765
}
766766

767767
request struct UpdateNOCRequest {
768-
OCTET_STRING NOCValue = 0;
769-
optional OCTET_STRING ICACValue = 1;
768+
octet_string NOCValue = 0;
769+
optional octet_string ICACValue = 1;
770770
}
771771

772772
request struct UpdateFabricLabelRequest {
773-
CHAR_STRING<32> label = 0;
773+
char_string<32> label = 0;
774774
}
775775

776776
request struct RemoveFabricRequest {
777777
fabric_idx fabricIndex = 0;
778778
}
779779

780780
request struct AddTrustedRootCertificateRequest {
781-
OCTET_STRING rootCACertificate = 0;
781+
octet_string rootCACertificate = 0;
782782
}
783783

784784
response struct AttestationResponse = 1 {
785-
OCTET_STRING attestationElements = 0;
786-
OCTET_STRING attestationSignature = 1;
785+
octet_string attestationElements = 0;
786+
octet_string attestationSignature = 1;
787787
}
788788

789789
response struct CertificateChainResponse = 3 {
790-
OCTET_STRING certificate = 0;
790+
octet_string certificate = 0;
791791
}
792792

793793
response struct CSRResponse = 5 {
794-
OCTET_STRING NOCSRElements = 0;
795-
OCTET_STRING attestationSignature = 1;
794+
octet_string NOCSRElements = 0;
795+
octet_string attestationSignature = 1;
796796
}
797797

798798
response struct NOCResponse = 8 {
799799
NodeOperationalCertStatusEnum statusCode = 0;
800800
optional fabric_idx fabricIndex = 1;
801-
optional CHAR_STRING debugText = 2;
801+
optional char_string debugText = 2;
802802
}
803803

804804
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -862,19 +862,19 @@ server cluster GroupKeyManagement = 63 {
862862
}
863863

864864
request struct KeySetReadRequest {
865-
INT16U groupKeySetID = 0;
865+
int16u groupKeySetID = 0;
866866
}
867867

868868
request struct KeySetRemoveRequest {
869-
INT16U groupKeySetID = 0;
869+
int16u groupKeySetID = 0;
870870
}
871871

872872
response struct KeySetReadResponse = 2 {
873873
GroupKeySetStruct groupKeySet = 0;
874874
}
875875

876876
response struct KeySetReadAllIndicesResponse = 5 {
877-
INT16U groupKeySetIDs[] = 0;
877+
int16u groupKeySetIDs[] = 0;
878878
}
879879

880880
fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
@@ -1081,7 +1081,7 @@ server cluster Thermostat = 513 {
10811081

10821082
request struct SetpointRaiseLowerRequest {
10831083
SetpointAdjustMode mode = 0;
1084-
INT8S amount = 1;
1084+
int8s amount = 1;
10851085
}
10861086

10871087
command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
@@ -1140,8 +1140,8 @@ server cluster FanControl = 514 {
11401140

11411141
attribute FanModeEnum fanMode = 0;
11421142
attribute FanModeSequenceEnum fanModeSequence = 1;
1143-
attribute nullable Percent percentSetting = 2;
1144-
readonly attribute Percent percentCurrent = 3;
1143+
attribute nullable percent percentSetting = 2;
1144+
readonly attribute percent percentCurrent = 3;
11451145
readonly attribute int8u speedMax = 4;
11461146
attribute nullable int8u speedSetting = 5;
11471147
readonly attribute int8u speedCurrent = 6;

0 commit comments

Comments
 (0)