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

Match AdminCommissioningCluster to spec #30004

Merged
merged 3 commits into from
Oct 26, 2023
Merged

Match AdminCommissioningCluster to spec #30004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0325751
Changes to match spec
andy31415 Oct 25, 2023
b5b157e
zap regen
andy31415 Oct 25, 2023
1221fc0
Merge branch 'master' into admin_commissioning_to_spec
andy31415 Oct 25, 2023
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
8 changes: 6 additions & 2 deletions examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,9 +756,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -771,7 +775,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,9 +1023,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -1038,7 +1042,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 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 @@ -2188,9 +2188,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -2203,7 +2207,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1803,9 +1803,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -1818,7 +1822,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
Expand Down
8 changes: 6 additions & 2 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 @@ -1380,9 +1380,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -1395,7 +1399,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,9 +1205,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -1220,7 +1224,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions ...irpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,9 +676,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -691,7 +695,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,9 +839,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -854,7 +858,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,9 +844,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -859,7 +863,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,9 +1021,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -1036,7 +1040,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,9 +927,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -942,7 +946,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,9 +1077,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -1092,7 +1096,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,9 +722,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -737,7 +741,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,9 +927,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -942,7 +946,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,9 +1077,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -1092,7 +1096,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
8 changes: 6 additions & 2 deletions examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,9 +914,13 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

bitmap Feature : bitmap32 {
kBasic = 0x1;
}

readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute nullable vendor_id adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -929,7 +933,7 @@ server cluster AdministratorCommissioning = 60 {
octet_string PAKEPasscodeVerifier = 1;
int16u discriminator = 2;
int32u iterations = 3;
octet_string salt = 4;
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
Expand Down
Loading
Loading