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 7d8c34838f52f1..24503df945af6d 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 @@ -1327,7 +1327,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -1343,7 +1343,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -1358,7 +1358,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -1366,12 +1366,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -1382,21 +1382,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -1439,20 +1439,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } 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 b4942289beb56c..30de0c72df3251 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 @@ -1183,7 +1183,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -1199,7 +1199,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -1214,7 +1214,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -1222,12 +1222,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -1238,21 +1238,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -1295,20 +1295,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index e953b467ed77ac..fbc51ea9d37fc8 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -715,7 +715,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -731,7 +731,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -746,7 +746,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -754,12 +754,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -770,21 +770,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -827,20 +827,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 7d148c4f7c884a..45304d8862e103 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -683,7 +683,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -699,7 +699,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -714,7 +714,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -722,12 +722,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -738,21 +738,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -795,20 +795,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 0f00306bb151d9..779ca4ce8ea28c 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -586,7 +586,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -602,7 +602,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -617,7 +617,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -625,12 +625,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -641,21 +641,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -698,20 +698,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index a5dfc6f6755969..0ff63d13f8ad4e 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -735,7 +735,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -751,7 +751,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -766,7 +766,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -774,12 +774,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -790,21 +790,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -847,20 +847,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 2b23b97657da04..185d5ca07a0946 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -586,7 +586,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -602,7 +602,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -617,7 +617,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -625,12 +625,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -641,21 +641,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -698,20 +698,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 385a6adceeceda..f6e85f01d4b968 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -735,7 +735,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -751,7 +751,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -766,7 +766,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -774,12 +774,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -790,21 +790,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -847,20 +847,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 00a4d9078572d8..09d3036c8a9612 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -573,7 +573,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -589,7 +589,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -604,7 +604,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -612,12 +612,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -628,21 +628,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -685,20 +685,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 5481f14fc6b2b3..853fadc71c258f 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -661,7 +661,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -677,7 +677,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -692,7 +692,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -700,12 +700,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -716,21 +716,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -773,20 +773,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 14a61685af9e68..5ef010f0bad447 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -729,7 +729,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -745,7 +745,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -760,7 +760,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -768,12 +768,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -784,21 +784,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -841,20 +841,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 786ffa050e7f61..9f8dce25cf5085 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -661,7 +661,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -677,7 +677,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -692,7 +692,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -700,12 +700,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -716,21 +716,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -773,20 +773,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index de7b03df8a1fbd..95af96b236b77f 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -661,7 +661,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -677,7 +677,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -692,7 +692,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -700,12 +700,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -716,21 +716,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -773,20 +773,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index ced95fbbf73b2d..6edb08405d948f 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -661,7 +661,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -677,7 +677,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -692,7 +692,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -700,12 +700,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -716,21 +716,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -773,20 +773,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index b061252daa615f..bceaeaea4b6677 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -735,7 +735,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -751,7 +751,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -766,7 +766,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -774,12 +774,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -790,21 +790,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -847,20 +847,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 6975bc607bd689..7e5687d169cc1d 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -698,7 +698,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -714,7 +714,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -729,7 +729,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -737,12 +737,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -753,21 +753,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -810,20 +810,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 116b20a3fd8635..56e270ab96126a 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -634,7 +634,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -650,7 +650,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -665,7 +665,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -673,12 +673,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -689,21 +689,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -746,20 +746,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 5e25edb265d61b..d416c526db7b8f 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -661,7 +661,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -677,7 +677,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -692,7 +692,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -700,12 +700,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -716,21 +716,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -773,20 +773,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index 23bc7c11a29833..10e00262daafbb 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -413,7 +413,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -429,7 +429,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -444,7 +444,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -452,12 +452,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -468,21 +468,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -525,20 +525,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index a52f5c0902c5df..53aa0b934f2666 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -729,7 +729,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -745,7 +745,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -760,7 +760,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -768,12 +768,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -784,21 +784,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -841,20 +841,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 98ee9f3aa4344a..3ad8ef98491391 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -661,7 +661,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -677,7 +677,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -692,7 +692,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -700,12 +700,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -716,21 +716,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -773,20 +773,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index a5a3b484743641..49389f4537b4c4 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -586,7 +586,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -602,7 +602,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -617,7 +617,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -625,12 +625,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -641,21 +641,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -698,20 +698,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 70cbdc183183d6..02a2ea6a49c10b 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -586,7 +586,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -602,7 +602,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -617,7 +617,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -625,12 +625,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -641,21 +641,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -698,20 +698,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } 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 cd86ce684438e7..21f44eb0aa564e 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 @@ -573,7 +573,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -589,7 +589,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -604,7 +604,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -612,12 +612,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -628,21 +628,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -685,20 +685,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index 47b4d0c3df0a3e..30bdd0efe899c5 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -715,7 +715,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -731,7 +731,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -746,7 +746,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -754,12 +754,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -770,21 +770,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -827,20 +827,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } 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 d3c365b65e19c3..2d9d75be284751 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 @@ -883,7 +883,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -899,7 +899,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -914,7 +914,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -922,12 +922,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -938,21 +938,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -995,20 +995,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } 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 4430a35d729033..66c6f0ed1c6db3 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -743,7 +743,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -759,7 +759,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -774,7 +774,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -782,12 +782,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -798,21 +798,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -855,20 +855,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } 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 d535e9438f8773..c8bc18787d3d9b 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -743,7 +743,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -759,7 +759,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -774,7 +774,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -782,12 +782,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -798,21 +798,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -855,20 +855,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 47b3d43e5d8bee..d92513f33fbdf7 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -887,7 +887,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -903,7 +903,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -918,7 +918,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -926,12 +926,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -942,21 +942,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -999,20 +999,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 685fac309473ba..5fadd12aa95524 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -677,7 +677,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -693,7 +693,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -708,7 +708,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -716,12 +716,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -732,21 +732,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -783,20 +783,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index a35c1e768cc3a7..7d1f79bdbb00c0 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -687,7 +687,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -703,7 +703,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -718,7 +718,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -726,12 +726,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -742,21 +742,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -793,20 +793,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } 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 5467cc7eae1ef4..e2b5cc34badfb1 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -908,7 +908,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -924,7 +924,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -939,7 +939,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -947,12 +947,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -963,21 +963,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -1020,20 +1020,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } 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 96d954f3260c02..0f32ee174a5492 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -887,7 +887,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -903,7 +903,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -918,7 +918,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -926,12 +926,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -942,21 +942,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -999,20 +999,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 7e46fae3f0c759..2c8c6be90fdcf1 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -790,7 +790,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -806,7 +806,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -821,7 +821,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -829,12 +829,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -845,21 +845,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -902,20 +902,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 4c3ae95812698a..dd28561f133574 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -296,7 +296,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -312,7 +312,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -327,7 +327,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -335,12 +335,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -351,21 +351,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -402,20 +402,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index a4ade38fb2501e..fa3d4a2500e107 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -521,7 +521,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -537,7 +537,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -552,7 +552,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -560,12 +560,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -576,21 +576,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -627,20 +627,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index db613805340dbd..410eaa08d2c140 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -148,7 +148,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -164,7 +164,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -179,7 +179,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -187,12 +187,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -203,12 +203,12 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } @@ -252,20 +252,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } 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 4f407e54227139..df335e0d320d33 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 @@ -453,7 +453,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -469,7 +469,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -484,7 +484,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -492,12 +492,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -508,21 +508,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -565,20 +565,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } 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 6a99553a571ba7..f25d1a815d47e2 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 @@ -635,7 +635,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -651,7 +651,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -666,7 +666,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -674,12 +674,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -690,21 +690,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -747,20 +747,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 9e807c1f1e3056..8c93457f717351 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1384,7 +1384,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -1400,7 +1400,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -1415,7 +1415,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -1423,12 +1423,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -1439,21 +1439,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -1496,20 +1496,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index b8b0e9e19de999..e16c1091235c08 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1343,7 +1343,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -1359,7 +1359,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -1374,7 +1374,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -1382,12 +1382,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -1398,21 +1398,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -1455,20 +1455,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 587ae240c6df22..4ce98fbb11bfa8 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -607,7 +607,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -623,7 +623,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -638,7 +638,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -646,12 +646,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -662,21 +662,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -713,20 +713,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } 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 a93cfc43db1268..0fbcef5fa10230 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 @@ -532,7 +532,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -548,7 +548,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -563,7 +563,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -571,12 +571,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -587,21 +587,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -638,20 +638,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } 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 46f65cfdc10cd0..a31d294fe8cee4 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -333,7 +333,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -349,7 +349,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -364,7 +364,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -372,12 +372,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -388,21 +388,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -440,20 +440,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index bf4da8b17df22d..e6ede801cbf654 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -781,7 +781,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -797,7 +797,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -812,7 +812,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -820,12 +820,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -836,21 +836,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -893,20 +893,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index ec510c202a0520..cdaa948be8c6e5 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -661,7 +661,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ client cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -677,7 +677,7 @@ client cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -692,7 +692,7 @@ client cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -700,12 +700,12 @@ client cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -716,21 +716,21 @@ client cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute optional int8u scanMaxTimeSeconds = 2; readonly attribute optional int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -746,10 +746,10 @@ client cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } request struct AddOrUpdateWiFiNetworkRequest { @@ -769,7 +769,7 @@ client cluster NetworkCommissioning = 49 { } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } @@ -780,7 +780,7 @@ client cluster NetworkCommissioning = 49 { } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } @@ -807,7 +807,7 @@ client cluster NetworkCommissioning = 49 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -823,7 +823,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -838,7 +838,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -846,12 +846,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -862,21 +862,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -919,20 +919,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } 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 3e6fd12e239eec..6601e6323b99c0 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 @@ -684,7 +684,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -700,7 +700,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -715,7 +715,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -723,12 +723,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -739,21 +739,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -796,20 +796,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 4cc2e2a7941789..0044b60f094e5b 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -947,7 +947,7 @@ server cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ server cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -963,7 +963,7 @@ server cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -978,7 +978,7 @@ server cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -986,12 +986,12 @@ server cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -1002,21 +1002,21 @@ server cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute int8u scanMaxTimeSeconds = 2; readonly attribute int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -1059,20 +1059,20 @@ server cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 91a84e3ebdd29c..122e8dff8a6234 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1481,7 +1481,7 @@ client cluster GeneralCommissioning = 48 { /** Functionality to configure, enable, disable network credentials and access on a Matter device. */ client cluster NetworkCommissioning = 49 { - enum NetworkCommissioningStatus : ENUM8 { + enum NetworkCommissioningStatusEnum : ENUM8 { kSuccess = 0; kOutOfRange = 1; kBoundsExceeded = 2; @@ -1497,7 +1497,7 @@ client cluster NetworkCommissioning = 49 { kUnknownError = 12; } - enum WiFiBand : ENUM8 { + enum WiFiBandEnum : ENUM8 { k2g4 = 0; k3g65 = 1; k5g = 2; @@ -1512,7 +1512,7 @@ client cluster NetworkCommissioning = 49 { kEthernetNetworkInterface = 0x4; } - bitmap WiFiSecurity : BITMAP8 { + bitmap WiFiSecurityBitmap : BITMAP8 { kUnencrypted = 0x1; kWep = 0x2; kWpaPersonal = 0x4; @@ -1520,12 +1520,12 @@ client cluster NetworkCommissioning = 49 { kWpa3Personal = 0x10; } - struct NetworkInfo { + struct NetworkInfoStruct { octet_string<32> networkID = 0; boolean connected = 1; } - struct ThreadInterfaceScanResult { + struct ThreadInterfaceScanResultStruct { int16u panId = 0; int64u extendedPanId = 1; char_string<16> networkName = 2; @@ -1536,21 +1536,21 @@ client cluster NetworkCommissioning = 49 { int8u lqi = 7; } - struct WiFiInterfaceScanResult { - WiFiSecurity security = 0; + struct WiFiInterfaceScanResultStruct { + WiFiSecurityBitmap security = 0; octet_string<32> ssid = 1; octet_string<6> bssid = 2; int16u channel = 3; - WiFiBand wiFiBand = 4; + WiFiBandEnum wiFiBand = 4; int8s rssi = 5; } readonly attribute access(read: administer) int8u maxNetworks = 0; - readonly attribute access(read: administer) NetworkInfo networks[] = 1; + readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1; readonly attribute optional int8u scanMaxTimeSeconds = 2; readonly attribute optional int8u connectMaxTimeSeconds = 3; attribute access(write: administer) boolean interfaceEnabled = 4; - readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5; + readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5; readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6; readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7; readonly attribute command_id generatedCommandList[] = 65528; @@ -1566,10 +1566,10 @@ client cluster NetworkCommissioning = 49 { } response struct ScanNetworksResponse = 1 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2; + optional ThreadInterfaceScanResultStruct threadScanResults[] = 3; } request struct AddOrUpdateWiFiNetworkRequest { @@ -1589,7 +1589,7 @@ client cluster NetworkCommissioning = 49 { } response struct NetworkConfigResponse = 5 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING<512> debugText = 1; optional INT8U networkIndex = 2; } @@ -1600,7 +1600,7 @@ client cluster NetworkCommissioning = 49 { } response struct ConnectNetworkResponse = 7 { - NetworkCommissioningStatus networkingStatus = 0; + NetworkCommissioningStatusEnum networkingStatus = 0; optional CHAR_STRING debugText = 1; nullable INT32S errorValue = 2; } diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 20146f9072973c..b01814f5a9a2c4 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -5461,23 +5461,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR newElement_0_connectedCtorSignature.c_str(), entry_0.connected, newElement_0_connected); - jclass networkInfoStructClass_1; + jclass networkInfoStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterNetworkInfo", networkInfoStructClass_1); + env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterNetworkInfoStruct", + networkInfoStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterNetworkInfo"); + ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterNetworkInfoStruct"); return nullptr; } - jmethodID networkInfoStructCtor_1 = - env->GetMethodID(networkInfoStructClass_1, "", "([BLjava/lang/Boolean;)V"); - if (networkInfoStructCtor_1 == nullptr) + jmethodID networkInfoStructStructCtor_1 = + env->GetMethodID(networkInfoStructStructClass_1, "", "([BLjava/lang/Boolean;)V"); + if (networkInfoStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterNetworkInfo constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterNetworkInfoStruct constructor"); return nullptr; } - newElement_0 = env->NewObject(networkInfoStructClass_1, networkInfoStructCtor_1, newElement_0_networkID, + newElement_0 = env->NewObject(networkInfoStructStructClass_1, networkInfoStructStructCtor_1, newElement_0_networkID, newElement_0_connected); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index fa97d315711e4b..6edbeeb3e9f028 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -1773,25 +1773,26 @@ void CHIPNetworkCommissioningClusterScanNetworksResponseCallback::CallbackFn( chip::JniReferences::GetInstance().CreateBoxedObject( newElement_1_rssiClassName.c_str(), newElement_1_rssiCtorSignature.c_str(), entry_1.rssi, newElement_1_rssi); - jclass wiFiInterfaceScanResultStructClass_2; + jclass wiFiInterfaceScanResultStructStructClass_2; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterWiFiInterfaceScanResult", - wiFiInterfaceScanResultStructClass_2); + env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterWiFiInterfaceScanResultStruct", + wiFiInterfaceScanResultStructStructClass_2); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterWiFiInterfaceScanResult"); + ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterWiFiInterfaceScanResultStruct"); return; } - jmethodID wiFiInterfaceScanResultStructCtor_2 = - env->GetMethodID(wiFiInterfaceScanResultStructClass_2, "", + jmethodID wiFiInterfaceScanResultStructStructCtor_2 = + env->GetMethodID(wiFiInterfaceScanResultStructStructClass_2, "", "(Ljava/lang/Integer;[B[BLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V"); - if (wiFiInterfaceScanResultStructCtor_2 == nullptr) + if (wiFiInterfaceScanResultStructStructCtor_2 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterWiFiInterfaceScanResult constructor"); + ChipLogError(Zcl, + "Could not find ChipStructs$NetworkCommissioningClusterWiFiInterfaceScanResultStruct constructor"); return; } - newElement_1 = env->NewObject(wiFiInterfaceScanResultStructClass_2, wiFiInterfaceScanResultStructCtor_2, + newElement_1 = env->NewObject(wiFiInterfaceScanResultStructStructClass_2, wiFiInterfaceScanResultStructStructCtor_2, newElement_1_security, newElement_1_ssid, newElement_1_bssid, newElement_1_channel, newElement_1_wiFiBand, newElement_1_rssi); chip::JniReferences::GetInstance().AddToList(WiFiScanResultsInsideOptional, newElement_1); @@ -1855,29 +1856,30 @@ void CHIPNetworkCommissioningClusterScanNetworksResponseCallback::CallbackFn( chip::JniReferences::GetInstance().CreateBoxedObject( newElement_1_lqiClassName.c_str(), newElement_1_lqiCtorSignature.c_str(), entry_1.lqi, newElement_1_lqi); - jclass threadInterfaceScanResultStructClass_2; + jclass threadInterfaceScanResultStructStructClass_2; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterThreadInterfaceScanResult", - threadInterfaceScanResultStructClass_2); + env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterThreadInterfaceScanResultStruct", + threadInterfaceScanResultStructStructClass_2); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterThreadInterfaceScanResult"); + ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterThreadInterfaceScanResultStruct"); return; } - jmethodID threadInterfaceScanResultStructCtor_2 = - env->GetMethodID(threadInterfaceScanResultStructClass_2, "", + jmethodID threadInterfaceScanResultStructStructCtor_2 = + env->GetMethodID(threadInterfaceScanResultStructStructClass_2, "", "(Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/" "Integer;[BLjava/lang/Integer;Ljava/lang/Integer;)V"); - if (threadInterfaceScanResultStructCtor_2 == nullptr) + if (threadInterfaceScanResultStructStructCtor_2 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterThreadInterfaceScanResult constructor"); + ChipLogError(Zcl, + "Could not find ChipStructs$NetworkCommissioningClusterThreadInterfaceScanResultStruct constructor"); return; } newElement_1 = - env->NewObject(threadInterfaceScanResultStructClass_2, threadInterfaceScanResultStructCtor_2, newElement_1_panId, - newElement_1_extendedPanId, newElement_1_networkName, newElement_1_channel, newElement_1_version, - newElement_1_extendedAddress, newElement_1_rssi, newElement_1_lqi); + env->NewObject(threadInterfaceScanResultStructStructClass_2, threadInterfaceScanResultStructStructCtor_2, + newElement_1_panId, newElement_1_extendedPanId, newElement_1_networkName, newElement_1_channel, + newElement_1_version, newElement_1_extendedAddress, newElement_1_rssi, newElement_1_lqi); chip::JniReferences::GetInstance().AddToList(ThreadScanResultsInsideOptional, newElement_1); } chip::JniReferences::GetInstance().CreateOptional(ThreadScanResultsInsideOptional, ThreadScanResults); diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 21aec3904f968c..f27d12c65b2ab8 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -9293,8 +9293,8 @@ CHIPNetworkCommissioningNetworksAttributeCallback::~CHIPNetworkCommissioningNetw void CHIPNetworkCommissioningNetworksAttributeCallback::CallbackFn( void * context, - const chip::app::DataModel::DecodableList & - list) + const chip::app::DataModel::DecodableList< + chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::DecodableType> & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -9335,23 +9335,24 @@ void CHIPNetworkCommissioningNetworksAttributeCallback::CallbackFn( newElement_0_connectedCtorSignature.c_str(), entry_0.connected, newElement_0_connected); - jclass networkInfoStructClass_1; + jclass networkInfoStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterNetworkInfo", networkInfoStructClass_1); + env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterNetworkInfoStruct", networkInfoStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterNetworkInfo"); + ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterNetworkInfoStruct"); return; } - jmethodID networkInfoStructCtor_1 = env->GetMethodID(networkInfoStructClass_1, "", "([BLjava/lang/Boolean;)V"); - if (networkInfoStructCtor_1 == nullptr) + jmethodID networkInfoStructStructCtor_1 = + env->GetMethodID(networkInfoStructStructClass_1, "", "([BLjava/lang/Boolean;)V"); + if (networkInfoStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterNetworkInfo constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterNetworkInfoStruct constructor"); return; } - newElement_0 = - env->NewObject(networkInfoStructClass_1, networkInfoStructCtor_1, newElement_0_networkID, newElement_0_connected); + newElement_0 = env->NewObject(networkInfoStructStructClass_1, networkInfoStructStructCtor_1, newElement_0_networkID, + newElement_0_connected); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } @@ -9391,7 +9392,7 @@ CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback::~CHIPNetworkCommi void CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback::CallbackFn( void * context, - const chip::app::DataModel::Nullable & value) + const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index ea9efbb960d7f7..e8125bf824672e 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -6734,7 +6734,7 @@ private native void reorderNetwork(long chipClusterPtr, NetworkConfigResponseCal , byte[] networkID, Integer networkIndex, Optional breadcrumb , @Nullable Integer timedInvokeTimeoutMs); public interface ScanNetworksResponseCallback { - void onSuccess(Integer networkingStatus, Optional debugText, Optional> wiFiScanResults, Optional> threadScanResults); + void onSuccess(Integer networkingStatus, Optional debugText, Optional> wiFiScanResults, Optional> threadScanResults); void onError(Exception error); } @@ -6753,7 +6753,7 @@ public interface ConnectNetworkResponseCallback { public interface NetworksAttributeCallback { - void onSuccess( List valueList); + void onSuccess( List valueList); void onError(Exception ex); default void onSubscriptionEstablished(long subscriptionId) {} } diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index 2cc49cd990fbd2..98f6168c19e60c 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -540,11 +540,11 @@ public String toString() { } } -public static class NetworkCommissioningClusterNetworkInfo { +public static class NetworkCommissioningClusterNetworkInfoStruct { public byte[] networkID; public Boolean connected; - public NetworkCommissioningClusterNetworkInfo( + public NetworkCommissioningClusterNetworkInfoStruct( byte[] networkID , Boolean connected ) { @@ -555,7 +555,7 @@ public NetworkCommissioningClusterNetworkInfo( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("NetworkCommissioningClusterNetworkInfo {\n"); + output.append("NetworkCommissioningClusterNetworkInfoStruct {\n"); output.append("\tnetworkID: "); output.append(Arrays.toString(networkID)); output.append("\n"); @@ -567,7 +567,7 @@ public String toString() { } } -public static class NetworkCommissioningClusterThreadInterfaceScanResult { +public static class NetworkCommissioningClusterThreadInterfaceScanResultStruct { public Integer panId; public Long extendedPanId; public String networkName; @@ -577,7 +577,7 @@ public static class NetworkCommissioningClusterThreadInterfaceScanResult { public Integer rssi; public Integer lqi; - public NetworkCommissioningClusterThreadInterfaceScanResult( + public NetworkCommissioningClusterThreadInterfaceScanResultStruct( Integer panId , Long extendedPanId , String networkName @@ -600,7 +600,7 @@ public NetworkCommissioningClusterThreadInterfaceScanResult( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("NetworkCommissioningClusterThreadInterfaceScanResult {\n"); + output.append("NetworkCommissioningClusterThreadInterfaceScanResultStruct {\n"); output.append("\tpanId: "); output.append(panId); output.append("\n"); @@ -630,7 +630,7 @@ public String toString() { } } -public static class NetworkCommissioningClusterWiFiInterfaceScanResult { +public static class NetworkCommissioningClusterWiFiInterfaceScanResultStruct { public Integer security; public byte[] ssid; public byte[] bssid; @@ -638,7 +638,7 @@ public static class NetworkCommissioningClusterWiFiInterfaceScanResult { public Integer wiFiBand; public Integer rssi; - public NetworkCommissioningClusterWiFiInterfaceScanResult( + public NetworkCommissioningClusterWiFiInterfaceScanResultStruct( Integer security , byte[] ssid , byte[] bssid @@ -657,7 +657,7 @@ public NetworkCommissioningClusterWiFiInterfaceScanResult( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("NetworkCommissioningClusterWiFiInterfaceScanResult {\n"); + output.append("NetworkCommissioningClusterWiFiInterfaceScanResultStruct {\n"); output.append("\tsecurity: "); output.append(security); output.append("\n"); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 712a07424d3dc5..e3215b76b98fd4 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -2843,7 +2843,7 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer NetworkingStatus, Optional DebugText, Optional> WiFiScanResults, Optional> ThreadScanResults) { + public void onSuccess(Integer NetworkingStatus, Optional DebugText, Optional> WiFiScanResults, Optional> ThreadScanResults) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo NetworkingStatusResponseValue = new CommandResponseInfo("NetworkingStatus", "Integer"); responseValues.put(NetworkingStatusResponseValue, NetworkingStatus); @@ -2920,9 +2920,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess( List valueList) { + public void onSuccess( List valueList) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 48717a8f1b5516..2cabdc0001335c 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -7328,11 +7328,11 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="maxNetworks", Tag=0x00000000, Type=uint), - ClusterObjectFieldDescriptor(Label="networks", Tag=0x00000001, Type=typing.List[NetworkCommissioning.Structs.NetworkInfo]), + ClusterObjectFieldDescriptor(Label="networks", Tag=0x00000001, Type=typing.List[NetworkCommissioning.Structs.NetworkInfoStruct]), ClusterObjectFieldDescriptor(Label="scanMaxTimeSeconds", Tag=0x00000002, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="connectMaxTimeSeconds", Tag=0x00000003, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="interfaceEnabled", Tag=0x00000004, Type=bool), - ClusterObjectFieldDescriptor(Label="lastNetworkingStatus", Tag=0x00000005, Type=typing.Union[Nullable, NetworkCommissioning.Enums.NetworkCommissioningStatus]), + ClusterObjectFieldDescriptor(Label="lastNetworkingStatus", Tag=0x00000005, Type=typing.Union[Nullable, NetworkCommissioning.Enums.NetworkCommissioningStatusEnum]), ClusterObjectFieldDescriptor(Label="lastNetworkID", Tag=0x00000006, Type=typing.Union[Nullable, bytes]), ClusterObjectFieldDescriptor(Label="lastConnectErrorValue", Tag=0x00000007, Type=typing.Union[Nullable, int]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), @@ -7344,11 +7344,11 @@ def descriptor(cls) -> ClusterObjectDescriptor: ]) maxNetworks: 'uint' = None - networks: 'typing.List[NetworkCommissioning.Structs.NetworkInfo]' = None + networks: 'typing.List[NetworkCommissioning.Structs.NetworkInfoStruct]' = None scanMaxTimeSeconds: 'typing.Optional[uint]' = None connectMaxTimeSeconds: 'typing.Optional[uint]' = None interfaceEnabled: 'bool' = None - lastNetworkingStatus: 'typing.Union[Nullable, NetworkCommissioning.Enums.NetworkCommissioningStatus]' = None + lastNetworkingStatus: 'typing.Union[Nullable, NetworkCommissioning.Enums.NetworkCommissioningStatusEnum]' = None lastNetworkID: 'typing.Union[Nullable, bytes]' = None lastConnectErrorValue: 'typing.Union[Nullable, int]' = None generatedCommandList: 'typing.List[uint]' = None @@ -7359,7 +7359,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class NetworkCommissioningStatus(MatterIntEnum): + class NetworkCommissioningStatusEnum(MatterIntEnum): kSuccess = 0x00 kOutOfRange = 0x01 kBoundsExceeded = 0x02 @@ -7379,7 +7379,7 @@ class NetworkCommissioningStatus(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 13, - class WiFiBand(MatterIntEnum): + class WiFiBandEnum(MatterIntEnum): k2g4 = 0x00 k3g65 = 0x01 k5g = 0x02 @@ -7398,7 +7398,7 @@ class Feature(IntFlag): kThreadNetworkInterface = 0x2 kEthernetNetworkInterface = 0x4 - class WiFiSecurity(IntFlag): + class WiFiSecurityBitmap(IntFlag): kUnencrypted = 0x1 kWep = 0x2 kWpaPersonal = 0x4 @@ -7407,7 +7407,7 @@ class WiFiSecurity(IntFlag): class Structs: @dataclass - class NetworkInfo(ClusterObject): + class NetworkInfoStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -7420,7 +7420,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: connected: 'bool' = False @dataclass - class ThreadInterfaceScanResult(ClusterObject): + class ThreadInterfaceScanResultStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -7445,7 +7445,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: lqi: 'uint' = 0 @dataclass - class WiFiInterfaceScanResult(ClusterObject): + class WiFiInterfaceScanResultStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -7454,7 +7454,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="ssid", Tag=1, Type=bytes), ClusterObjectFieldDescriptor(Label="bssid", Tag=2, Type=bytes), ClusterObjectFieldDescriptor(Label="channel", Tag=3, Type=uint), - ClusterObjectFieldDescriptor(Label="wiFiBand", Tag=4, Type=NetworkCommissioning.Enums.WiFiBand), + ClusterObjectFieldDescriptor(Label="wiFiBand", Tag=4, Type=NetworkCommissioning.Enums.WiFiBandEnum), ClusterObjectFieldDescriptor(Label="rssi", Tag=5, Type=int), ]) @@ -7462,7 +7462,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ssid: 'bytes' = b"" bssid: 'bytes' = b"" channel: 'uint' = 0 - wiFiBand: 'NetworkCommissioning.Enums.WiFiBand' = 0 + wiFiBand: 'NetworkCommissioning.Enums.WiFiBandEnum' = 0 rssi: 'int' = 0 class Commands: @@ -7495,16 +7495,16 @@ class ScanNetworksResponse(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="networkingStatus", Tag=0, Type=NetworkCommissioning.Enums.NetworkCommissioningStatus), + ClusterObjectFieldDescriptor(Label="networkingStatus", Tag=0, Type=NetworkCommissioning.Enums.NetworkCommissioningStatusEnum), ClusterObjectFieldDescriptor(Label="debugText", Tag=1, Type=typing.Optional[str]), - ClusterObjectFieldDescriptor(Label="wiFiScanResults", Tag=2, Type=typing.Optional[typing.List[NetworkCommissioning.Structs.WiFiInterfaceScanResult]]), - ClusterObjectFieldDescriptor(Label="threadScanResults", Tag=3, Type=typing.Optional[typing.List[NetworkCommissioning.Structs.ThreadInterfaceScanResult]]), + ClusterObjectFieldDescriptor(Label="wiFiScanResults", Tag=2, Type=typing.Optional[typing.List[NetworkCommissioning.Structs.WiFiInterfaceScanResultStruct]]), + ClusterObjectFieldDescriptor(Label="threadScanResults", Tag=3, Type=typing.Optional[typing.List[NetworkCommissioning.Structs.ThreadInterfaceScanResultStruct]]), ]) - networkingStatus: 'NetworkCommissioning.Enums.NetworkCommissioningStatus' = 0 + networkingStatus: 'NetworkCommissioning.Enums.NetworkCommissioningStatusEnum' = 0 debugText: 'typing.Optional[str]' = None - wiFiScanResults: 'typing.Optional[typing.List[NetworkCommissioning.Structs.WiFiInterfaceScanResult]]' = None - threadScanResults: 'typing.Optional[typing.List[NetworkCommissioning.Structs.ThreadInterfaceScanResult]]' = None + wiFiScanResults: 'typing.Optional[typing.List[NetworkCommissioning.Structs.WiFiInterfaceScanResultStruct]]' = None + threadScanResults: 'typing.Optional[typing.List[NetworkCommissioning.Structs.ThreadInterfaceScanResultStruct]]' = None @dataclass class AddOrUpdateWiFiNetwork(ClusterCommand): @@ -7573,12 +7573,12 @@ class NetworkConfigResponse(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="networkingStatus", Tag=0, Type=NetworkCommissioning.Enums.NetworkCommissioningStatus), + ClusterObjectFieldDescriptor(Label="networkingStatus", Tag=0, Type=NetworkCommissioning.Enums.NetworkCommissioningStatusEnum), ClusterObjectFieldDescriptor(Label="debugText", Tag=1, Type=typing.Optional[str]), ClusterObjectFieldDescriptor(Label="networkIndex", Tag=2, Type=typing.Optional[uint]), ]) - networkingStatus: 'NetworkCommissioning.Enums.NetworkCommissioningStatus' = 0 + networkingStatus: 'NetworkCommissioning.Enums.NetworkCommissioningStatusEnum' = 0 debugText: 'typing.Optional[str]' = None networkIndex: 'typing.Optional[uint]' = None @@ -7611,12 +7611,12 @@ class ConnectNetworkResponse(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="networkingStatus", Tag=0, Type=NetworkCommissioning.Enums.NetworkCommissioningStatus), + ClusterObjectFieldDescriptor(Label="networkingStatus", Tag=0, Type=NetworkCommissioning.Enums.NetworkCommissioningStatusEnum), ClusterObjectFieldDescriptor(Label="debugText", Tag=1, Type=typing.Optional[str]), ClusterObjectFieldDescriptor(Label="errorValue", Tag=2, Type=typing.Union[Nullable, int]), ]) - networkingStatus: 'NetworkCommissioning.Enums.NetworkCommissioningStatus' = 0 + networkingStatus: 'NetworkCommissioning.Enums.NetworkCommissioningStatusEnum' = 0 debugText: 'typing.Optional[str]' = None errorValue: 'typing.Union[Nullable, int]' = NullValue @@ -7669,9 +7669,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[NetworkCommissioning.Structs.NetworkInfo]) + return ClusterObjectFieldDescriptor(Type=typing.List[NetworkCommissioning.Structs.NetworkInfoStruct]) - value: 'typing.List[NetworkCommissioning.Structs.NetworkInfo]' = field(default_factory=lambda: []) + value: 'typing.List[NetworkCommissioning.Structs.NetworkInfoStruct]' = field(default_factory=lambda: []) @dataclass class ScanMaxTimeSeconds(ClusterAttributeDescriptor): @@ -7733,9 +7733,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, NetworkCommissioning.Enums.NetworkCommissioningStatus]) + return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, NetworkCommissioning.Enums.NetworkCommissioningStatusEnum]) - value: 'typing.Union[Nullable, NetworkCommissioning.Enums.NetworkCommissioningStatus]' = NullValue + value: 'typing.Union[Nullable, NetworkCommissioning.Enums.NetworkCommissioningStatusEnum]' = NullValue @dataclass class LastNetworkID(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 729103e3900968..ccf803946f8db9 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -4725,8 +4725,8 @@ static id _Nullable DecodeAttributeValueForNetworkCommissioningCluster( auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRNetworkCommissioningClusterNetworkInfo * newElement_0; - newElement_0 = [MTRNetworkCommissioningClusterNetworkInfo new]; + MTRNetworkCommissioningClusterNetworkInfoStruct * newElement_0; + newElement_0 = [MTRNetworkCommissioningClusterNetworkInfoStruct new]; newElement_0.networkID = AsData(entry_0.networkID); newElement_0.connected = [NSNumber numberWithBool:entry_0.connected]; [array_0 addObject:newElement_0]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index c9e63c2a757c4a..86e87b25d9dfce 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -30946,25 +30946,46 @@ typedef NS_OPTIONS(uint32_t, MTRNetworkCommissioningFeature) { MTRNetworkCommissioningFeatureEthernetNetworkInterface API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_OPTIONS(uint8_t, MTRNetworkCommissioningWiFiSecurityBitmap) { + MTRNetworkCommissioningWiFiSecurityBitmapUnencrypted MTR_NEWLY_AVAILABLE = 0x1, + MTRNetworkCommissioningWiFiSecurityBitmapWEP MTR_NEWLY_AVAILABLE = 0x2, + MTRNetworkCommissioningWiFiSecurityBitmapWPAPersonal MTR_NEWLY_AVAILABLE = 0x4, + MTRNetworkCommissioningWiFiSecurityBitmapWPA2Personal MTR_NEWLY_AVAILABLE = 0x8, + MTRNetworkCommissioningWiFiSecurityBitmapWPA3Personal MTR_NEWLY_AVAILABLE = 0x10, +} MTR_NEWLY_AVAILABLE; + typedef NS_OPTIONS(uint8_t, MTRNetworkCommissioningWiFiSecurity) { - MTRNetworkCommissioningWiFiSecurityUnencrypted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, - MTRNetworkCommissioningWiFiSecurityWEP API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x2, - MTRNetworkCommissioningWiFiSecurityWepPersonal MTR_DEPRECATED("Please use MTRNetworkCommissioningWiFiSecurityWEP", - ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + MTRNetworkCommissioningWiFiSecurityUnencrypted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRNetworkCommissioningWiFiSecurityBitmapUnencrypted") + = 0x1, + MTRNetworkCommissioningWiFiSecurityWEP API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTRNetworkCommissioningWiFiSecurityBitmapWEP") = 0x2, - MTRNetworkCommissioningWiFiSecurityWPAPersonal API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x4, - MTRNetworkCommissioningWiFiSecurityWpaPersonal MTR_DEPRECATED("Please use MTRNetworkCommissioningWiFiSecurityWPAPersonal", + MTRNetworkCommissioningWiFiSecurityWepPersonal MTR_DEPRECATED("Please use MTRNetworkCommissioningWiFiSecurityBitmapWEP", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 0x2, + MTRNetworkCommissioningWiFiSecurityWPAPersonal API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTRNetworkCommissioningWiFiSecurityBitmapWPAPersonal") = 0x4, - MTRNetworkCommissioningWiFiSecurityWPA2Personal API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x8, - MTRNetworkCommissioningWiFiSecurityWpa2Personal MTR_DEPRECATED("Please use MTRNetworkCommissioningWiFiSecurityWPA2Personal", + MTRNetworkCommissioningWiFiSecurityWpaPersonal MTR_DEPRECATED("Please use MTRNetworkCommissioningWiFiSecurityBitmapWPAPersonal", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 0x4, + MTRNetworkCommissioningWiFiSecurityWPA2Personal API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTRNetworkCommissioningWiFiSecurityBitmapWPA2Personal") = 0x8, - MTRNetworkCommissioningWiFiSecurityWPA3Personal API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x10, - MTRNetworkCommissioningWiFiSecurityWpa3Personal MTR_DEPRECATED("Please use MTRNetworkCommissioningWiFiSecurityWPA3Personal", - ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + MTRNetworkCommissioningWiFiSecurityWpa2Personal MTR_DEPRECATED( + "Please use MTRNetworkCommissioningWiFiSecurityBitmapWPA2Personal", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), + tvos(16.1, 16.4)) + = 0x8, + MTRNetworkCommissioningWiFiSecurityWPA3Personal API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTRNetworkCommissioningWiFiSecurityBitmapWPA3Personal") = 0x10, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRNetworkCommissioningWiFiSecurityWpa3Personal MTR_DEPRECATED( + "Please use MTRNetworkCommissioningWiFiSecurityBitmapWPA3Personal", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), + tvos(16.1, 16.4)) + = 0x10, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRNetworkCommissioningWiFiSecurityBitmap"); typedef NS_ENUM(uint8_t, MTRDiagnosticLogsIntent) { MTRDiagnosticLogsIntentEndUserSupport API_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x00, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 60a358fc650369..0a93d5662fc3c7 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -25579,7 +25579,7 @@ - (void)readAttributeLastNetworkingStatusWithCompletion:(void (^)(NSNumber * _Nu { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -25590,7 +25590,7 @@ - (void)subscribeAttributeLastNetworkingStatusWithParams:(MTRSubscribeParams * _ (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -25601,9 +25601,11 @@ + (void)readAttributeLastNetworkingStatusWithClusterStateCache:(MTRClusterStateC completion: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge(queue, completion); + auto * bridge + = new MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(NullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(NullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallback successCb, + MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index fdd8abdd589752..d546e766e6dfc0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -277,13 +277,14 @@ typedef void (*GeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCal void *, chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum); typedef void (*NullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*NetworkCommissioningClusterNetworkCommissioningStatusAttributeCallback)( - void *, chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatus); -typedef void (*NullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*NetworkCommissioningClusterWiFiBandAttributeCallback)(void *, chip::app::Clusters::NetworkCommissioning::WiFiBand); -typedef void (*NullableNetworkCommissioningClusterWiFiBandAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*NetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallback)( + void *, chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum); +typedef void (*NullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*NetworkCommissioningClusterWiFiBandEnumAttributeCallback)(void *, + chip::app::Clusters::NetworkCommissioning::WiFiBandEnum); +typedef void (*NullableNetworkCommissioningClusterWiFiBandEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*DiagnosticLogsClusterIntentEnumAttributeCallback)(void *, chip::app::Clusters::DiagnosticLogs::IntentEnum); typedef void (*NullableDiagnosticLogsClusterIntentEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); @@ -1391,8 +1392,8 @@ typedef void (*GeneralCommissioningAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*NetworkCommissioningNetworksListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & - data); + const chip::app::DataModel::DecodableList< + chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::DecodableType> & data); typedef void (*NetworkCommissioningGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*NetworkCommissioningAcceptedCommandListListAttributeCallback)( @@ -6510,10 +6511,9 @@ class MTRNetworkCommissioningNetworksListAttributeCallbackBridge MTRActionBlock action) : MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn( - void * context, - const chip::app::DataModel::DecodableList & - value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::DecodableList< + chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::DecodableType> & value); }; class MTRNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge @@ -25585,142 +25585,144 @@ class MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeC MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum value); }; -class MTRNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackSubscriptionBridge - : public MTRNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge +class MTRNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackSubscriptionBridge + : public MTRNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge { public: - MTRNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackSubscriptionBridge( + MTRNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge(queue, handler, action), + MTRNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge::OnDone; + using MTRNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge( + queue, handler, action, OnSuccessFn){}; static void OnSuccessFn( void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackSubscriptionBridge - : public MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge +class MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackSubscriptionBridge + : public MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge { public: - MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackSubscriptionBridge( + MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge(queue, handler, action), + MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge::OnDone; + using MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNetworkCommissioningClusterWiFiBandAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNetworkCommissioningClusterWiFiBandAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNetworkCommissioningClusterWiFiBandAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::NetworkCommissioning::WiFiBand value); + static void OnSuccessFn(void * context, chip::app::Clusters::NetworkCommissioning::WiFiBandEnum value); }; -class MTRNetworkCommissioningClusterWiFiBandAttributeCallbackSubscriptionBridge - : public MTRNetworkCommissioningClusterWiFiBandAttributeCallbackBridge +class MTRNetworkCommissioningClusterWiFiBandEnumAttributeCallbackSubscriptionBridge + : public MTRNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge { public: - MTRNetworkCommissioningClusterWiFiBandAttributeCallbackSubscriptionBridge( + MTRNetworkCommissioningClusterWiFiBandEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNetworkCommissioningClusterWiFiBandAttributeCallbackBridge(queue, handler, action), + MTRNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNetworkCommissioningClusterWiFiBandAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNetworkCommissioningClusterWiFiBandAttributeCallbackBridge::OnDone; + using MTRNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableNetworkCommissioningClusterWiFiBandAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableNetworkCommissioningClusterWiFiBandAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableNetworkCommissioningClusterWiFiBandAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableNetworkCommissioningClusterWiFiBandAttributeCallbackSubscriptionBridge - : public MTRNullableNetworkCommissioningClusterWiFiBandAttributeCallbackBridge +class MTRNullableNetworkCommissioningClusterWiFiBandEnumAttributeCallbackSubscriptionBridge + : public MTRNullableNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge { public: - MTRNullableNetworkCommissioningClusterWiFiBandAttributeCallbackSubscriptionBridge( + MTRNullableNetworkCommissioningClusterWiFiBandEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableNetworkCommissioningClusterWiFiBandAttributeCallbackBridge(queue, handler, action), + MTRNullableNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableNetworkCommissioningClusterWiFiBandAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableNetworkCommissioningClusterWiFiBandAttributeCallbackBridge::OnDone; + using MTRNullableNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index f490db43d38b49..7198986eee0a05 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -4657,8 +4657,8 @@ } void MTRNetworkCommissioningNetworksListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList & - value) + const chip::app::DataModel::DecodableList< + chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::DecodableType> & value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -4666,8 +4666,8 @@ auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRNetworkCommissioningClusterNetworkInfo * newElement_0; - newElement_0 = [MTRNetworkCommissioningClusterNetworkInfo new]; + MTRNetworkCommissioningClusterNetworkInfoStruct * newElement_0; + newElement_0 = [MTRNetworkCommissioningClusterNetworkInfoStruct new]; newElement_0.networkID = AsData(entry_0.networkID); newElement_0.connected = [NSNumber numberWithBool:entry_0.connected]; [array_0 addObject:newElement_0]; @@ -25189,15 +25189,15 @@ } } -void MTRNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatus value) +void MTRNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -25212,8 +25212,8 @@ } } -void MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value) +void MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -25224,7 +25224,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackSubscriptionBridge:: +void MTRNullableNetworkCommissioningClusterNetworkCommissioningStatusEnumAttributeCallbackSubscriptionBridge:: OnSubscriptionEstablished() { if (!mQueue) { @@ -25240,15 +25240,15 @@ } } -void MTRNetworkCommissioningClusterWiFiBandAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::NetworkCommissioning::WiFiBand value) +void MTRNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::NetworkCommissioning::WiFiBandEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRNetworkCommissioningClusterWiFiBandAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNetworkCommissioningClusterWiFiBandEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -25263,8 +25263,8 @@ } } -void MTRNullableNetworkCommissioningClusterWiFiBandAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableNetworkCommissioningClusterWiFiBandEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -25275,7 +25275,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableNetworkCommissioningClusterWiFiBandAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableNetworkCommissioningClusterWiFiBandEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 54b2ccaabd56cd..0f7cc9d3233ebd 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -4514,8 +4514,8 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct: auto iter_1 = decodableStruct.wiFiScanResults.Value().begin(); while (iter_1.Next()) { auto & entry_1 = iter_1.GetValue(); - MTRNetworkCommissioningClusterWiFiInterfaceScanResult * newElement_1; - newElement_1 = [MTRNetworkCommissioningClusterWiFiInterfaceScanResult new]; + MTRNetworkCommissioningClusterWiFiInterfaceScanResultStruct * newElement_1; + newElement_1 = [MTRNetworkCommissioningClusterWiFiInterfaceScanResultStruct new]; newElement_1.security = [NSNumber numberWithUnsignedChar:entry_1.security.Raw()]; newElement_1.ssid = AsData(entry_1.ssid); newElement_1.bssid = AsData(entry_1.bssid); @@ -4541,8 +4541,8 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct: auto iter_1 = decodableStruct.threadScanResults.Value().begin(); while (iter_1.Next()) { auto & entry_1 = iter_1.GetValue(); - MTRNetworkCommissioningClusterThreadInterfaceScanResult * newElement_1; - newElement_1 = [MTRNetworkCommissioningClusterThreadInterfaceScanResult new]; + MTRNetworkCommissioningClusterThreadInterfaceScanResultStruct * newElement_1; + newElement_1 = [MTRNetworkCommissioningClusterThreadInterfaceScanResultStruct new]; newElement_1.panId = [NSNumber numberWithUnsignedShort:entry_1.panId]; newElement_1.extendedPanId = [NSNumber numberWithUnsignedLongLong:entry_1.extendedPanId]; newElement_1.networkName = AsString(entry_1.networkName); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 70c25dfb65ac46..5bac17ec0460ad 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -305,32 +305,45 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) NSNumber * _Nonnull maxCumulativeFailsafeSeconds API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end +MTR_NEWLY_AVAILABLE +@interface MTRNetworkCommissioningClusterNetworkInfoStruct : NSObject +@property (nonatomic, copy) NSData * _Nonnull networkID MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull connected MTR_NEWLY_AVAILABLE; +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRNetworkCommissioningClusterNetworkInfo : NSObject -@property (nonatomic, copy) NSData * _Nonnull networkID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull connected API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRNetworkCommissioningClusterNetworkInfoStruct") +@interface MTRNetworkCommissioningClusterNetworkInfo : MTRNetworkCommissioningClusterNetworkInfoStruct +@end +MTR_NEWLY_AVAILABLE +@interface MTRNetworkCommissioningClusterThreadInterfaceScanResultStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull panId MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull extendedPanId MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nonnull networkName MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull channel MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull version MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSData * _Nonnull extendedAddress MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull rssi MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull lqi MTR_NEWLY_AVAILABLE; @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRNetworkCommissioningClusterThreadInterfaceScanResult : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull panId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull extendedPanId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSString * _Nonnull networkName API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull channel API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull version API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSData * _Nonnull extendedAddress API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull rssi API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull lqi API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRNetworkCommissioningClusterThreadInterfaceScanResultStruct") +@interface MTRNetworkCommissioningClusterThreadInterfaceScanResult : MTRNetworkCommissioningClusterThreadInterfaceScanResultStruct +@end +MTR_NEWLY_AVAILABLE +@interface MTRNetworkCommissioningClusterWiFiInterfaceScanResultStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull security MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSData * _Nonnull ssid MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSData * _Nonnull bssid MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull channel MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull wiFiBand MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull rssi MTR_NEWLY_AVAILABLE; @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRNetworkCommissioningClusterWiFiInterfaceScanResult : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull security API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSData * _Nonnull ssid API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSData * _Nonnull bssid API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull channel API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull wiFiBand API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull rssi API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRNetworkCommissioningClusterWiFiInterfaceScanResultStruct") +@interface MTRNetworkCommissioningClusterWiFiInterfaceScanResult : MTRNetworkCommissioningClusterWiFiInterfaceScanResultStruct @end API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 0dc8ce3582f28a..d30dc53a11a5ec 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -1089,7 +1089,7 @@ - (NSString *)description @end -@implementation MTRNetworkCommissioningClusterNetworkInfo +@implementation MTRNetworkCommissioningClusterNetworkInfoStruct - (instancetype)init { if (self = [super init]) { @@ -1103,7 +1103,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRNetworkCommissioningClusterNetworkInfo alloc] init]; + auto other = [[MTRNetworkCommissioningClusterNetworkInfoStruct alloc] init]; other.networkID = self.networkID; other.connected = self.connected; @@ -1121,7 +1121,10 @@ - (NSString *)description @end -@implementation MTRNetworkCommissioningClusterThreadInterfaceScanResult +@implementation MTRNetworkCommissioningClusterNetworkInfo : MTRNetworkCommissioningClusterNetworkInfoStruct +@end + +@implementation MTRNetworkCommissioningClusterThreadInterfaceScanResultStruct - (instancetype)init { if (self = [super init]) { @@ -1147,7 +1150,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRNetworkCommissioningClusterThreadInterfaceScanResult alloc] init]; + auto other = [[MTRNetworkCommissioningClusterThreadInterfaceScanResultStruct alloc] init]; other.panId = self.panId; other.extendedPanId = self.extendedPanId; @@ -1173,7 +1176,11 @@ - (NSString *)description @end -@implementation MTRNetworkCommissioningClusterWiFiInterfaceScanResult +@implementation MTRNetworkCommissioningClusterThreadInterfaceScanResult + : MTRNetworkCommissioningClusterThreadInterfaceScanResultStruct +@end + +@implementation MTRNetworkCommissioningClusterWiFiInterfaceScanResultStruct - (instancetype)init { if (self = [super init]) { @@ -1195,7 +1202,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRNetworkCommissioningClusterWiFiInterfaceScanResult alloc] init]; + auto other = [[MTRNetworkCommissioningClusterWiFiInterfaceScanResultStruct alloc] init]; other.security = self.security; other.ssid = self.ssid; @@ -1218,6 +1225,9 @@ - (NSString *)description @end +@implementation MTRNetworkCommissioningClusterWiFiInterfaceScanResult : MTRNetworkCommissioningClusterWiFiInterfaceScanResultStruct +@end + @implementation MTRGeneralDiagnosticsClusterNetworkInterface - (instancetype)init { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index efd5559e973537..5f24b15d1653dc 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -4419,9 +4419,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value) namespace LastNetworkingStatus { EmberAfStatus Get(chip::EndpointId endpoint, - DataModel::Nullable & value) + DataModel::Nullable & value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, readable, sizeof(temp)); @@ -4436,9 +4436,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, } return status; } -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatus value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -4451,7 +4451,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::NetworkCommiss EmberAfStatus SetNull(chip::EndpointId endpoint) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); @@ -4460,7 +4460,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) EmberAfStatus Set(chip::EndpointId endpoint, - const chip::app::DataModel::Nullable & value) + const chip::app::DataModel::Nullable & value) { if (value.IsNull()) { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 8df76d7b406bc8..d0a536d149e604 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -834,13 +834,13 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value); namespace LastNetworkingStatus { EmberAfStatus Get(chip::EndpointId endpoint, - DataModel::Nullable & - value); // NetworkCommissioningStatus -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatus value); + DataModel::Nullable & + value); // NetworkCommissioningStatusEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum value); EmberAfStatus SetNull(chip::EndpointId endpoint); EmberAfStatus Set(chip::EndpointId endpoint, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); } // namespace LastNetworkingStatus namespace LastNetworkID { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index 500281c430ee03..a89a22f776c552 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -721,9 +721,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralCommissioning::R } } -static auto __attribute__((unused)) EnsureKnownEnumValue(NetworkCommissioning::NetworkCommissioningStatus val) +static auto __attribute__((unused)) EnsureKnownEnumValue(NetworkCommissioning::NetworkCommissioningStatusEnum val) { - using EnumType = NetworkCommissioning::NetworkCommissioningStatus; + using EnumType = NetworkCommissioning::NetworkCommissioningStatusEnum; switch (val) { case EnumType::kSuccess: @@ -744,9 +744,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(NetworkCommissioning::N return static_cast(13); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(NetworkCommissioning::WiFiBand val) +static auto __attribute__((unused)) EnsureKnownEnumValue(NetworkCommissioning::WiFiBandEnum val) { - using EnumType = NetworkCommissioning::WiFiBand; + using EnumType = NetworkCommissioning::WiFiBandEnum; switch (val) { case EnumType::k2g4: 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 81be49547595aa..34679c83ac976a 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 @@ -853,8 +853,8 @@ enum class RegulatoryLocationTypeEnum : uint8_t namespace NetworkCommissioning { -// Enum for NetworkCommissioningStatus -enum class NetworkCommissioningStatus : uint8_t +// Enum for NetworkCommissioningStatusEnum +enum class NetworkCommissioningStatusEnum : uint8_t { kSuccess = 0x00, kOutOfRange = 0x01, @@ -876,8 +876,8 @@ enum class NetworkCommissioningStatus : uint8_t kUnknownEnumValue = 13, }; -// Enum for WiFiBand -enum class WiFiBand : uint8_t +// Enum for WiFiBandEnum +enum class WiFiBandEnum : uint8_t { k2g4 = 0x00, k3g65 = 0x01, @@ -900,8 +900,8 @@ enum class Feature : uint32_t kEthernetNetworkInterface = 0x4, }; -// Bitmap for WiFiSecurity -enum class WiFiSecurity : uint8_t +// Bitmap for WiFiSecurityBitmap +enum class WiFiSecurityBitmap : uint8_t { kUnencrypted = 0x1, kWep = 0x2, diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 67f09f88a33d55..0378afc94fc072 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -5828,7 +5828,7 @@ namespace Events {} // namespace Events } // namespace GeneralCommissioning namespace NetworkCommissioning { namespace Structs { -namespace NetworkInfo { +namespace NetworkInfoStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -5871,8 +5871,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace NetworkInfo -namespace ThreadInterfaceScanResult { +} // namespace NetworkInfoStruct +namespace ThreadInterfaceScanResultStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -5939,8 +5939,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace ThreadInterfaceScanResult -namespace WiFiInterfaceScanResult { +} // namespace ThreadInterfaceScanResultStruct +namespace WiFiInterfaceScanResultStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -5999,7 +5999,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace WiFiInterfaceScanResult +} // namespace WiFiInterfaceScanResultStruct } // namespace Structs namespace Commands { 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 aba1eeef7cdc8d..34b97f7d04dc8f 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 @@ -7119,7 +7119,7 @@ struct TypeInfo } // namespace GeneralCommissioning namespace NetworkCommissioning { namespace Structs { -namespace NetworkInfo { +namespace NetworkInfoStruct { enum class Fields : uint8_t { kNetworkID = 0, @@ -7141,8 +7141,8 @@ struct Type using DecodableType = Type; -} // namespace NetworkInfo -namespace ThreadInterfaceScanResult { +} // namespace NetworkInfoStruct +namespace ThreadInterfaceScanResultStruct { enum class Fields : uint8_t { kPanId = 0, @@ -7176,8 +7176,8 @@ struct Type using DecodableType = Type; -} // namespace ThreadInterfaceScanResult -namespace WiFiInterfaceScanResult { +} // namespace ThreadInterfaceScanResultStruct +namespace WiFiInterfaceScanResultStruct { enum class Fields : uint8_t { kSecurity = 0, @@ -7191,12 +7191,12 @@ enum class Fields : uint8_t struct Type { public: - chip::BitMask security = static_cast>(0); + chip::BitMask security = static_cast>(0); chip::ByteSpan ssid; chip::ByteSpan bssid; - uint16_t channel = static_cast(0); - WiFiBand wiFiBand = static_cast(0); - int8_t rssi = static_cast(0); + uint16_t channel = static_cast(0); + WiFiBandEnum wiFiBand = static_cast(0); + int8_t rssi = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -7207,7 +7207,7 @@ struct Type using DecodableType = Type; -} // namespace WiFiInterfaceScanResult +} // namespace WiFiInterfaceScanResultStruct } // namespace Structs namespace Commands { @@ -7312,10 +7312,10 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::ScanNetworksResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; } - NetworkCommissioningStatus networkingStatus = static_cast(0); + NetworkCommissioningStatusEnum networkingStatus = static_cast(0); Optional debugText; - Optional> wiFiScanResults; - Optional> threadScanResults; + Optional> wiFiScanResults; + Optional> threadScanResults; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -7330,10 +7330,10 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::ScanNetworksResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; } - NetworkCommissioningStatus networkingStatus = static_cast(0); + NetworkCommissioningStatusEnum networkingStatus = static_cast(0); Optional debugText; - Optional> wiFiScanResults; - Optional> threadScanResults; + Optional> wiFiScanResults; + Optional> threadScanResults; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace ScanNetworksResponse @@ -7460,7 +7460,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::NetworkConfigResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; } - NetworkCommissioningStatus networkingStatus = static_cast(0); + NetworkCommissioningStatusEnum networkingStatus = static_cast(0); Optional debugText; Optional networkIndex; @@ -7477,7 +7477,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::NetworkConfigResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; } - NetworkCommissioningStatus networkingStatus = static_cast(0); + NetworkCommissioningStatusEnum networkingStatus = static_cast(0); Optional debugText; Optional networkIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -7533,7 +7533,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::ConnectNetworkResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; } - NetworkCommissioningStatus networkingStatus = static_cast(0); + NetworkCommissioningStatusEnum networkingStatus = static_cast(0); Optional debugText; DataModel::Nullable errorValue; @@ -7550,7 +7550,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::ConnectNetworkResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; } - NetworkCommissioningStatus networkingStatus = static_cast(0); + NetworkCommissioningStatusEnum networkingStatus = static_cast(0); Optional debugText; DataModel::Nullable errorValue; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -7613,11 +7613,11 @@ struct TypeInfo namespace Networks { struct TypeInfo { - using Type = chip::app::DataModel::List; + using Type = chip::app::DataModel::List; using DecodableType = - chip::app::DataModel::DecodableList; - using DecodableArgType = - const chip::app::DataModel::DecodableList &; + chip::app::DataModel::DecodableList; + using DecodableArgType = const chip::app::DataModel::DecodableList< + chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::DecodableType> &; static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::Networks::Id; } @@ -7663,10 +7663,10 @@ struct TypeInfo namespace LastNetworkingStatus { struct TypeInfo { - using Type = chip::app::DataModel::Nullable; - using DecodableType = chip::app::DataModel::Nullable; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = - const chip::app::DataModel::Nullable &; + const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::LastNetworkingStatus::Id; } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index eaf746fd85c26d..5390d069693ec9 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -12354,7 +12354,7 @@ void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCo make_unique>(Id, "max-networks", 0, UINT8_MAX, Attributes::MaxNetworks::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( + chip::app::DataModel::List>>( Id, "networks", Attributes::Networks::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "scan-max-time-seconds", 0, UINT8_MAX, Attributes::ScanMaxTimeSeconds::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // @@ -12362,8 +12362,8 @@ void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCo WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "interface-enabled", 0, 1, Attributes::InterfaceEnabled::Id, WriteCommandType::kWrite, credsIssuerConfig), // - make_unique< - WriteAttribute>>( + make_unique>>( Id, "last-networking-status", 0, UINT8_MAX, Attributes::LastNetworkingStatus::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 3240478c70981e..1c7d42b21646c9 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -635,7 +635,7 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::GeneralCommissioning:: } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::Type & request, + chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -644,9 +644,9 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, Json::Value valueCopy(value); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("NetworkInfo.networkID", "networkID", value.isMember("networkID"))); + ComplexArgumentParser::EnsureMemberExist("NetworkInfoStruct.networkID", "networkID", value.isMember("networkID"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("NetworkInfo.connected", "connected", value.isMember("connected"))); + ComplexArgumentParser::EnsureMemberExist("NetworkInfoStruct.connected", "connected", value.isMember("connected"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "networkID"); @@ -660,7 +660,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } -void ComplexArgumentParser::Finalize(chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::Type & request) { ComplexArgumentParser::Finalize(request.networkID); ComplexArgumentParser::Finalize(request.connected); @@ -668,7 +668,7 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::NetworkCommissioning:: CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResult::Type & request, + chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResultStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -677,20 +677,21 @@ ComplexArgumentParser::Setup(const char * label, Json::Value valueCopy(value); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResult.panId", "panId", value.isMember("panId"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResult.extendedPanId", "extendedPanId", + ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResultStruct.panId", "panId", value.isMember("panId"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResultStruct.extendedPanId", "extendedPanId", value.isMember("extendedPanId"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResult.networkName", "networkName", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResultStruct.networkName", "networkName", value.isMember("networkName"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResult.channel", "channel", value.isMember("channel"))); + ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResultStruct.channel", "channel", value.isMember("channel"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResult.version", "version", value.isMember("version"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResult.extendedAddress", "extendedAddress", - value.isMember("extendedAddress"))); + ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResultStruct.version", "version", value.isMember("version"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResultStruct.extendedAddress", + "extendedAddress", value.isMember("extendedAddress"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResult.rssi", "rssi", value.isMember("rssi"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResult.lqi", "lqi", value.isMember("lqi"))); + ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResultStruct.rssi", "rssi", value.isMember("rssi"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("ThreadInterfaceScanResultStruct.lqi", "lqi", value.isMember("lqi"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "panId"); @@ -728,7 +729,8 @@ ComplexArgumentParser::Setup(const char * label, return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } -void ComplexArgumentParser::Finalize(chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResult::Type & request) +void ComplexArgumentParser::Finalize( + chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResultStruct::Type & request) { ComplexArgumentParser::Finalize(request.panId); ComplexArgumentParser::Finalize(request.extendedPanId); @@ -740,9 +742,10 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::NetworkCommissioning:: ComplexArgumentParser::Finalize(request.lqi); } -CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::NetworkCommissioning::Structs::WiFiInterfaceScanResult::Type & request, - Json::Value & value) +CHIP_ERROR +ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::NetworkCommissioning::Structs::WiFiInterfaceScanResultStruct::Type & request, + Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -750,15 +753,17 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, Json::Value valueCopy(value); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("WiFiInterfaceScanResult.security", "security", value.isMember("security"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("WiFiInterfaceScanResult.ssid", "ssid", value.isMember("ssid"))); + ComplexArgumentParser::EnsureMemberExist("WiFiInterfaceScanResultStruct.security", "security", value.isMember("security"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("WiFiInterfaceScanResultStruct.ssid", "ssid", value.isMember("ssid"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("WiFiInterfaceScanResult.bssid", "bssid", value.isMember("bssid"))); + ComplexArgumentParser::EnsureMemberExist("WiFiInterfaceScanResultStruct.bssid", "bssid", value.isMember("bssid"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("WiFiInterfaceScanResult.channel", "channel", value.isMember("channel"))); + ComplexArgumentParser::EnsureMemberExist("WiFiInterfaceScanResultStruct.channel", "channel", value.isMember("channel"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("WiFiInterfaceScanResult.wiFiBand", "wiFiBand", value.isMember("wiFiBand"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("WiFiInterfaceScanResult.rssi", "rssi", value.isMember("rssi"))); + ComplexArgumentParser::EnsureMemberExist("WiFiInterfaceScanResultStruct.wiFiBand", "wiFiBand", value.isMember("wiFiBand"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("WiFiInterfaceScanResultStruct.rssi", "rssi", value.isMember("rssi"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "security"); @@ -788,7 +793,8 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } -void ComplexArgumentParser::Finalize(chip::app::Clusters::NetworkCommissioning::Structs::WiFiInterfaceScanResult::Type & request) +void ComplexArgumentParser::Finalize( + chip::app::Clusters::NetworkCommissioning::Structs::WiFiInterfaceScanResultStruct::Type & request) { ComplexArgumentParser::Finalize(request.security); ComplexArgumentParser::Finalize(request.ssid); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index 3393c805021af6..488c251002950a 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -105,22 +105,22 @@ static CHIP_ERROR Setup(const char * label, static void Finalize(chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::Type & request); +static void Finalize(chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::Type & request); static CHIP_ERROR Setup(const char * label, - chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResult::Type & request, + chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResultStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResult::Type & request); +static void Finalize(chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResultStruct::Type & request); static CHIP_ERROR Setup(const char * label, - chip::app::Clusters::NetworkCommissioning::Structs::WiFiInterfaceScanResult::Type & request, + chip::app::Clusters::NetworkCommissioning::Structs::WiFiInterfaceScanResultStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::NetworkCommissioning::Structs::WiFiInterfaceScanResult::Type & request); +static void Finalize(chip::app::Clusters::NetworkCommissioning::Structs::WiFiInterfaceScanResultStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::Type & request, Json::Value & value); 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 4336af498a6948..7baf833c70ceeb 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -541,8 +541,9 @@ DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType & value) +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -568,7 +569,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, CHIP_ERROR DataModelLogger::LogValue( const char * label, size_t indent, - const chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResult::DecodableType & value) + const chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResultStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -640,9 +641,9 @@ CHIP_ERROR DataModelLogger::LogValue( return CHIP_NO_ERROR; } -CHIP_ERROR -DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::NetworkCommissioning::Structs::WiFiInterfaceScanResult::DecodableType & value) +CHIP_ERROR DataModelLogger::LogValue( + const char * label, size_t indent, + const chip::app::Clusters::NetworkCommissioning::Structs::WiFiInterfaceScanResultStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -6211,7 +6212,8 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("MaxNetworks", 1, value); } case NetworkCommissioning::Attributes::Networks::Id: { - chip::app::DataModel::DecodableList + chip::app::DataModel::DecodableList< + chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::DecodableType> value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Networks", 1, value); @@ -6232,7 +6234,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("InterfaceEnabled", 1, value); } case NetworkCommissioning::Attributes::LastNetworkingStatus::Id: { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("LastNetworkingStatus", 1, value); } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index 62a813d1242ef7..a4cac40d0bef41 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -69,15 +69,15 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType & value); + const chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResult::DecodableType & value); + const chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResultStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::NetworkCommissioning::Structs::WiFiInterfaceScanResult::DecodableType & value); + const chip::app::Clusters::NetworkCommissioning::Structs::WiFiInterfaceScanResultStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType & value);