Skip to content

Commit

Permalink
Align General Commissioning cluster XML to spec changes. (#26732)
Browse files Browse the repository at this point in the history
* Align General Commissioning cluster XML to spec changes.

Spec changes happened in
https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6179 and
https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6338

Fixes #24997

* Auto-update ZAP files.

* Regenerate generated files.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Jul 19, 2023
1 parent f3f343d commit 2628850
Show file tree
Hide file tree
Showing 127 changed files with 848 additions and 858 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1256,15 +1256,15 @@ server cluster PowerSource = 47 {

/** This cluster is used to manage global aspects of the Commissioning flow. */
server cluster GeneralCommissioning = 48 {
enum CommissioningError : ENUM8 {
enum CommissioningErrorEnum : ENUM8 {
kOk = 0;
kValueOutsideRange = 1;
kInvalidAuthentication = 2;
kNoFailSafe = 3;
kBusyWithOtherAdmin = 4;
}

enum RegulatoryLocationType : ENUM8 {
enum RegulatoryLocationTypeEnum : ENUM8 {
kIndoor = 0;
kOutdoor = 1;
kIndoorOutdoor = 2;
Expand All @@ -1277,8 +1277,8 @@ server cluster GeneralCommissioning = 48 {

attribute access(write: administer) int64u breadcrumb = 0;
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
readonly attribute RegulatoryLocationType locationCapability = 3;
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
readonly attribute boolean supportsConcurrentConnection = 4;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand All @@ -1293,23 +1293,23 @@ server cluster GeneralCommissioning = 48 {
}

request struct SetRegulatoryConfigRequest {
RegulatoryLocationType newRegulatoryConfig = 0;
RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
CHAR_STRING countryCode = 1;
INT64U breadcrumb = 2;
}

response struct ArmFailSafeResponse = 1 {
CommissioningError errorCode = 0;
CommissioningErrorEnum errorCode = 0;
CHAR_STRING debugText = 1;
}

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2967,7 +2967,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "RegulatoryLocationType",
"type": "RegulatoryLocationTypeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand All @@ -2983,7 +2983,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
"type": "RegulatoryLocationType",
"type": "RegulatoryLocationTypeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down Expand Up @@ -25580,6 +25580,5 @@
"endpointVersion": 1,
"deviceIdentifier": 61442
}
],
"log": []
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -1112,15 +1112,15 @@ server cluster PowerSource = 47 {

/** This cluster is used to manage global aspects of the Commissioning flow. */
server cluster GeneralCommissioning = 48 {
enum CommissioningError : ENUM8 {
enum CommissioningErrorEnum : ENUM8 {
kOk = 0;
kValueOutsideRange = 1;
kInvalidAuthentication = 2;
kNoFailSafe = 3;
kBusyWithOtherAdmin = 4;
}

enum RegulatoryLocationType : ENUM8 {
enum RegulatoryLocationTypeEnum : ENUM8 {
kIndoor = 0;
kOutdoor = 1;
kIndoorOutdoor = 2;
Expand All @@ -1133,8 +1133,8 @@ server cluster GeneralCommissioning = 48 {

attribute access(write: administer) int64u breadcrumb = 0;
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
readonly attribute RegulatoryLocationType locationCapability = 3;
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
readonly attribute boolean supportsConcurrentConnection = 4;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand All @@ -1149,23 +1149,23 @@ server cluster GeneralCommissioning = 48 {
}

request struct SetRegulatoryConfigRequest {
RegulatoryLocationType newRegulatoryConfig = 0;
RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
CHAR_STRING countryCode = 1;
INT64U breadcrumb = 2;
}

response struct ArmFailSafeResponse = 1 {
CommissioningError errorCode = 0;
CommissioningErrorEnum errorCode = 0;
CHAR_STRING debugText = 1;
}

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

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 92,
"featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -2930,7 +2930,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "RegulatoryLocationType",
"type": "RegulatoryLocationTypeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand All @@ -2946,7 +2946,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
"type": "RegulatoryLocationType",
"type": "RegulatoryLocationTypeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
16 changes: 8 additions & 8 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -651,15 +651,15 @@ server cluster UnitLocalization = 45 {

/** This cluster is used to manage global aspects of the Commissioning flow. */
server cluster GeneralCommissioning = 48 {
enum CommissioningError : ENUM8 {
enum CommissioningErrorEnum : ENUM8 {
kOk = 0;
kValueOutsideRange = 1;
kInvalidAuthentication = 2;
kNoFailSafe = 3;
kBusyWithOtherAdmin = 4;
}

enum RegulatoryLocationType : ENUM8 {
enum RegulatoryLocationTypeEnum : ENUM8 {
kIndoor = 0;
kOutdoor = 1;
kIndoorOutdoor = 2;
Expand All @@ -672,8 +672,8 @@ server cluster GeneralCommissioning = 48 {

attribute access(write: administer) int64u breadcrumb = 0;
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
readonly attribute RegulatoryLocationType locationCapability = 3;
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
readonly attribute boolean supportsConcurrentConnection = 4;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand All @@ -688,23 +688,23 @@ server cluster GeneralCommissioning = 48 {
}

request struct SetRegulatoryConfigRequest {
RegulatoryLocationType newRegulatoryConfig = 0;
RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
CHAR_STRING countryCode = 1;
INT64U breadcrumb = 2;
}

response struct ArmFailSafeResponse = 1 {
CommissioningError errorCode = 0;
CommissioningErrorEnum errorCode = 0;
CHAR_STRING debugText = 1;
}

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

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

Expand Down
7 changes: 3 additions & 4 deletions examples/bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1561,7 +1561,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "RegulatoryLocationType",
"type": "RegulatoryLocationTypeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand All @@ -1577,7 +1577,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
"type": "RegulatoryLocationType",
"type": "RegulatoryLocationTypeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down Expand Up @@ -7625,6 +7625,5 @@
"endpointVersion": 1,
"deviceIdentifier": 257
}
],
"log": []
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -667,15 +667,15 @@ server cluster TimeFormatLocalization = 44 {

/** This cluster is used to manage global aspects of the Commissioning flow. */
server cluster GeneralCommissioning = 48 {
enum CommissioningError : ENUM8 {
enum CommissioningErrorEnum : ENUM8 {
kOk = 0;
kValueOutsideRange = 1;
kInvalidAuthentication = 2;
kNoFailSafe = 3;
kBusyWithOtherAdmin = 4;
}

enum RegulatoryLocationType : ENUM8 {
enum RegulatoryLocationTypeEnum : ENUM8 {
kIndoor = 0;
kOutdoor = 1;
kIndoorOutdoor = 2;
Expand All @@ -688,8 +688,8 @@ server cluster GeneralCommissioning = 48 {

attribute access(write: administer) int64u breadcrumb = 0;
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
readonly attribute RegulatoryLocationType locationCapability = 3;
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
readonly attribute boolean supportsConcurrentConnection = 4;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand All @@ -704,23 +704,23 @@ server cluster GeneralCommissioning = 48 {
}

request struct SetRegulatoryConfigRequest {
RegulatoryLocationType newRegulatoryConfig = 0;
RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
CHAR_STRING countryCode = 1;
INT64U breadcrumb = 2;
}

response struct ArmFailSafeResponse = 1 {
CommissioningError errorCode = 0;
CommissioningErrorEnum errorCode = 0;
CHAR_STRING debugText = 1;
}

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2237,7 +2237,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "RegulatoryLocationType",
"type": "RegulatoryLocationTypeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand All @@ -2253,7 +2253,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
"type": "RegulatoryLocationType",
"type": "RegulatoryLocationTypeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down Expand Up @@ -7514,6 +7514,5 @@
"endpointVersion": 1,
"deviceIdentifier": 257
}
],
"log": []
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -615,15 +615,15 @@ server cluster OtaSoftwareUpdateRequestor = 42 {

/** This cluster is used to manage global aspects of the Commissioning flow. */
server cluster GeneralCommissioning = 48 {
enum CommissioningError : ENUM8 {
enum CommissioningErrorEnum : ENUM8 {
kOk = 0;
kValueOutsideRange = 1;
kInvalidAuthentication = 2;
kNoFailSafe = 3;
kBusyWithOtherAdmin = 4;
}

enum RegulatoryLocationType : ENUM8 {
enum RegulatoryLocationTypeEnum : ENUM8 {
kIndoor = 0;
kOutdoor = 1;
kIndoorOutdoor = 2;
Expand All @@ -636,8 +636,8 @@ server cluster GeneralCommissioning = 48 {

attribute access(write: administer) int64u breadcrumb = 0;
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
readonly attribute RegulatoryLocationType locationCapability = 3;
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
readonly attribute boolean supportsConcurrentConnection = 4;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand All @@ -652,23 +652,23 @@ server cluster GeneralCommissioning = 48 {
}

request struct SetRegulatoryConfigRequest {
RegulatoryLocationType newRegulatoryConfig = 0;
RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
CHAR_STRING countryCode = 1;
INT64U breadcrumb = 2;
}

response struct ArmFailSafeResponse = 1 {
CommissioningError errorCode = 0;
CommissioningErrorEnum errorCode = 0;
CHAR_STRING debugText = 1;
}

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

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

Expand Down
Loading

0 comments on commit 2628850

Please sign in to comment.