diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter index 7ba0c1911e5a7e..f82745976b5f70 100644 --- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter +++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter @@ -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; @@ -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 { diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter index 31ed149626fbb7..3396daa5fda28d 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter @@ -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; @@ -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 { diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index a32385add15336..7f3601b0078991 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -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; @@ -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 { diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 397f58953c7555..e2ee1bc8b3f7ce 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -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; @@ -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; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index af14b3efff361e..3d05af89e14d94 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 89b46108632a53..4f9b3b56f0b5e4 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter index f246b1b00db21d..fcd2e9524a1f7b 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter index eb326588b01a06..fed80ee6a4c088 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter index 7c58605b67f5b3..0d7a34db5a73cd 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index fd2c185dc52610..1785abe0718d04 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 403e626b98fad9..a1368474e20d04 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 804c4d8a7e18cb..94497ea9517999 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter index 78d0310788e578..bcf10370da4989 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 8307cd7e5c0a10..94537055c7bfa4 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 3fb6d60dc6d864..1d213db26a0bf1 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 67666fd3e8571c..649d845d2cedd7 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index bfc22eafeb2bf8..4572534ad53621 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -933,9 +933,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; @@ -948,7 +952,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 { diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter index de91db915a0768..c3459693bcf57b 100644 --- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter +++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter @@ -659,9 +659,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; @@ -674,7 +678,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 { diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 872739993182c5..456ffdd0022833 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1071,9 +1071,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; @@ -1086,7 +1090,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 { diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index c99a178784ce2c..4de43fc8c67207 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -933,9 +933,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; @@ -948,7 +952,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 { diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter index 2e23a9182dc7a9..91083daf90c449 100644 --- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter +++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 775cb2422e66a9..58af6be5dacaa0 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -933,9 +933,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; @@ -948,7 +952,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 { diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 8c8d08f9b41ffb..298803acb4842b 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -933,9 +933,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; @@ -948,7 +952,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 { diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index a7885a230e5c05..2ad1a8a8395b82 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter index a912d462601443..f119f510914456 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.matter +++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index c0629339acfca8..c47c0ff2178ab6 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -1041,9 +1041,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; @@ -1056,7 +1060,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 { diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 3ed8ee7b4282f0..3fe9884671f64a 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -976,9 +976,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; @@ -991,7 +995,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 { diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 14daa540df2d4c..c16b6fc6a441f1 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -933,9 +933,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; @@ -948,7 +952,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 { diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter index 784aa192b139bf..d1422b6307504c 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.matter +++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter @@ -678,9 +678,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; @@ -693,7 +697,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 { diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index 4b3c22b7a981c9..39f5ef1a9769d9 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -678,9 +678,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; @@ -693,7 +697,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 { diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter index 924f9996a18bed..f31c4cdbf57406 100644 --- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter +++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter index 6bcbb7e9a1419b..b85baa83661958 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter index b74aaf0fcef502..ec3b0ebc2ab633 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter @@ -721,9 +721,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; @@ -736,7 +740,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 { diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter index 6864f9f4128d1d..d202497a28e0ee 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter @@ -908,9 +908,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; @@ -923,7 +927,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 { diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index b64b04e6283865..ee7ff1b79b7891 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -1002,9 +1002,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; @@ -1017,7 +1021,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 { diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 9e7312e63ef62c..a8748e38982e24 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -933,9 +933,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; @@ -948,7 +952,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 { diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index cb506cb6cde0bb..1759c382206b3a 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -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; @@ -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 { diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index af81982dcc0627..1ba5b2d9d35021 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -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; @@ -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 { diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter index 5f7ad0dea23371..5f63e3f131f054 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter @@ -1190,9 +1190,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; @@ -1205,7 +1209,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 { diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter index 0c627579cdb9d8..cbfef17a9af063 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter @@ -810,9 +810,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; @@ -825,7 +829,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 { diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index dba1b42eeae142..625104b359a561 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -1696,9 +1696,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; @@ -1711,7 +1715,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 { diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter index 706e6e11be89c2..ceed04f9f23c14 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -1123,9 +1123,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; @@ -1138,7 +1142,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 { diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter index d627fc2677d503..e66503d6af8c9b 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -1246,9 +1246,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; @@ -1261,7 +1265,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 { diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter index bbbb0c8bae8edc..6e05bea7ee5e59 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -1156,9 +1156,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; @@ -1171,7 +1175,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 { diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 46c4d49957bd0d..d2949059cc557e 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1560,9 +1560,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; @@ -1575,7 +1579,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 { diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index ad75885c8f3e5f..a3b640bec36a33 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -1125,9 +1125,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; @@ -1140,7 +1144,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; diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 2fb6343726d279..e70cc6d81deac9 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -1186,9 +1186,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; @@ -1201,7 +1205,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 { diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index 4b3c39130158ce..7fba724a460eac 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -1652,9 +1652,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; @@ -1667,7 +1671,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 { diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter index 6b1345def7d32c..7a76484abf4fa3 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -1542,9 +1542,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; @@ -1557,7 +1561,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 { diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 8a28fddcb6d8d7..31f872b3d4e004 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1427,9 +1427,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; @@ -1442,7 +1446,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 { diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index ea7ec26983f090..b0b78a78d95ffc 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -743,9 +743,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; @@ -758,7 +762,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; diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index 175ce964e15219..b195e0e68c1cbc 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -1019,9 +1019,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; @@ -1034,7 +1038,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 { diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index c589341e0be2c3..10737bfd5a1bfe 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -723,9 +723,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; @@ -738,7 +742,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 { diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 2aa072487318bf..fa22896c19fc20 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -906,9 +906,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; @@ -921,7 +925,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 { diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index a45f45c5e8f916..5ff8d4573fef7f 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -2361,9 +2361,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; @@ -2376,7 +2380,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 { diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 70fc68ea072344..4250eaf837efb1 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -2320,9 +2320,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; @@ -2335,7 +2339,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 { diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 85f730645b3813..6f2564240c2e86 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -978,9 +978,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; @@ -993,7 +997,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 { diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter index c89f79622c8262..ecff28c2b3f874 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.matter +++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter @@ -978,9 +978,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; @@ -993,7 +997,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 { diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter index c89f79622c8262..ecff28c2b3f874 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter @@ -978,9 +978,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; @@ -993,7 +997,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 { diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 574e9c36ffa1b0..8e772d50f88fb8 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -903,9 +903,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; @@ -918,7 +922,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 { diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter index 77fb79e7222fb9..38c1f5042b6363 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter @@ -677,9 +677,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; @@ -692,7 +696,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 { diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter index 6b401a2866cb8c..36d84a6b36fe0e 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter @@ -1242,9 +1242,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; @@ -1257,7 +1261,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 { diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter index 0bb7e9efb14a62..2b09d5cd27e3d9 100644 --- a/examples/rvc-app/rvc-common/rvc-app.matter +++ b/examples/rvc-app/rvc-common/rvc-app.matter @@ -607,9 +607,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; @@ -622,7 +626,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 { diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter index 7112bd188c2622..87eec6aa7cd4ad 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter @@ -1309,9 +1309,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; @@ -1324,7 +1328,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 { diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter index cc8b82ecc50c46..7a4db1544c56bf 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -774,9 +774,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; @@ -789,7 +793,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 { diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter index 5b57b9d13f0aab..7ce046e5c72fc2 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter @@ -1444,9 +1444,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; @@ -1459,7 +1463,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 { diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter index b47b018f1b06b6..52de8d4d2f25d6 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter @@ -1353,9 +1353,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; @@ -1368,7 +1372,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 { diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 1d646d2fe48dbb..9da24508679c42 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1277,9 +1277,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; @@ -1292,7 +1296,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 { diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index d8ddbe693e42df..05d80184740cde 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1430,9 +1430,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; @@ -1445,7 +1449,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 { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index ae20bcb56f0403..29aa34023694ca 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -1110,9 +1110,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; @@ -1125,7 +1129,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 { diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index a7c45596af6763..5910114fc99122 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -1565,9 +1565,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; @@ -1580,7 +1584,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 { diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index ded80c333e3563..9ca68b8aad1419 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1409,9 +1409,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; @@ -1424,7 +1428,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 { diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h index 2171165b8360ce..4679085f1570dd 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h @@ -691,7 +691,7 @@ { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */ \ { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX), \ ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID), \ ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminVendorId */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h index f2f40e61e71d6f..b321c516ab9b81 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h @@ -393,7 +393,7 @@ { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */ \ { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX), \ ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID), \ ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminVendorId */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ diff --git a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml index eda59d9d3eabbc..0668f2dea4ae7c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml @@ -40,7 +40,7 @@ limitations under the License. WindowStatus AdminFabricIndex - AdminVendorId + AdminVendorId This command is used by a current Administrator to instruct a Node to go into commissioning mode using enhanced commissioning method. @@ -48,7 +48,7 @@ limitations under the License. - + @@ -64,4 +64,9 @@ limitations under the License. + + + + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 89233449804703..caabe18f4fa4b4 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2407,9 +2407,13 @@ client 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; @@ -2422,7 +2426,7 @@ client 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 { diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 459a72991eeb08..b45aa5e51806d2 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -15827,7 +15827,7 @@ CHIPAdministratorCommissioningAdminVendorIdAttributeCallback::~CHIPAdministrator } void CHIPAdministratorCommissioningAdminVendorIdAttributeCallback::CallbackFn( - void * context, const chip::app::DataModel::Nullable & value) + void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index bae4a520542360..e67077ba62feb3 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -12782,6 +12782,10 @@ class StatusCode(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 0, + class Bitmaps: + class Feature(IntFlag): + kBasic = 0x1 + class Commands: @dataclass class OpenCommissioningWindow(ClusterCommand): diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index bc34c284717b2d..4fcd7e0c8bd86f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -4706,7 +4706,7 @@ static id _Nullable DecodeAttributeValueForAdministratorCommissioningCluster(Att if (cppValue.IsNull()) { value = nil; } else { - value = [NSNumber numberWithUnsignedShort:cppValue.Value()]; + value = [NSNumber numberWithUnsignedShort:chip::to_underlying(cppValue.Value())]; } return value; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index cc7e35b340ec8d..43dde2ac143c4e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -14206,6 +14206,10 @@ typedef NS_ENUM(uint8_t, MTRAdministratorCommissioningStatusCode) { MTRAdministratorCommissioningStatusCodeWindowNotOpen MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_OPTIONS(uint32_t, MTRAdministratorCommissioningFeature) { + MTRAdministratorCommissioningFeatureBasic MTR_PROVISIONALLY_AVAILABLE = 0x1, +} MTR_PROVISIONALLY_AVAILABLE; + typedef NS_ENUM(uint8_t, MTROperationalCredentialsCertificateChainType) { MTROperationalCredentialsCertificateChainTypeDACCertificate MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01, MTROperationalCredentialsCertificateChainTypePAICertificate MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x02, diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 9ed4ea9b572645..67788b9dd4318d 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -1406,6 +1406,12 @@ enum class StatusCode : uint8_t // enum value. This specific should never be transmitted. kUnknownEnumValue = 0, }; + +// Bitmap for Feature +enum class Feature : uint32_t +{ + kBasic = 0x1, +}; } // namespace AdministratorCommissioning namespace OperationalCredentials { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index ad844cd6cb67c7..26ad7ac20b2b50 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -12178,9 +12178,9 @@ struct TypeInfo namespace AdminVendorId { struct TypeInfo { - using Type = chip::app::DataModel::Nullable; - using DecodableType = chip::app::DataModel::Nullable; - using DecodableArgType = const chip::app::DataModel::Nullable &; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::AdministratorCommissioning::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::AdminVendorId::Id; } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index f74428cf456c69..bd1852ca31af5a 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -14443,9 +14443,9 @@ void registerClusterAdministratorCommissioning(Commands & commands, CredentialIs make_unique>>( Id, "admin-fabric-index", 0, UINT8_MAX, Attributes::AdminFabricIndex::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>>(Id, "admin-vendor-id", 0, UINT16_MAX, - Attributes::AdminVendorId::Id, - WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "admin-vendor-id", 0, UINT16_MAX, Attributes::AdminVendorId::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // make_unique>>( Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 9953be8a6074b4..ae45b6d5ef70c7 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -7568,7 +7568,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("AdminFabricIndex", 1, value); } case AdministratorCommissioning::Attributes::AdminVendorId::Id: { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AdminVendorId", 1, value); }