Skip to content

Commit

Permalink
Fix enums in admin commissioning cluster
Browse files Browse the repository at this point in the history
- Enum of cluster custom codes was not following spec
- This PR updates the enum values

Fixes project-chip#21887

Testing done:
- Unit tests still pass
- Cert tests still pass
  • Loading branch information
tcarmelveilleux committed Aug 15, 2022
1 parent 89232c5 commit cb94003
Show file tree
Hide file tree
Showing 85 changed files with 95,336 additions and 104,488 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1520,12 +1520,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1370,12 +1370,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
8 changes: 4 additions & 4 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1207,12 +1207,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1178,12 +1178,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1057,12 +1057,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1312,12 +1312,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1279,12 +1279,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1312,12 +1312,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1070,12 +1070,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1305,12 +1305,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1070,12 +1070,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1070,12 +1070,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1070,12 +1070,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1312,12 +1312,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1371,12 +1371,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1218,12 +1218,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1070,12 +1070,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1192,12 +1192,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1070,12 +1070,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1168,12 +1168,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1168,12 +1168,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1262,12 +1262,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
8 changes: 4 additions & 4 deletions examples/lighting-app/lighting-common/lighting-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1208,12 +1208,12 @@ server cluster AdministratorCommissioning = 60 {
}

enum StatusCode : ENUM8 {
kBusy = 1;
kPAKEParameterError = 2;
kWindowNotOpen = 3;
kBusy = 2;
kPAKEParameterError = 3;
kWindowNotOpen = 4;
}

readonly attribute int8u windowStatus = 0;
readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Loading

0 comments on commit cb94003

Please sign in to comment.