Skip to content

Commit

Permalink
[Darwin] Update templates to preserve acronyms (e.g ACL) in APIs (pro…
Browse files Browse the repository at this point in the history 
…ject-chip#22665)

* Update ZAP repo

* [darwin] Add cluster and commands description from XML into MTRBaseClusters.zapt

* [Darwin] Update template to preserve acronyms (e.g ACL) in APIs

* Update constants name in TemperatureSensorViewController.m

* Ota -> OTA in src/darwin/Framework/CHIPTests/MTRTestOTAProvider.m

* Exclude src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h from restyle as we seems to have colliding versions

* Update generated code
  • Loading branch information
@vivien-apple @isiu-apple
vivien-apple authored and isiu-apple committed Sep 16, 2022
1 parent 43d055e commit 8fb71b0
Show file tree
Hide file tree
Showing 84 changed files with 18,709 additions and 19,115 deletions.
1 change: 1 addition & 0 deletions .restyled.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ exclude:
- "examples/chef/sample_app_util/test_files/*.yaml"
- "examples/chef/zzz_generated/**/*"
- "src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm" # https://github.com/project-chip/connectedhomeip/issues/20236
- "src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h" # https://github.com/project-chip/connectedhomeip/issues/20236


changed_paths:
Expand Down
32 changes: 16 additions & 16 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,18 +636,18 @@ client cluster OtaSoftwareUpdateProvider = 41 {
INT32U softwareVersion = 2;
OTADownloadProtocol protocolsSupported[] = 3;
optional INT16U hardwareVersion = 4;
optional CHAR_STRING location = 5;
optional CHAR_STRING<2> location = 5;
optional BOOLEAN requestorCanConsent = 6;
optional OCTET_STRING metadataForProvider = 7;
optional OCTET_STRING<512> metadataForProvider = 7;
}

request struct ApplyUpdateRequestRequest {
OCTET_STRING updateToken = 0;
OCTET_STRING<32> updateToken = 0;
INT32U newVersion = 1;
}

request struct NotifyUpdateAppliedRequest {
OCTET_STRING updateToken = 0;
OCTET_STRING<32> updateToken = 0;
INT32U softwareVersion = 1;
}

Expand Down Expand Up @@ -724,7 +724,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
node_id providerNodeId = 0;
vendor_id vendorId = 1;
OTAAnnouncementReason announcementReason = 2;
optional OCTET_STRING metadataForNode = 3;
optional OCTET_STRING<512> metadataForNode = 3;
endpoint_no endpoint = 4;
}

Expand Down Expand Up @@ -1002,33 +1002,33 @@ server cluster NetworkCommissioning = 49 {
readonly attribute int16u clusterRevision = 65533;

request struct ScanNetworksRequest {
optional nullable OCTET_STRING ssid = 0;
optional nullable OCTET_STRING<32> ssid = 0;
optional INT64U breadcrumb = 1;
}

request struct AddOrUpdateWiFiNetworkRequest {
OCTET_STRING ssid = 0;
OCTET_STRING credentials = 1;
OCTET_STRING<32> ssid = 0;
OCTET_STRING<64> credentials = 1;
optional INT64U breadcrumb = 2;
}

request struct AddOrUpdateThreadNetworkRequest {
OCTET_STRING operationalDataset = 0;
OCTET_STRING<254> operationalDataset = 0;
optional INT64U breadcrumb = 1;
}

request struct RemoveNetworkRequest {
OCTET_STRING networkID = 0;
OCTET_STRING<32> networkID = 0;
optional INT64U breadcrumb = 1;
}

request struct ConnectNetworkRequest {
OCTET_STRING networkID = 0;
OCTET_STRING<32> networkID = 0;
optional INT64U breadcrumb = 1;
}

request struct ReorderNetworkRequest {
OCTET_STRING networkID = 0;
OCTET_STRING<32> networkID = 0;
INT8U networkIndex = 1;
optional INT64U breadcrumb = 2;
}
Expand All @@ -1042,7 +1042,7 @@ server cluster NetworkCommissioning = 49 {

response struct NetworkConfigResponse = 5 {
NetworkCommissioningStatus networkingStatus = 0;
optional CHAR_STRING debugText = 1;
optional CHAR_STRING<512> debugText = 1;
optional INT8U networkIndex = 2;
}

Expand Down Expand Up @@ -1086,7 +1086,7 @@ server cluster DiagnosticLogs = 50 {
request struct RetrieveLogsRequestRequest {
LogsIntent intent = 0;
LogsTransferProtocol requestedProtocol = 1;
OCTET_STRING transferFileDesignator = 2;
OCTET_STRING<32> transferFileDesignator = 2;
}

command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
Expand Down Expand Up @@ -1188,7 +1188,7 @@ server cluster GeneralDiagnostics = 51 {
readonly attribute int16u clusterRevision = 65533;

request struct TestEventTriggerRequest {
OCTET_STRING enableKey = 0;
OCTET_STRING<16> enableKey = 0;
INT64U eventTrigger = 1;
}

Expand Down Expand Up @@ -1613,7 +1613,7 @@ server cluster OperationalCredentials = 62 {
}

request struct UpdateFabricLabelRequest {
CHAR_STRING label = 0;
CHAR_STRING<32> label = 0;
}

request struct RemoveFabricRequest {
Expand Down
36 changes: 18 additions & 18 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,18 +571,18 @@ client cluster OtaSoftwareUpdateProvider = 41 {
INT32U softwareVersion = 2;
OTADownloadProtocol protocolsSupported[] = 3;
optional INT16U hardwareVersion = 4;
optional CHAR_STRING location = 5;
optional CHAR_STRING<2> location = 5;
optional BOOLEAN requestorCanConsent = 6;
optional OCTET_STRING metadataForProvider = 7;
optional OCTET_STRING<512> metadataForProvider = 7;
}

request struct ApplyUpdateRequestRequest {
OCTET_STRING updateToken = 0;
OCTET_STRING<32> updateToken = 0;
INT32U newVersion = 1;
}

request struct NotifyUpdateAppliedRequest {
OCTET_STRING updateToken = 0;
OCTET_STRING<32> updateToken = 0;
INT32U softwareVersion = 1;
}

Expand Down Expand Up @@ -659,7 +659,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
node_id providerNodeId = 0;
vendor_id vendorId = 1;
OTAAnnouncementReason announcementReason = 2;
optional OCTET_STRING metadataForNode = 3;
optional OCTET_STRING<512> metadataForNode = 3;
endpoint_no endpoint = 4;
}

Expand Down Expand Up @@ -931,33 +931,33 @@ server cluster NetworkCommissioning = 49 {
readonly attribute int16u clusterRevision = 65533;

request struct ScanNetworksRequest {
optional nullable OCTET_STRING ssid = 0;
optional nullable OCTET_STRING<32> ssid = 0;
optional INT64U breadcrumb = 1;
}

request struct AddOrUpdateWiFiNetworkRequest {
OCTET_STRING ssid = 0;
OCTET_STRING credentials = 1;
OCTET_STRING<32> ssid = 0;
OCTET_STRING<64> credentials = 1;
optional INT64U breadcrumb = 2;
}

request struct AddOrUpdateThreadNetworkRequest {
OCTET_STRING operationalDataset = 0;
OCTET_STRING<254> operationalDataset = 0;
optional INT64U breadcrumb = 1;
}

request struct RemoveNetworkRequest {
OCTET_STRING networkID = 0;
OCTET_STRING<32> networkID = 0;
optional INT64U breadcrumb = 1;
}

request struct ConnectNetworkRequest {
OCTET_STRING networkID = 0;
OCTET_STRING<32> networkID = 0;
optional INT64U breadcrumb = 1;
}

request struct ReorderNetworkRequest {
OCTET_STRING networkID = 0;
OCTET_STRING<32> networkID = 0;
INT8U networkIndex = 1;
optional INT64U breadcrumb = 2;
}
Expand All @@ -971,7 +971,7 @@ server cluster NetworkCommissioning = 49 {

response struct NetworkConfigResponse = 5 {
NetworkCommissioningStatus networkingStatus = 0;
optional CHAR_STRING debugText = 1;
optional CHAR_STRING<512> debugText = 1;
optional INT8U networkIndex = 2;
}

Expand Down Expand Up @@ -1015,7 +1015,7 @@ server cluster DiagnosticLogs = 50 {
request struct RetrieveLogsRequestRequest {
LogsIntent intent = 0;
LogsTransferProtocol requestedProtocol = 1;
OCTET_STRING transferFileDesignator = 2;
OCTET_STRING<32> transferFileDesignator = 2;
}

command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
Expand Down Expand Up @@ -1111,7 +1111,7 @@ server cluster GeneralDiagnostics = 51 {
readonly attribute int16u clusterRevision = 65533;

request struct TestEventTriggerRequest {
OCTET_STRING enableKey = 0;
OCTET_STRING<16> enableKey = 0;
INT64U eventTrigger = 1;
}

Expand Down Expand Up @@ -1458,7 +1458,7 @@ server cluster OperationalCredentials = 62 {
}

request struct UpdateFabricLabelRequest {
CHAR_STRING label = 0;
CHAR_STRING<32> label = 0;
}

request struct RemoveFabricRequest {
Expand Down Expand Up @@ -2922,11 +2922,11 @@ server cluster AccountLogin = 1294 {
readonly attribute int16u clusterRevision = 65533;

request struct GetSetupPINRequest {
CHAR_STRING tempAccountIdentifier = 0;
CHAR_STRING<100> tempAccountIdentifier = 0;
}

request struct LoginRequest {
CHAR_STRING tempAccountIdentifier = 0;
CHAR_STRING<100> tempAccountIdentifier = 0;
CHAR_STRING setupPIN = 1;
}

Expand Down
22 changes: 11 additions & 11 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -695,33 +695,33 @@ server cluster NetworkCommissioning = 49 {
readonly attribute int16u clusterRevision = 65533;

request struct ScanNetworksRequest {
optional nullable OCTET_STRING ssid = 0;
optional nullable OCTET_STRING<32> ssid = 0;
optional INT64U breadcrumb = 1;
}

request struct AddOrUpdateWiFiNetworkRequest {
OCTET_STRING ssid = 0;
OCTET_STRING credentials = 1;
OCTET_STRING<32> ssid = 0;
OCTET_STRING<64> credentials = 1;
optional INT64U breadcrumb = 2;
}

request struct AddOrUpdateThreadNetworkRequest {
OCTET_STRING operationalDataset = 0;
OCTET_STRING<254> operationalDataset = 0;
optional INT64U breadcrumb = 1;
}

request struct RemoveNetworkRequest {
OCTET_STRING networkID = 0;
OCTET_STRING<32> networkID = 0;
optional INT64U breadcrumb = 1;
}

request struct ConnectNetworkRequest {
OCTET_STRING networkID = 0;
OCTET_STRING<32> networkID = 0;
optional INT64U breadcrumb = 1;
}

request struct ReorderNetworkRequest {
OCTET_STRING networkID = 0;
OCTET_STRING<32> networkID = 0;
INT8U networkIndex = 1;
optional INT64U breadcrumb = 2;
}
Expand All @@ -735,7 +735,7 @@ server cluster NetworkCommissioning = 49 {

response struct NetworkConfigResponse = 5 {
NetworkCommissioningStatus networkingStatus = 0;
optional CHAR_STRING debugText = 1;
optional CHAR_STRING<512> debugText = 1;
optional INT8U networkIndex = 2;
}

Expand Down Expand Up @@ -779,7 +779,7 @@ server cluster DiagnosticLogs = 50 {
request struct RetrieveLogsRequestRequest {
LogsIntent intent = 0;
LogsTransferProtocol requestedProtocol = 1;
OCTET_STRING transferFileDesignator = 2;
OCTET_STRING<32> transferFileDesignator = 2;
}

command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
Expand Down Expand Up @@ -881,7 +881,7 @@ server cluster GeneralDiagnostics = 51 {
readonly attribute int16u clusterRevision = 65533;

request struct TestEventTriggerRequest {
OCTET_STRING enableKey = 0;
OCTET_STRING<16> enableKey = 0;
INT64U eventTrigger = 1;
}

Expand Down Expand Up @@ -1306,7 +1306,7 @@ server cluster OperationalCredentials = 62 {
}

request struct UpdateFabricLabelRequest {
CHAR_STRING label = 0;
CHAR_STRING<32> label = 0;
}

request struct RemoveFabricRequest {
Expand Down
24 changes: 12 additions & 12 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -526,30 +526,30 @@ client cluster OtaSoftwareUpdateProvider = 41 {
INT32U softwareVersion = 2;
OTADownloadProtocol protocolsSupported[] = 3;
optional INT16U hardwareVersion = 4;
optional CHAR_STRING location = 5;
optional CHAR_STRING<2> location = 5;
optional BOOLEAN requestorCanConsent = 6;
optional OCTET_STRING metadataForProvider = 7;
optional OCTET_STRING<512> metadataForProvider = 7;
}

request struct ApplyUpdateRequestRequest {
OCTET_STRING updateToken = 0;
OCTET_STRING<32> updateToken = 0;
INT32U newVersion = 1;
}

request struct NotifyUpdateAppliedRequest {
OCTET_STRING updateToken = 0;
OCTET_STRING<32> updateToken = 0;
INT32U softwareVersion = 1;
}

response struct QueryImageResponse = 1 {
OTAQueryStatus status = 0;
optional INT32U delayedActionTime = 1;
optional CHAR_STRING imageURI = 2;
optional CHAR_STRING<256> imageURI = 2;
optional INT32U softwareVersion = 3;
optional CHAR_STRING softwareVersionString = 4;
optional OCTET_STRING updateToken = 5;
optional CHAR_STRING<64> softwareVersionString = 4;
optional OCTET_STRING<32> updateToken = 5;
optional BOOLEAN userConsentNeeded = 6;
optional OCTET_STRING metadataForRequestor = 7;
optional OCTET_STRING<512> metadataForRequestor = 7;
}

response struct ApplyUpdateResponse = 3 {
Expand Down Expand Up @@ -625,7 +625,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
node_id providerNodeId = 0;
vendor_id vendorId = 1;
OTAAnnouncementReason announcementReason = 2;
optional OCTET_STRING metadataForNode = 3;
optional OCTET_STRING<512> metadataForNode = 3;
endpoint_no endpoint = 4;
}

Expand Down Expand Up @@ -750,7 +750,7 @@ server cluster DiagnosticLogs = 50 {
request struct RetrieveLogsRequestRequest {
LogsIntent intent = 0;
LogsTransferProtocol requestedProtocol = 1;
OCTET_STRING transferFileDesignator = 2;
OCTET_STRING<32> transferFileDesignator = 2;
}

command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
Expand Down Expand Up @@ -849,7 +849,7 @@ server cluster GeneralDiagnostics = 51 {
readonly attribute int16u clusterRevision = 65533;

request struct TestEventTriggerRequest {
OCTET_STRING enableKey = 0;
OCTET_STRING<16> enableKey = 0;
INT64U eventTrigger = 1;
}

Expand Down Expand Up @@ -1271,7 +1271,7 @@ server cluster OperationalCredentials = 62 {
}

request struct UpdateFabricLabelRequest {
CHAR_STRING label = 0;
CHAR_STRING<32> label = 0;
}

request struct RemoveFabricRequest {
Expand Down
Loading

0 comments on commit 8fb71b0

Please sign in to comment.