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

Update General Commissioning cluster to align with the latest spec #14671

Merged
merged 2 commits into from
Feb 2, 2022
Merged

Update General Commissioning cluster to align with the latest spec #14671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6ea27d
Update General Commissioning cluster to align with the latest spec
yufengwangca Jan 31, 2022
74c591b
Run codegen
yufengwangca Feb 2, 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
14 changes: 7 additions & 7 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ server cluster FlowMeasurement = 1028 {
}

server cluster GeneralCommissioning = 48 {
enum GeneralCommissioningError : ENUM8 {
enum CommissioningError : ENUM8 {
kOk = 0;
kValueOutsideRange = 1;
kInvalidAuthentication = 2;
Expand All @@ -1360,12 +1360,12 @@ server cluster GeneralCommissioning = 48 {
kIndoorOutdoor = 2;
}

struct BasicCommissioningInfoType {
INT32U failSafeExpiryLengthMs = 0;
struct BasicCommissioningInfo {
INT16U failSafeExpiryLengthSeconds = 0;
}

attribute int64u breadcrumb = 0;
readonly attribute BasicCommissioningInfoType basicCommissioningInfoList[] = 1;
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
readonly attribute enum8 regulatoryConfig = 2;
readonly attribute enum8 locationCapability = 3;
readonly global attribute bitmap32 featureMap = 65532;
Expand All @@ -1385,17 +1385,17 @@ server cluster GeneralCommissioning = 48 {
}

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

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

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

Expand Down
8 changes: 4 additions & 4 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1982,12 +1982,12 @@
"reportableChange": 0
},
{
"name": "BasicCommissioningInfoList",
"name": "BasicCommissioningInfo",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -9619,12 +9619,12 @@
"reportableChange": 0
},
{
"name": "BasicCommissioningInfoList",
"name": "BasicCommissioningInfo",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down
14 changes: 7 additions & 7 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 @@ -155,7 +155,7 @@ server cluster FixedLabel = 64 {
}

server cluster GeneralCommissioning = 48 {
enum GeneralCommissioningError : ENUM8 {
enum CommissioningError : ENUM8 {
kOk = 0;
kValueOutsideRange = 1;
kInvalidAuthentication = 2;
Expand All @@ -168,12 +168,12 @@ server cluster GeneralCommissioning = 48 {
kIndoorOutdoor = 2;
}

struct BasicCommissioningInfoType {
INT32U failSafeExpiryLengthMs = 0;
struct BasicCommissioningInfo {
INT16U failSafeExpiryLengthSeconds = 0;
}

attribute int64u breadcrumb = 0;
readonly attribute BasicCommissioningInfoType basicCommissioningInfoList[] = 1;
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
readonly attribute enum8 regulatoryConfig = 2;
readonly attribute enum8 locationCapability = 3;
readonly global attribute bitmap32 featureMap = 65532;
Expand All @@ -193,17 +193,17 @@ server cluster GeneralCommissioning = 48 {
}

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions examples/bridge-app/bridge-common/bridge-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,12 +799,12 @@
"reportableChange": 0
},
{
"name": "BasicCommissioningInfoList",
"name": "BasicCommissioningInfo",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down
14 changes: 7 additions & 7 deletions examples/door-lock-app/door-lock-common/door-lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ server cluster FixedLabel = 64 {
}

server cluster GeneralCommissioning = 48 {
enum GeneralCommissioningError : ENUM8 {
enum CommissioningError : ENUM8 {
kOk = 0;
kValueOutsideRange = 1;
kInvalidAuthentication = 2;
Expand All @@ -707,12 +707,12 @@ server cluster GeneralCommissioning = 48 {
kIndoorOutdoor = 2;
}

struct BasicCommissioningInfoType {
INT32U failSafeExpiryLengthMs = 0;
struct BasicCommissioningInfo {
INT16U failSafeExpiryLengthSeconds = 0;
}

attribute int64u breadcrumb = 0;
readonly attribute BasicCommissioningInfoType basicCommissioningInfoList[] = 1;
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
readonly attribute enum8 regulatoryConfig = 2;
readonly attribute enum8 locationCapability = 3;
readonly global attribute bitmap32 featureMap = 65532;
Expand All @@ -732,17 +732,17 @@ server cluster GeneralCommissioning = 48 {
}

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions examples/door-lock-app/door-lock-common/door-lock-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1755,12 +1755,12 @@
"reportableChange": 0
},
{
"name": "BasicCommissioningInfoList",
"name": "BasicCommissioningInfo",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down
14 changes: 7 additions & 7 deletions examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ server cluster FixedLabel = 64 {
}

server cluster GeneralCommissioning = 48 {
enum GeneralCommissioningError : ENUM8 {
enum CommissioningError : ENUM8 {
kOk = 0;
kValueOutsideRange = 1;
kInvalidAuthentication = 2;
Expand All @@ -458,12 +458,12 @@ server cluster GeneralCommissioning = 48 {
kIndoorOutdoor = 2;
}

struct BasicCommissioningInfoType {
INT32U failSafeExpiryLengthMs = 0;
struct BasicCommissioningInfo {
INT16U failSafeExpiryLengthSeconds = 0;
}

attribute int64u breadcrumb = 0;
readonly attribute BasicCommissioningInfoType basicCommissioningInfoList[] = 1;
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
readonly attribute enum8 regulatoryConfig = 2;
readonly attribute enum8 locationCapability = 3;
readonly global attribute bitmap32 featureMap = 65532;
Expand All @@ -483,17 +483,17 @@ server cluster GeneralCommissioning = 48 {
}

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/light-switch-common/light-switch-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1872,7 +1872,7 @@
"reportableChange": 0
},
{
"name": "BasicCommissioningInfoList",
"name": "BasicCommissioningInfo",
"code": 1,
"mfgCode": null,
"side": "server",
Expand Down
14 changes: 7 additions & 7 deletions examples/lighting-app/lighting-common/lighting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ server cluster FixedLabel = 64 {
}

server cluster GeneralCommissioning = 48 {
enum GeneralCommissioningError : ENUM8 {
enum CommissioningError : ENUM8 {
kOk = 0;
kValueOutsideRange = 1;
kInvalidAuthentication = 2;
Expand All @@ -424,12 +424,12 @@ server cluster GeneralCommissioning = 48 {
kIndoorOutdoor = 2;
}

struct BasicCommissioningInfoType {
INT32U failSafeExpiryLengthMs = 0;
struct BasicCommissioningInfo {
INT16U failSafeExpiryLengthSeconds = 0;
}

attribute int64u breadcrumb = 0;
readonly attribute BasicCommissioningInfoType basicCommissioningInfoList[] = 1;
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
readonly attribute enum8 regulatoryConfig = 2;
readonly attribute enum8 locationCapability = 3;
readonly global attribute bitmap32 featureMap = 65532;
Expand All @@ -449,17 +449,17 @@ server cluster GeneralCommissioning = 48 {
}

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/lighting-common/lighting-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1855,12 +1855,12 @@
"reportableChange": 0
},
{
"name": "BasicCommissioningInfoList",
"name": "BasicCommissioningInfo",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down
14 changes: 7 additions & 7 deletions examples/lock-app/lock-common/lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ server cluster FixedLabel = 64 {
}

server cluster GeneralCommissioning = 48 {
enum GeneralCommissioningError : ENUM8 {
enum CommissioningError : ENUM8 {
kOk = 0;
kValueOutsideRange = 1;
kInvalidAuthentication = 2;
Expand All @@ -168,12 +168,12 @@ server cluster GeneralCommissioning = 48 {
kIndoorOutdoor = 2;
}

struct BasicCommissioningInfoType {
INT32U failSafeExpiryLengthMs = 0;
struct BasicCommissioningInfo {
INT16U failSafeExpiryLengthSeconds = 0;
}

attribute int64u breadcrumb = 0;
readonly attribute BasicCommissioningInfoType basicCommissioningInfoList[] = 1;
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
readonly attribute enum8 regulatoryConfig = 2;
readonly attribute enum8 locationCapability = 3;
readonly global attribute bitmap32 featureMap = 65532;
Expand All @@ -193,17 +193,17 @@ server cluster GeneralCommissioning = 48 {
}

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions examples/lock-app/lock-common/lock-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1755,12 +1755,12 @@
"reportableChange": 0
},
{
"name": "BasicCommissioningInfoList",
"name": "BasicCommissioningInfo",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down
Loading