Skip to content

Commit

Permalink
Update zap repo to latest upstream (#16674)
Browse files Browse the repository at this point in the history 
* Update zap repo to latest upstream

* Zap regen all
  • Loading branch information
@mlepage-google
mlepage-google authored Mar 25, 2022
1 parent 48b48c2 commit c14faeb
Show file tree
Hide file tree
Showing 40 changed files with 4,634 additions and 4,634 deletions.
650 changes: 325 additions & 325 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file

Large diffs are not rendered by default.

152 changes: 76 additions & 76 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,6 @@ server cluster AdministratorCommissioning = 60 {
readonly attribute int16u adminVendorId = 2;
readonly global attribute int16u clusterRevision = 65533;

request struct OpenBasicCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
}

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
Expand All @@ -160,8 +156,12 @@ server cluster AdministratorCommissioning = 60 {
OCTET_STRING salt = 4;
}

timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
request struct OpenBasicCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
}

timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
timed command RevokeCommissioning(): DefaultSuccess = 2;
}

Expand Down Expand Up @@ -321,19 +321,19 @@ server cluster GeneralCommissioning = 48 {
CHAR_STRING debugText = 1;
}

response struct CommissioningCompleteResponse {
response struct SetRegulatoryConfigResponse {
CommissioningError errorCode = 0;
CHAR_STRING debugText = 1;
}

response struct SetRegulatoryConfigResponse {
response struct CommissioningCompleteResponse {
CommissioningError errorCode = 0;
CHAR_STRING debugText = 1;
}

command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
command CommissioningComplete(): CommissioningCompleteResponse = 4;
command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
command CommissioningComplete(): CommissioningCompleteResponse = 4;
}

server cluster GeneralDiagnostics = 51 {
Expand Down Expand Up @@ -461,28 +461,18 @@ server cluster LevelControl = 8 {
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
BITMAP8 optionMask = 2;
BITMAP8 optionOverride = 3;
}

request struct MoveToLevelRequest {
INT8U level = 0;
INT16U transitionTime = 1;
BITMAP8 optionMask = 2;
BITMAP8 optionOverride = 3;
}

request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
}

request struct MoveWithOnOffRequest {
request struct MoveRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
BITMAP8 optionMask = 2;
BITMAP8 optionOverride = 3;
}

request struct StepRequest {
Expand All @@ -493,24 +483,34 @@ server cluster LevelControl = 8 {
BITMAP8 optionOverride = 4;
}

request struct StopRequest {
BITMAP8 optionMask = 0;
BITMAP8 optionOverride = 1;
}

request struct MoveToLevelWithOnOffRequest {
INT8U level = 0;
INT16U transitionTime = 1;
}

request struct MoveWithOnOffRequest {
MoveMode moveMode = 0;
INT8U rate = 1;
}

request struct StepWithOnOffRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
}

request struct StopRequest {
BITMAP8 optionMask = 0;
BITMAP8 optionOverride = 1;
}

command Move(MoveRequest): DefaultSuccess = 1;
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
command Move(MoveRequest): DefaultSuccess = 1;
command Step(StepRequest): DefaultSuccess = 2;
command Stop(StopRequest): DefaultSuccess = 3;
command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
command Step(StepRequest): DefaultSuccess = 2;
command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
command Stop(StopRequest): DefaultSuccess = 3;
command StopWithOnOff(): DefaultSuccess = 7;
}

Expand Down Expand Up @@ -587,8 +587,8 @@ server cluster NetworkCommissioning = 49 {
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

request struct AddOrUpdateThreadNetworkRequest {
OCTET_STRING operationalDataset = 0;
request struct ScanNetworksRequest {
OCTET_STRING ssid = 0;
INT64U breadcrumb = 1;
}

Expand All @@ -598,8 +598,8 @@ server cluster NetworkCommissioning = 49 {
INT64U breadcrumb = 2;
}

request struct ConnectNetworkRequest {
OCTET_STRING networkID = 0;
request struct AddOrUpdateThreadNetworkRequest {
OCTET_STRING operationalDataset = 0;
INT64U breadcrumb = 1;
}

Expand All @@ -608,41 +608,41 @@ server cluster NetworkCommissioning = 49 {
INT64U breadcrumb = 1;
}

request struct ConnectNetworkRequest {
OCTET_STRING networkID = 0;
INT64U breadcrumb = 1;
}

request struct ReorderNetworkRequest {
OCTET_STRING networkID = 0;
INT8U networkIndex = 1;
INT64U breadcrumb = 2;
}

request struct ScanNetworksRequest {
OCTET_STRING ssid = 0;
INT64U breadcrumb = 1;
}

response struct ConnectNetworkResponse {
response struct ScanNetworksResponse {
NetworkCommissioningStatus networkingStatus = 0;
CHAR_STRING debugText = 1;
INT32S errorValue = 2;
optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
optional ThreadInterfaceScanResult threadScanResults[] = 3;
}

response struct NetworkConfigResponse {
NetworkCommissioningStatus networkingStatus = 0;
CHAR_STRING debugText = 1;
}

response struct ScanNetworksResponse {
response struct ConnectNetworkResponse {
NetworkCommissioningStatus networkingStatus = 0;
CHAR_STRING debugText = 1;
optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
optional ThreadInterfaceScanResult threadScanResults[] = 3;
INT32S errorValue = 2;
}

command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
}

server cluster OnOff = 6 {
Expand Down Expand Up @@ -720,6 +720,18 @@ server cluster OperationalCredentials = 62 {
readonly attribute fabric_idx currentFabricIndex = 5;
readonly global attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
OCTET_STRING attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
INT8U certificateType = 0;
}

request struct CSRRequestRequest {
OCTET_STRING CSRNonce = 0;
}

request struct AddNOCRequest {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
Expand All @@ -728,68 +740,56 @@ server cluster OperationalCredentials = 62 {
INT16U adminVendorId = 4;
}

request struct AddTrustedRootCertificateRequest {
OCTET_STRING rootCertificate = 0;
}

request struct AttestationRequestRequest {
OCTET_STRING attestationNonce = 0;
}

request struct CSRRequestRequest {
OCTET_STRING CSRNonce = 0;
request struct UpdateNOCRequest {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
}

request struct CertificateChainRequestRequest {
INT8U certificateType = 0;
request struct UpdateFabricLabelRequest {
CHAR_STRING label = 0;
}

request struct RemoveFabricRequest {
fabric_idx fabricIndex = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

request struct UpdateFabricLabelRequest {
CHAR_STRING label = 0;
request struct AddTrustedRootCertificateRequest {
OCTET_STRING rootCertificate = 0;
}

request struct UpdateNOCRequest {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

response struct AttestationResponse {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
}

response struct CertificateChainResponse {
OCTET_STRING certificate = 0;
}

response struct CSRResponse {
OCTET_STRING NOCSRElements = 0;
OCTET_STRING attestationSignature = 1;
}

response struct CertificateChainResponse {
OCTET_STRING certificate = 0;
}

response struct NOCResponse {
OperationalCertStatus statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional CHAR_STRING debugText = 2;
}

command AddNOC(AddNOCRequest): NOCResponse = 6;
command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
command CSRRequest(CSRRequestRequest): CSRResponse = 4;
command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
command CSRRequest(CSRRequestRequest): CSRResponse = 4;
command AddNOC(AddNOCRequest): NOCResponse = 6;
command UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
}

server cluster SoftwareDiagnostics = 52 {
Expand Down
Loading

0 comments on commit c14faeb

Please sign in to comment.