Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nwprov] Add missing debugText and index to some synchronous commands #16676

Merged
merged 13 commits into from
Mar 30, 2022
Merged

[nwprov] Add missing debugText and index to some synchronous commands #16676

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9f38d70
[nwprov] Add missing debugText and index to some synchronous commands
erjiaqing Mar 25, 2022
aa34c67
string search / replace for platform code
erjiaqing Mar 25, 2022
a18685f
Run codegen
erjiaqing Mar 25, 2022
5a959db
Address comments
erjiaqing Mar 28, 2022
3435b75
Merge branch 'master' into nwprov-final/fix-missing-network-index-field
erjiaqing Mar 28, 2022
84bb529
Update examples
erjiaqing Mar 28, 2022
90a6b29
Fix
erjiaqing Mar 29, 2022
20aa700
Fix
erjiaqing Mar 29, 2022
2a41697
Fix
erjiaqing Mar 29, 2022
18666d6
Merge branch 'master' into nwprov-final/fix-missing-network-index-field
erjiaqing Mar 29, 2022
633f478
Fix
erjiaqing Mar 30, 2022
5d8c6b0
Merge branch 'master' into nwprov-final/fix-missing-network-index-field
erjiaqing Mar 30, 2022
1a4c8ad
Run Codegen
erjiaqing Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
653 changes: 327 additions & 326 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop

Large diffs are not rendered by default.

155 changes: 78 additions & 77 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ 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 @@ -156,12 +160,8 @@ server cluster AdministratorCommissioning = 60 {
OCTET_STRING salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
}

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

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

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

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

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

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

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

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

request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
BITMAP8 optionMask = 3;
BITMAP8 optionOverride = 4;
}

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

request struct MoveToLevelWithOnOffRequest {
Expand All @@ -498,19 +485,32 @@ server cluster LevelControl = 8 {
INT8U rate = 1;
}

request struct StepRequest {
StepMode stepMode = 0;
INT8U stepSize = 1;
INT16U transitionTime = 2;
BITMAP8 optionMask = 3;
BITMAP8 optionOverride = 4;
}

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

command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
request struct StopRequest {
BITMAP8 optionMask = 0;
BITMAP8 optionOverride = 1;
}

command Move(MoveRequest): DefaultSuccess = 1;
command Step(StepRequest): DefaultSuccess = 2;
command Stop(StopRequest): DefaultSuccess = 3;
command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
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 ScanNetworksRequest {
OCTET_STRING ssid = 0;
request struct AddOrUpdateThreadNetworkRequest {
OCTET_STRING operationalDataset = 0;
INT64U breadcrumb = 1;
}

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

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

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

request struct ConnectNetworkRequest {
request struct RemoveNetworkRequest {
OCTET_STRING networkID = 0;
INT64U breadcrumb = 1;
}
Expand All @@ -619,30 +614,36 @@ server cluster NetworkCommissioning = 49 {
INT64U breadcrumb = 2;
}

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

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

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

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

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

server cluster OnOff = 6 {
Expand Down Expand Up @@ -720,18 +721,6 @@ 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 @@ -740,56 +729,68 @@ server cluster OperationalCredentials = 62 {
INT16U adminVendorId = 4;
}

request struct UpdateNOCRequest {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
request struct AddTrustedRootCertificateRequest {
OCTET_STRING rootCertificate = 0;
}

request struct UpdateFabricLabelRequest {
CHAR_STRING label = 0;
request struct AttestationRequestRequest {
OCTET_STRING attestationNonce = 0;
}

request struct RemoveFabricRequest {
fabric_idx fabricIndex = 0;
request struct CSRRequestRequest {
OCTET_STRING CSRNonce = 0;
}

request struct AddTrustedRootCertificateRequest {
OCTET_STRING rootCertificate = 0;
request struct CertificateChainRequestRequest {
INT8U certificateType = 0;
}

request struct RemoveFabricRequest {
fabric_idx fabricIndex = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

request struct UpdateFabricLabelRequest {
CHAR_STRING label = 0;
}

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

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 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 CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
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