Skip to content

Commit

Permalink
Regenerate generated code.
Browse files Browse the repository at this point in the history
  • Loading branch information
bzbarsky-apple committed May 31, 2023
1 parent 82c37da commit e6c4ce7
Show file tree
Hide file tree
Showing 75 changed files with 1,123 additions and 1,063 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1343,7 +1343,7 @@ server cluster NetworkCommissioning = 49 {
kUnknownError = 12;
}

enum WiFiBand : ENUM8 {
enum WiFiBandEnum : ENUM8 {
k2g4 = 0;
k3g65 = 1;
k5g = 2;
Expand All @@ -1358,20 +1358,20 @@ server cluster NetworkCommissioning = 49 {
kEthernetNetworkInterface = 0x4;
}

bitmap WiFiSecurity : BITMAP8 {
bitmap WiFiSecurityBitmap : BITMAP8 {
kUnencrypted = 0x1;
kWep = 0x2;
kWpaPersonal = 0x4;
kWpa2Personal = 0x8;
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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1199,7 +1199,7 @@ server cluster NetworkCommissioning = 49 {
kUnknownError = 12;
}

enum WiFiBand : ENUM8 {
enum WiFiBandEnum : ENUM8 {
k2g4 = 0;
k3g65 = 1;
k5g = 2;
Expand All @@ -1214,20 +1214,20 @@ server cluster NetworkCommissioning = 49 {
kEthernetNetworkInterface = 0x4;
}

bitmap WiFiSecurity : BITMAP8 {
bitmap WiFiSecurityBitmap : BITMAP8 {
kUnencrypted = 0x1;
kWep = 0x2;
kWpaPersonal = 0x4;
kWpa2Personal = 0x8;
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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
30 changes: 15 additions & 15 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -731,7 +731,7 @@ server cluster NetworkCommissioning = 49 {
kUnknownError = 12;
}

enum WiFiBand : ENUM8 {
enum WiFiBandEnum : ENUM8 {
k2g4 = 0;
k3g65 = 1;
k5g = 2;
Expand All @@ -746,20 +746,20 @@ server cluster NetworkCommissioning = 49 {
kEthernetNetworkInterface = 0x4;
}

bitmap WiFiSecurity : BITMAP8 {
bitmap WiFiSecurityBitmap : BITMAP8 {
kUnencrypted = 0x1;
kWep = 0x2;
kWpaPersonal = 0x4;
kWpa2Personal = 0x8;
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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -699,7 +699,7 @@ server cluster NetworkCommissioning = 49 {
kUnknownError = 12;
}

enum WiFiBand : ENUM8 {
enum WiFiBandEnum : ENUM8 {
k2g4 = 0;
k3g65 = 1;
k5g = 2;
Expand All @@ -714,20 +714,20 @@ server cluster NetworkCommissioning = 49 {
kEthernetNetworkInterface = 0x4;
}

bitmap WiFiSecurity : BITMAP8 {
bitmap WiFiSecurityBitmap : BITMAP8 {
kUnencrypted = 0x1;
kWep = 0x2;
kWpaPersonal = 0x4;
kWpa2Personal = 0x8;
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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
Loading

0 comments on commit e6c4ce7

Please sign in to comment.