Align General Diagnostics cluster with the spec again. (#24469)
* Align General Diagnostics cluster with the spec again.
The spec changed in https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6151
* Regenerate generated code.
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 9a74e46..b9240ee 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
@@ -1123,7 +1123,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -1137,7 +1137,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -1145,14 +1145,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -1170,22 +1170,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -1197,9 +1197,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
index d7bebc0..40765c3 100644
--- a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
+++ b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
@@ -183,13 +183,13 @@
#if CHIP_CONFIG_TEST
// On Linux Simulation, set following hardware faults statically.
- ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
- ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
+ ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+ ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
- ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
- ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
- ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
- ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+ ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+ ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+ ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+ ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
#endif
Clusters::GeneralDiagnosticsServer::Instance().OnHardwareFaultsDetect(previous, current);
}
@@ -200,13 +200,13 @@
#if CHIP_CONFIG_TEST
// On Linux Simulation, set following radio faults statically.
- ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT));
- ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
+ ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
+ ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
- ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT));
- ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_CELLULAR_FAULT));
- ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
- ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_NFC_FAULT));
+ ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
+ ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT));
+ ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+ ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT));
#endif
Clusters::GeneralDiagnosticsServer::Instance().OnRadioFaultsDetect(previous, current);
}
@@ -217,12 +217,12 @@
#if CHIP_CONFIG_TEST
// On Linux Simulation, set following radio faults statically.
- ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
- ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
+ ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+ ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
- ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
- ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
- ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+ ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+ ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+ ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
#endif
Clusters::GeneralDiagnosticsServer::Instance().OnNetworkFaultsDetect(previous, current);
}
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 4490791..6f0389d 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
@@ -1052,7 +1052,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -1066,7 +1066,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -1074,14 +1074,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -1099,22 +1099,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index 101ae1e..9ad049a 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -801,7 +801,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -815,7 +815,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -823,14 +823,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -848,22 +848,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -875,9 +875,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index 32f3ba7..050a119 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -656,7 +656,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -670,7 +670,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -678,14 +678,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -703,22 +703,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -730,9 +730,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index 893f368..af4d687 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -768,7 +768,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -782,7 +782,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -790,14 +790,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -815,22 +815,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -842,9 +842,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index 9650875..c78e192 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -641,7 +641,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -655,7 +655,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -663,14 +663,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -688,22 +688,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -715,9 +715,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index 63478a3..5f2806a 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -790,7 +790,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -804,7 +804,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -812,14 +812,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -837,22 +837,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -864,9 +864,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index 11ea8ba..20cc3bb 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -641,7 +641,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -655,7 +655,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -663,14 +663,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -688,22 +688,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -715,9 +715,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index 449f3ee..f4a3f69 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -790,7 +790,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -804,7 +804,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -812,14 +812,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -837,22 +837,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -864,9 +864,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
index 03656c1..e492826 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -643,7 +643,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -657,7 +657,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -665,14 +665,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -690,22 +690,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -717,9 +717,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index b25d9ff..15c106e 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -654,7 +654,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -668,7 +668,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -676,14 +676,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -701,22 +701,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -728,9 +728,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index d530b3b..b97b9c5 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -783,7 +783,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -797,7 +797,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -805,14 +805,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -830,22 +830,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -857,9 +857,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index df49dee..1fea3cd 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -654,7 +654,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -668,7 +668,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -676,14 +676,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -701,22 +701,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -728,9 +728,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index fd1ec1e..4bc590e 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -654,7 +654,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -668,7 +668,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -676,14 +676,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -701,22 +701,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -728,9 +728,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index e4a2089..16d07de 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -654,7 +654,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -668,7 +668,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -676,14 +676,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -701,22 +701,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -728,9 +728,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index 5b35c31..580ace0 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -790,7 +790,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -804,7 +804,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -812,14 +812,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -837,22 +837,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -864,9 +864,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index fa5eba6..277af20 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -733,7 +733,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -747,7 +747,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -755,14 +755,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -780,22 +780,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -807,9 +807,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index 3190ff8..22a2446 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -691,7 +691,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -705,7 +705,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -713,14 +713,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -738,22 +738,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -765,9 +765,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index 7e90f11..8619eb1 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -659,7 +659,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -673,7 +673,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -681,14 +681,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -706,22 +706,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -733,9 +733,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index 54f25f7..23b37a6 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -781,7 +781,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -795,7 +795,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -803,14 +803,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -828,22 +828,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -855,9 +855,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index 4698b19..64926a1 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -654,7 +654,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -668,7 +668,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -676,14 +676,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -701,22 +701,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -728,9 +728,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index 1ef2b01..3ffcc2e 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -641,7 +641,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -655,7 +655,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -663,14 +663,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -688,22 +688,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -715,9 +715,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index 506df3f..185d062 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -641,7 +641,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -655,7 +655,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -663,14 +663,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -688,22 +688,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -715,9 +715,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
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 7133015..45e8e9e 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
@@ -644,7 +644,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -658,7 +658,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -666,14 +666,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -691,22 +691,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -718,9 +718,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
index 101ae1e..9ad049a 100644
--- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
+++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
@@ -801,7 +801,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -815,7 +815,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -823,14 +823,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -848,22 +848,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -875,9 +875,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
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 dd255a6..2d3a13f 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
@@ -846,7 +846,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -860,7 +860,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -868,14 +868,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -893,22 +893,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -920,9 +920,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index ecdbec6..e63ea98 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -802,7 +802,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -816,7 +816,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -824,14 +824,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -849,22 +849,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -876,9 +876,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index 53fb163..9cb8188 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.matter
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -717,7 +717,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -731,7 +731,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -739,14 +739,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -764,22 +764,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index a1ceb85..236536d 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -718,7 +718,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -732,7 +732,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -740,14 +740,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -765,22 +765,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -792,9 +792,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
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 1b82ba7..5c0bbe9 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
@@ -505,7 +505,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -519,7 +519,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -527,14 +527,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -552,22 +552,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -579,9 +579,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
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 182bba6..03ad652 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
@@ -670,7 +670,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -684,7 +684,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -692,14 +692,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -717,22 +717,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -744,9 +744,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 054bff8..cec23e2 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -982,7 +982,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -996,7 +996,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -1004,14 +1004,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -1029,22 +1029,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -1056,9 +1056,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index c9f51b5..dfe8fa1 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -959,7 +959,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -973,7 +973,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -981,14 +981,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -1006,22 +1006,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -1033,9 +1033,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index d5ee3f2..a115a3f 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -669,7 +669,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -683,7 +683,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -691,14 +691,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -716,22 +716,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
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 ac5dbb5..3465b3d 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
@@ -568,7 +568,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -582,7 +582,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -590,14 +590,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -615,22 +615,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
index d1124c1..0fba7ea 100644
--- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
@@ -412,7 +412,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -426,7 +426,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -434,14 +434,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -459,22 +459,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -486,9 +486,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 348b4e5..63e5edf 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -806,7 +806,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -820,7 +820,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -828,14 +828,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -853,22 +853,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -880,9 +880,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 048f912..ee392b6 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -851,7 +851,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -865,7 +865,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -873,14 +873,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -898,22 +898,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -925,9 +925,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
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 463c6fe..2905527 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
@@ -1023,7 +1023,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -1037,7 +1037,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -1045,14 +1045,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -1070,22 +1070,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -1097,9 +1097,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index 6f33199..c3ec382 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -855,7 +855,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -869,7 +869,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -877,14 +877,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -902,22 +902,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -929,9 +929,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp b/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp
index e0a1ddc..f1fa748 100644
--- a/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp
+++ b/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp
@@ -38,13 +38,13 @@
// Fault injection
GeneralFaults<kMaxHardwareFaults> hwFaultsPrevious;
GeneralFaults<kMaxHardwareFaults> hwFaultsCurrent;
- ReturnErrorOnFailure(hwFaultsPrevious.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
- ReturnErrorOnFailure(hwFaultsPrevious.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
+ ReturnErrorOnFailure(hwFaultsPrevious.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+ ReturnErrorOnFailure(hwFaultsPrevious.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
- ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
- ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
- ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
- ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+ ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+ ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+ ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+ ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
app::Clusters::GeneralDiagnosticsServer::Instance().OnHardwareFaultsDetect(hwFaultsPrevious, hwFaultsCurrent);
@@ -52,13 +52,13 @@
GeneralFaults<kMaxRadioFaults> radioFaultsPrevious;
GeneralFaults<kMaxRadioFaults> radioFaultsCurrent;
- ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT));
- ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
+ ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
+ ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
- ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT));
- ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_CELLULAR_FAULT));
- ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
- ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_NFC_FAULT));
+ ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
+ ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT));
+ ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+ ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT));
app::Clusters::GeneralDiagnosticsServer::Instance().OnRadioFaultsDetect(radioFaultsPrevious, radioFaultsCurrent);
@@ -66,12 +66,12 @@
GeneralFaults<kMaxNetworkFaults> networkFaultsCurrent;
// Network faults injections
- ReturnErrorOnFailure(networkFaultsPrevious.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaultsPrevious.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
+ ReturnErrorOnFailure(networkFaultsPrevious.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+ ReturnErrorOnFailure(networkFaultsPrevious.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+ ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+ ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
app::Clusters::GeneralDiagnosticsServer::Instance().OnNetworkFaultsDetect(networkFaultsPrevious, networkFaultsCurrent);
}
diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
index ccb9fd4..6fb013b 100644
--- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
+++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
@@ -276,9 +276,10 @@
// Record HardwareFault event
EventNumber eventNumber;
- DataModel::List<const HardwareFault> currentList(reinterpret_cast<const HardwareFault *>(current.data()), current.size());
- DataModel::List<const HardwareFault> previousList(reinterpret_cast<const HardwareFault *>(previous.data()),
- previous.size());
+ DataModel::List<const HardwareFaultEnum> currentList(reinterpret_cast<const HardwareFaultEnum *>(current.data()),
+ current.size());
+ DataModel::List<const HardwareFaultEnum> previousList(reinterpret_cast<const HardwareFaultEnum *>(previous.data()),
+ previous.size());
Events::HardwareFaultChange::Type event{ currentList, previousList };
if (CHIP_NO_ERROR != LogEvent(event, endpointId, eventNumber))
@@ -302,8 +303,9 @@
// Record RadioFault event
EventNumber eventNumber;
- DataModel::List<const RadioFault> currentList(reinterpret_cast<const RadioFault *>(current.data()), current.size());
- DataModel::List<const RadioFault> previousList(reinterpret_cast<const RadioFault *>(previous.data()), previous.size());
+ DataModel::List<const RadioFaultEnum> currentList(reinterpret_cast<const RadioFaultEnum *>(current.data()), current.size());
+ DataModel::List<const RadioFaultEnum> previousList(reinterpret_cast<const RadioFaultEnum *>(previous.data()),
+ previous.size());
Events::RadioFaultChange::Type event{ currentList, previousList };
if (CHIP_NO_ERROR != LogEvent(event, endpointId, eventNumber))
@@ -327,9 +329,9 @@
// Record NetworkFault event
EventNumber eventNumber;
- DataModel::List<const NetworkFaultType> currentList(reinterpret_cast<const NetworkFaultType *>(current.data()),
+ DataModel::List<const NetworkFaultEnum> currentList(reinterpret_cast<const NetworkFaultEnum *>(current.data()),
current.size());
- DataModel::List<const NetworkFaultType> previousList(reinterpret_cast<const NetworkFaultType *>(previous.data()),
+ DataModel::List<const NetworkFaultEnum> previousList(reinterpret_cast<const NetworkFaultEnum *>(previous.data()),
previous.size());
Events::NetworkFaultChange::Type event{ currentList, previousList };
diff --git a/src/app/common/templates/weak-enum-list.yaml b/src/app/common/templates/weak-enum-list.yaml
index d720d51..d9b4dc7 100644
--- a/src/app/common/templates/weak-enum-list.yaml
+++ b/src/app/common/templates/weak-enum-list.yaml
@@ -10,23 +10,23 @@
- ContentLaunchStatus
- ContentLaunchStreamingType
- EnhancedColorMode
-- HardwareFault
+- HardwareFaultEnum
- HueDirection
- HueMoveMode
- HueStepMode
- IdentifyEffectIdentifier
- IdentifyEffectVariant
- IdentifyIdentifyType
-- InterfaceType
+- InterfaceTypeEnum
- KeypadLockout
- LevelControlOptions
- MoveMode
-- NetworkFaultType
+- NetworkFaultEnum
- OnOffDelayedAllOffEffectVariant
- OnOffDyingLightEffectVariant
- OnOffEffectIdentifier
- PHYRateEnum
-- RadioFault
+- RadioFaultEnum
- RoutingRole
- SaturationMoveMode
- SaturationStepMode
diff --git a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
index d643585..9eb0036 100644
--- a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
@@ -16,7 +16,7 @@
-->
<configurator>
<domain name="CHIP"/>
- <enum name="HardwareFault" type="ENUM8">
+ <enum name="HardwareFaultEnum" type="ENUM8">
<cluster code="0x0033"/>
<item name="Unspecified" value="0x00"/>
<item name="Radio" value="0x01"/>
@@ -30,7 +30,7 @@
<item name="NonVolatileMemoryError" value="0x09"/>
<item name="TamperDetected" value="0x0A"/>
</enum>
- <enum name="RadioFault" type="ENUM8">
+ <enum name="RadioFaultEnum" type="ENUM8">
<cluster code="0x0033"/>
<item name="Unspecified" value="0x00"/>
<item name="WiFiFault" value="0x01"/>
@@ -40,7 +40,7 @@
<item name="BLEFault" value="0x05"/>
<item name="EthernetFault" value="0x06"/>
</enum>
- <enum name="NetworkFaultType" type="ENUM8">
+ <enum name="NetworkFaultEnum" type="ENUM8">
<cluster code="0x0033"/>
<item name="Unspecified" value="0x00"/>
<item name="HardwareFailure" value="0x01"/>
@@ -57,7 +57,7 @@
<item name="SoftwareUpdateCompleted" value="0x05"/>
<item name="SoftwareReset" value="0x06"/>
</enum>
- <enum name="InterfaceType" type="ENUM8">
+ <enum name="InterfaceTypeEnum" type="ENUM8">
<cluster code="0x0033"/>
<item name="Unspecified" value="0x00"/>
<item name="WiFi" value="0x01"/>
@@ -75,7 +75,7 @@
<item name="HardwareAddress" type="OCTET_STRING" length="8"/>
<item name="IPv4Addresses" type="OCTET_STRING" array="true"/>
<item name="IPv6Addresses" type="OCTET_STRING" array="true"/>
- <item name="Type" type="InterfaceType"/>
+ <item name="Type" type="InterfaceTypeEnum"/>
</struct>
<cluster>
<domain>General</domain>
@@ -88,9 +88,9 @@
<attribute side="server" code="0x02" define="UP_TIME" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">UpTime</attribute>
<attribute side="server" code="0x03" define="TOTAL_OPERATIONAL_HOURS" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" default="0x00000000" optional="true">TotalOperationalHours</attribute>
<attribute side="server" code="0x04" define="BOOT_REASONS" type="BootReasonEnum" writable="false" optional="true">BootReason</attribute>
- <attribute side="server" code="0x05" define="ACTIVE_HARDWARE_FAULTS" type="ARRAY" entryType="HardwareFault" writable="false" optional="true">ActiveHardwareFaults</attribute>
- <attribute side="server" code="0x06" define="ACTIVE_RADIO_FAULTS" type="ARRAY" entryType="RadioFault" writable="false" optional="true">ActiveRadioFaults</attribute>
- <attribute side="server" code="0x07" define="ACTIVE_NETWORK_FAULTS" type="ARRAY" entryType="NetworkFaultType" writable="false" optional="true">ActiveNetworkFaults</attribute>
+ <attribute side="server" code="0x05" define="ACTIVE_HARDWARE_FAULTS" type="ARRAY" entryType="HardwareFaultEnum" writable="false" optional="true">ActiveHardwareFaults</attribute>
+ <attribute side="server" code="0x06" define="ACTIVE_RADIO_FAULTS" type="ARRAY" entryType="RadioFaultEnum" writable="false" optional="true">ActiveRadioFaults</attribute>
+ <attribute side="server" code="0x07" define="ACTIVE_NETWORK_FAULTS" type="ARRAY" entryType="NetworkFaultEnum" writable="false" optional="true">ActiveNetworkFaults</attribute>
<attribute side="server" code="0x08" define="TEST_EVENT_TRIGGERS_ENABLED" type="BOOLEAN" writable="false" optional="false">TestEventTriggersEnabled</attribute>
<command source="client" code="0x00" name="TestEventTrigger" optional="false">
@@ -102,22 +102,22 @@
<event side="server" code="0x00" name="HardwareFaultChange" priority="critical" optional="true">
<description>Indicate a change in the set of hardware faults currently detected by the Node.</description>
- <field id="0" name="Current" type="HardwareFault" array="true"/>
- <field id="1" name="Previous" type="HardwareFault" array="true"/>
+ <field id="0" name="Current" type="HardwareFaultEnum" array="true"/>
+ <field id="1" name="Previous" type="HardwareFaultEnum" array="true"/>
</event>
<event side="server" code="0x01" name="RadioFaultChange" priority="critical" optional="true">
<description>Indicate a change in the set of radio faults currently detected by the Node.</description>
- <field id="0" name="Current" type="RadioFault" array="true"/>
- <field id="1" name="Previous" type="RadioFault" array="true"/>
+ <field id="0" name="Current" type="RadioFaultEnum" array="true"/>
+ <field id="1" name="Previous" type="RadioFaultEnum" array="true"/>
</event>
<event side="server" code="0x02" name="NetworkFaultChange" priority="critical" optional="true">
<description>Indicate a change in the set of network faults currently detected by the Node.</description>
- <field id="0" name="Current" type="NetworkFaultType" array="true"/>
- <field id="1" name="Previous" type="NetworkFaultType" array="true"/>
+ <field id="0" name="Current" type="NetworkFaultEnum" array="true"/>
+ <field id="1" name="Previous" type="NetworkFaultEnum" array="true"/>
</event>
<event side="server" code="0x03" name="BootReason" priority="critical" optional="false">
<description>Indicate the reason that caused the device to start-up.</description>
<field id="0" name="BootReason" type="BootReasonEnum"/>
- </event>
+ </event>
</cluster>
</configurator>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 4cdbb8c..afe6d2c 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -1299,7 +1299,7 @@
kSoftwareReset = 6;
}
- enum HardwareFault : ENUM8 {
+ enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
@@ -1313,7 +1313,7 @@
kTamperDetected = 10;
}
- enum InterfaceType : ENUM8 {
+ enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
@@ -1321,14 +1321,14 @@
kThread = 4;
}
- enum NetworkFaultType : ENUM8 {
+ enum NetworkFaultEnum : ENUM8 {
kUnspecified = 0;
kHardwareFailure = 1;
kNetworkJammed = 2;
kConnectionFailed = 3;
}
- enum RadioFault : ENUM8 {
+ enum RadioFaultEnum : ENUM8 {
kUnspecified = 0;
kWiFiFault = 1;
kCellularFault = 2;
@@ -1346,22 +1346,22 @@
octet_string<8> hardwareAddress = 4;
octet_string IPv4Addresses[] = 5;
octet_string IPv6Addresses[] = 6;
- InterfaceType type = 7;
+ InterfaceTypeEnum type = 7;
}
critical event HardwareFaultChange = 0 {
- HardwareFault current[] = 0;
- HardwareFault previous[] = 1;
+ HardwareFaultEnum current[] = 0;
+ HardwareFaultEnum previous[] = 1;
}
critical event RadioFaultChange = 1 {
- RadioFault current[] = 0;
- RadioFault previous[] = 1;
+ RadioFaultEnum current[] = 0;
+ RadioFaultEnum previous[] = 1;
}
critical event NetworkFaultChange = 2 {
- NetworkFaultType current[] = 0;
- NetworkFaultType previous[] = 1;
+ NetworkFaultEnum current[] = 0;
+ NetworkFaultEnum previous[] = 1;
}
critical event BootReason = 3 {
@@ -1373,9 +1373,9 @@
readonly attribute int64u upTime = 2;
readonly attribute int32u totalOperationalHours = 3;
readonly attribute BootReasonEnum bootReason = 4;
- readonly attribute HardwareFault activeHardwareFaults[] = 5;
- readonly attribute RadioFault activeRadioFaults[] = 6;
- readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+ readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+ readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+ readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index 0422354..f0e8b36 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -7906,7 +7906,7 @@
}
void CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::CallbackFn(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & list)
+ void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & list)
{
chip::DeviceLayer::StackUnlock unlock;
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7977,7 +7977,7 @@
}
void CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CallbackFn(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> & list)
+ void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & list)
{
chip::DeviceLayer::StackUnlock unlock;
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8048,7 +8048,7 @@
}
void CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::CallbackFn(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & list)
+ void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & list)
{
chip::DeviceLayer::StackUnlock unlock;
CHIP_ERROR err = CHIP_NO_ERROR;
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h
index 1e8a6c7..43fc82e 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h
@@ -3310,7 +3310,7 @@
static void
CallbackFn(void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & list);
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & list);
static void OnSubscriptionEstablished(void * context)
{
CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
@@ -3340,8 +3340,9 @@
}
}
- static void CallbackFn(void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> & list);
+ static void
+ CallbackFn(void * context,
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & list);
static void OnSubscriptionEstablished(void * context)
{
CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
@@ -3373,7 +3374,7 @@
static void
CallbackFn(void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & list);
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & list);
static void OnSubscriptionEstablished(void * context)
{
CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 44048a0..c944ffd 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -7262,9 +7262,9 @@
ClusterObjectFieldDescriptor(Label="upTime", Tag=0x00000002, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="totalOperationalHours", Tag=0x00000003, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="bootReason", Tag=0x00000004, Type=typing.Optional[GeneralDiagnostics.Enums.BootReasonEnum]),
- ClusterObjectFieldDescriptor(Label="activeHardwareFaults", Tag=0x00000005, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFault]]),
- ClusterObjectFieldDescriptor(Label="activeRadioFaults", Tag=0x00000006, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFault]]),
- ClusterObjectFieldDescriptor(Label="activeNetworkFaults", Tag=0x00000007, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultType]]),
+ ClusterObjectFieldDescriptor(Label="activeHardwareFaults", Tag=0x00000005, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]]),
+ ClusterObjectFieldDescriptor(Label="activeRadioFaults", Tag=0x00000006, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]]),
+ ClusterObjectFieldDescriptor(Label="activeNetworkFaults", Tag=0x00000007, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]]),
ClusterObjectFieldDescriptor(Label="testEventTriggersEnabled", Tag=0x00000008, Type=bool),
ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
@@ -7278,9 +7278,9 @@
upTime: 'typing.Optional[uint]' = None
totalOperationalHours: 'typing.Optional[uint]' = None
bootReason: 'typing.Optional[GeneralDiagnostics.Enums.BootReasonEnum]' = None
- activeHardwareFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFault]]' = None
- activeRadioFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFault]]' = None
- activeNetworkFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultType]]' = None
+ activeHardwareFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]]' = None
+ activeRadioFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]]' = None
+ activeNetworkFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]]' = None
testEventTriggersEnabled: 'bool' = None
generatedCommandList: 'typing.List[uint]' = None
acceptedCommandList: 'typing.List[uint]' = None
@@ -7298,7 +7298,7 @@
kSoftwareUpdateCompleted = 0x05
kSoftwareReset = 0x06
- class HardwareFault(IntEnum):
+ class HardwareFaultEnum(IntEnum):
kUnspecified = 0x00
kRadio = 0x01
kSensor = 0x02
@@ -7311,20 +7311,20 @@
kNonVolatileMemoryError = 0x09
kTamperDetected = 0x0A
- class InterfaceType(IntEnum):
+ class InterfaceTypeEnum(IntEnum):
kUnspecified = 0x00
kWiFi = 0x01
kEthernet = 0x02
kCellular = 0x03
kThread = 0x04
- class NetworkFaultType(IntEnum):
+ class NetworkFaultEnum(IntEnum):
kUnspecified = 0x00
kHardwareFailure = 0x01
kNetworkJammed = 0x02
kConnectionFailed = 0x03
- class RadioFault(IntEnum):
+ class RadioFaultEnum(IntEnum):
kUnspecified = 0x00
kWiFiFault = 0x01
kCellularFault = 0x02
@@ -7348,7 +7348,7 @@
ClusterObjectFieldDescriptor(Label="hardwareAddress", Tag=4, Type=bytes),
ClusterObjectFieldDescriptor(Label="IPv4Addresses", Tag=5, Type=typing.List[bytes]),
ClusterObjectFieldDescriptor(Label="IPv6Addresses", Tag=6, Type=typing.List[bytes]),
- ClusterObjectFieldDescriptor(Label="type", Tag=7, Type=GeneralDiagnostics.Enums.InterfaceType),
+ ClusterObjectFieldDescriptor(Label="type", Tag=7, Type=GeneralDiagnostics.Enums.InterfaceTypeEnum),
])
name: 'str' = ""
@@ -7358,7 +7358,7 @@
hardwareAddress: 'bytes' = b""
IPv4Addresses: 'typing.List[bytes]' = field(default_factory=lambda: [])
IPv6Addresses: 'typing.List[bytes]' = field(default_factory=lambda: [])
- type: 'GeneralDiagnostics.Enums.InterfaceType' = 0
+ type: 'GeneralDiagnostics.Enums.InterfaceTypeEnum' = 0
@@ -7475,9 +7475,9 @@
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFault]])
+ return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]])
- value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFault]]' = None
+ value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]]' = None
@dataclass
class ActiveRadioFaults(ClusterAttributeDescriptor):
@@ -7491,9 +7491,9 @@
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFault]])
+ return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]])
- value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFault]]' = None
+ value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]]' = None
@dataclass
class ActiveNetworkFaults(ClusterAttributeDescriptor):
@@ -7507,9 +7507,9 @@
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultType]])
+ return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]])
- value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultType]]' = None
+ value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]]' = None
@dataclass
class TestEventTriggersEnabled(ClusterAttributeDescriptor):
@@ -7623,12 +7623,12 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
- ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.HardwareFault]),
- ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.HardwareFault]),
+ ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]),
+ ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]),
])
- current: 'typing.List[GeneralDiagnostics.Enums.HardwareFault]' = field(default_factory=lambda: [])
- previous: 'typing.List[GeneralDiagnostics.Enums.HardwareFault]' = field(default_factory=lambda: [])
+ current: 'typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]' = field(default_factory=lambda: [])
+ previous: 'typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]' = field(default_factory=lambda: [])
@dataclass
class RadioFaultChange(ClusterEvent):
@@ -7644,12 +7644,12 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
- ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.RadioFault]),
- ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.RadioFault]),
+ ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]),
+ ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]),
])
- current: 'typing.List[GeneralDiagnostics.Enums.RadioFault]' = field(default_factory=lambda: [])
- previous: 'typing.List[GeneralDiagnostics.Enums.RadioFault]' = field(default_factory=lambda: [])
+ current: 'typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]' = field(default_factory=lambda: [])
+ previous: 'typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]' = field(default_factory=lambda: [])
@dataclass
class NetworkFaultChange(ClusterEvent):
@@ -7665,12 +7665,12 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
- ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.NetworkFaultType]),
- ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.NetworkFaultType]),
+ ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]),
+ ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]),
])
- current: 'typing.List[GeneralDiagnostics.Enums.NetworkFaultType]' = field(default_factory=lambda: [])
- previous: 'typing.List[GeneralDiagnostics.Enums.NetworkFaultType]' = field(default_factory=lambda: [])
+ current: 'typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]' = field(default_factory=lambda: [])
+ previous: 'typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]' = field(default_factory=lambda: [])
@dataclass
class BootReason(ClusterEvent):
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index ff3a4e8..f2f73bb 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -3090,7 +3090,10 @@
GeneralDiagnostics:
- BootReasonType
- HardwareFaultType
- - InterfaceType
+ # InterfaceTypeEnum was originally just named InterfaceType, but
+ # we generate the same API for both of those names, so the name
+ # can just change here.
+ - InterfaceTypeEnum
- NetworkFaultType
- RadioFaultType
ThreadNetworkDiagnostics:
@@ -3438,7 +3441,10 @@
- UserInterfaceFault
- NonVolatileMemoryError
- TamperDetected
- InterfaceType:
+ # InterfaceTypeEnum was originally just named InterfaceType, but
+ # we generate the same API for both of those names, so the name
+ # can just change here.
+ InterfaceTypeEnum:
- Unspecified
- WiFi
- Ethernet
@@ -5249,9 +5255,10 @@
EthernetNetworkDiagnostics:
- PHYRateEnum
GeneralDiagnostics:
- - HardwareFault
- - RadioFault
+ - HardwareFaultEnum
+ - RadioFaultEnum
- BootReasonEnum
+ - NetworkFaultEnum
OperationalCredentials:
- NodeOperationalCertStatusEnum
- CertificateChainTypeEnum
@@ -5351,7 +5358,7 @@
- Rate200G
- Rate400G
GeneralDiagnostics:
- HardwareFault:
+ HardwareFaultEnum:
- Unspecified
- Radio
- Sensor
@@ -5363,7 +5370,7 @@
- UserInterfaceFault
- NonVolatileMemoryError
- TamperDetected
- RadioFault:
+ RadioFaultEnum:
- Unspecified
- WiFiFault
- CellularFault
@@ -5379,6 +5386,11 @@
- HardwareWatchdogReset
- SoftwareUpdateCompleted
- SoftwareReset
+ NetworkFaultEnum:
+ - Unspecified
+ - HardwareFailure
+ - NetworkJammed
+ - ConnectionFailed
OperationalCredentials:
NodeOperationalCertStatusEnum:
- OK
@@ -5644,6 +5656,7 @@
- HardwareFaultType
- RadioFaultType
- BootReasonType
+ - NetworkFaultType
OperationalCredentials:
- OperationalCertStatus
DoorLock:
@@ -5887,9 +5900,10 @@
EthernetNetworkDiagnostics:
PHYRateEnum: PHYRateType
GeneralDiagnostics:
- HardwareFault: HardwareFaultType
- RadioFault: RadioFaultType
+ HardwareFaultEnum: HardwareFaultType
+ RadioFaultEnum: RadioFaultType
BootReasonEnum: BootReasonType
+ NetworkFaultEnum: NetworkFaultType
OperationalCredentials:
NodeOperationalCertStatusEnum: OperationalCertStatus
DoorLock:
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index da0c4f6..2799912 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -17657,12 +17657,28 @@
MTRGeneralDiagnosticsInterfaceTypeThread API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsNetworkFault) {
+ MTRGeneralDiagnosticsNetworkFaultUnspecified MTR_NEWLY_AVAILABLE = 0x00,
+ MTRGeneralDiagnosticsNetworkFaultHardwareFailure MTR_NEWLY_AVAILABLE = 0x01,
+ MTRGeneralDiagnosticsNetworkFaultNetworkJammed MTR_NEWLY_AVAILABLE = 0x02,
+ MTRGeneralDiagnosticsNetworkFaultConnectionFailed MTR_NEWLY_AVAILABLE = 0x03,
+} MTR_NEWLY_AVAILABLE;
+
typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsNetworkFaultType) {
- MTRGeneralDiagnosticsNetworkFaultTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
- MTRGeneralDiagnosticsNetworkFaultTypeHardwareFailure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
- MTRGeneralDiagnosticsNetworkFaultTypeNetworkJammed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
- MTRGeneralDiagnosticsNetworkFaultTypeConnectionFailed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+ MTRGeneralDiagnosticsNetworkFaultTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+ MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsNetworkFaultUnspecified")
+ = 0x00,
+ MTRGeneralDiagnosticsNetworkFaultTypeHardwareFailure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+ MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsNetworkFaultHardwareFailure")
+ = 0x01,
+ MTRGeneralDiagnosticsNetworkFaultTypeNetworkJammed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+ MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsNetworkFaultNetworkJammed")
+ = 0x02,
+ MTRGeneralDiagnosticsNetworkFaultTypeConnectionFailed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+ MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsNetworkFaultConnectionFailed")
+ = 0x03,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+ MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsNetworkFault");
typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsRadioFault) {
MTRGeneralDiagnosticsRadioFaultUnspecified MTR_NEWLY_AVAILABLE = 0x00,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
index 4cb7572..15a1fe8 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
@@ -279,21 +279,22 @@
chip::app::Clusters::GeneralDiagnostics::BootReasonEnum);
typedef void (*NullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallback)(
void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::BootReasonEnum> &);
-typedef void (*GeneralDiagnosticsClusterHardwareFaultAttributeCallback)(void *,
- chip::app::Clusters::GeneralDiagnostics::HardwareFault);
-typedef void (*NullableGeneralDiagnosticsClusterHardwareFaultAttributeCallback)(
- void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::HardwareFault> &);
-typedef void (*GeneralDiagnosticsClusterInterfaceTypeAttributeCallback)(void *,
- chip::app::Clusters::GeneralDiagnostics::InterfaceType);
-typedef void (*NullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallback)(
- void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::InterfaceType> &);
-typedef void (*GeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback)(
- void *, chip::app::Clusters::GeneralDiagnostics::NetworkFaultType);
-typedef void (*NullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback)(
- void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> &);
-typedef void (*GeneralDiagnosticsClusterRadioFaultAttributeCallback)(void *, chip::app::Clusters::GeneralDiagnostics::RadioFault);
-typedef void (*NullableGeneralDiagnosticsClusterRadioFaultAttributeCallback)(
- void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::RadioFault> &);
+typedef void (*GeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback)(
+ void *, chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum);
+typedef void (*NullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback)(
+ void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> &);
+typedef void (*GeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback)(
+ void *, chip::app::Clusters::GeneralDiagnostics::InterfaceTypeEnum);
+typedef void (*NullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback)(
+ void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::InterfaceTypeEnum> &);
+typedef void (*GeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback)(
+ void *, chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum);
+typedef void (*NullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback)(
+ void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> &);
+typedef void (*GeneralDiagnosticsClusterRadioFaultEnumAttributeCallback)(void *,
+ chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum);
+typedef void (*NullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallback)(
+ void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> &);
typedef void (*ThreadNetworkDiagnosticsClusterConnectionStatusEnumAttributeCallback)(
void *, chip::app::Clusters::ThreadNetworkDiagnostics::ConnectionStatusEnum);
typedef void (*NullableThreadNetworkDiagnosticsClusterConnectionStatusEnumAttributeCallback)(
@@ -721,11 +722,11 @@
const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType> &
data);
typedef void (*GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & data);
+ void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & data);
typedef void (*GeneralDiagnosticsActiveRadioFaultsListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> & data);
+ void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & data);
typedef void (*GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & data);
+ void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & data);
typedef void (*GeneralDiagnosticsGeneratedCommandListListAttributeCallback)(
void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
typedef void (*GeneralDiagnosticsAcceptedCommandListListAttributeCallback)(
@@ -4816,7 +4817,7 @@
static void
OnSuccessFn(void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & value);
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & value);
};
class MTRGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge
@@ -4849,8 +4850,9 @@
MTRActionBlock action) :
MTRCallbackBridge<GeneralDiagnosticsActiveRadioFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn){};
- static void OnSuccessFn(void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> & value);
+ static void
+ OnSuccessFn(void * context,
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & value);
};
class MTRGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge
@@ -4885,7 +4887,7 @@
static void
OnSuccessFn(void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & value);
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & value);
};
class MTRGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge
@@ -14449,271 +14451,275 @@
MTRSubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge
- : public MTRCallbackBridge<GeneralDiagnosticsClusterHardwareFaultAttributeCallback>
+class MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<GeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback>
{
public:
- MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
- MTRCallbackBridge<GeneralDiagnosticsClusterHardwareFaultAttributeCallback>(queue, handler, OnSuccessFn){};
+ MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+ MTRCallbackBridge<GeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
- MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRActionBlock action) :
- MTRCallbackBridge<GeneralDiagnosticsClusterHardwareFaultAttributeCallback>(queue, handler, action, OnSuccessFn){};
+ MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRActionBlock action) :
+ MTRCallbackBridge<GeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
- static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::HardwareFault value);
+ static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum value);
};
-class MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge
- : public MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge
+class MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackSubscriptionBridge
+ : public MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge
{
public:
- MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge(
+ MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackSubscriptionBridge(
dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
MTRSubscriptionEstablishedHandler establishedHandler) :
- MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(queue, handler, action),
+ MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge(queue, handler, action),
mEstablishedHandler(establishedHandler)
{}
void OnSubscriptionEstablished();
- using MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::KeepAliveOnCallback;
- using MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::OnDone;
+ using MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge::KeepAliveOnCallback;
+ using MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge::OnDone;
private:
MTRSubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge
- : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterHardwareFaultAttributeCallback>
+class MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback>
{
public:
- MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
- MTRCallbackBridge<NullableGeneralDiagnosticsClusterHardwareFaultAttributeCallback>(queue, handler, OnSuccessFn){};
+ MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+ MTRCallbackBridge<NullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
- MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRActionBlock action) :
- MTRCallbackBridge<NullableGeneralDiagnosticsClusterHardwareFaultAttributeCallback>(queue, handler, action, OnSuccessFn){};
+ MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRActionBlock action) :
+ MTRCallbackBridge<NullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback>(queue, handler, action,
+ OnSuccessFn){};
- static void OnSuccessFn(void * context,
- const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & value);
+ static void
+ OnSuccessFn(void * context,
+ const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & value);
};
-class MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge
- : public MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge
+class MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackSubscriptionBridge
+ : public MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge
{
public:
- MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge(
+ MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackSubscriptionBridge(
dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
MTRSubscriptionEstablishedHandler establishedHandler) :
- MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(queue, handler, action),
+ MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge(queue, handler, action),
mEstablishedHandler(establishedHandler)
{}
void OnSubscriptionEstablished();
- using MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::KeepAliveOnCallback;
- using MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::OnDone;
+ using MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge::KeepAliveOnCallback;
+ using MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge::OnDone;
private:
MTRSubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge
- : public MTRCallbackBridge<GeneralDiagnosticsClusterInterfaceTypeAttributeCallback>
+class MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<GeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback>
{
public:
- MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
- MTRCallbackBridge<GeneralDiagnosticsClusterInterfaceTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+ MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+ MTRCallbackBridge<GeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
- MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRActionBlock action) :
- MTRCallbackBridge<GeneralDiagnosticsClusterInterfaceTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+ MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRActionBlock action) :
+ MTRCallbackBridge<GeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
- static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::InterfaceType value);
+ static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::InterfaceTypeEnum value);
};
-class MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackSubscriptionBridge
- : public MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge
+class MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackSubscriptionBridge
+ : public MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge
{
public:
- MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackSubscriptionBridge(
+ MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackSubscriptionBridge(
dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
MTRSubscriptionEstablishedHandler establishedHandler) :
- MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge(queue, handler, action),
+ MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge(queue, handler, action),
mEstablishedHandler(establishedHandler)
{}
void OnSubscriptionEstablished();
- using MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge::KeepAliveOnCallback;
- using MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge::OnDone;
+ using MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+ using MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge::OnDone;
private:
MTRSubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge
- : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallback>
+class MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback>
{
public:
- MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
- MTRCallbackBridge<NullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+ MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+ MTRCallbackBridge<NullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
- MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRActionBlock action) :
- MTRCallbackBridge<NullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+ MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRActionBlock action) :
+ MTRCallbackBridge<NullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback>(queue, handler, action,
+ OnSuccessFn){};
- static void OnSuccessFn(void * context,
- const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::InterfaceType> & value);
+ static void
+ OnSuccessFn(void * context,
+ const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::InterfaceTypeEnum> & value);
};
-class MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackSubscriptionBridge
- : public MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge
+class MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackSubscriptionBridge
+ : public MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge
{
public:
- MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackSubscriptionBridge(
+ MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackSubscriptionBridge(
dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
MTRSubscriptionEstablishedHandler establishedHandler) :
- MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge(queue, handler, action),
+ MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge(queue, handler, action),
mEstablishedHandler(establishedHandler)
{}
void OnSubscriptionEstablished();
- using MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge::KeepAliveOnCallback;
- using MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge::OnDone;
+ using MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+ using MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge::OnDone;
private:
MTRSubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge
- : public MTRCallbackBridge<GeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback>
+class MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<GeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback>
{
public:
- MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
- MTRCallbackBridge<GeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+ MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+ MTRCallbackBridge<GeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
- MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
MTRActionBlock action) :
- MTRCallbackBridge<GeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+ MTRCallbackBridge<GeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
- static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::NetworkFaultType value);
+ static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum value);
};
-class MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubscriptionBridge
- : public MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge
+class MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge
+ : public MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge
{
public:
- MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubscriptionBridge(
+ MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge(
dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
MTRSubscriptionEstablishedHandler establishedHandler) :
- MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge(queue, handler, action),
+ MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(queue, handler, action),
mEstablishedHandler(establishedHandler)
{}
void OnSubscriptionEstablished();
- using MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge::KeepAliveOnCallback;
- using MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge::OnDone;
+ using MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::KeepAliveOnCallback;
+ using MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnDone;
private:
MTRSubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge
- : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback>
+class MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback>
{
public:
- MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
- MTRCallbackBridge<NullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+ MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+ MTRCallbackBridge<NullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
- MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
MTRActionBlock action) :
- MTRCallbackBridge<NullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback>(queue, handler, action,
+ MTRCallbackBridge<NullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback>(queue, handler, action,
OnSuccessFn){};
static void
OnSuccessFn(void * context,
- const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & value);
+ const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & value);
};
-class MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubscriptionBridge
- : public MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge
+class MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge
+ : public MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge
{
public:
- MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubscriptionBridge(
+ MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge(
dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
MTRSubscriptionEstablishedHandler establishedHandler) :
- MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge(queue, handler, action),
+ MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(queue, handler, action),
mEstablishedHandler(establishedHandler)
{}
void OnSubscriptionEstablished();
- using MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge::KeepAliveOnCallback;
- using MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge::OnDone;
+ using MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::KeepAliveOnCallback;
+ using MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnDone;
private:
MTRSubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge
- : public MTRCallbackBridge<GeneralDiagnosticsClusterRadioFaultAttributeCallback>
+class MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<GeneralDiagnosticsClusterRadioFaultEnumAttributeCallback>
{
public:
- MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
- MTRCallbackBridge<GeneralDiagnosticsClusterRadioFaultAttributeCallback>(queue, handler, OnSuccessFn){};
+ MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+ MTRCallbackBridge<GeneralDiagnosticsClusterRadioFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
- MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRActionBlock action) :
- MTRCallbackBridge<GeneralDiagnosticsClusterRadioFaultAttributeCallback>(queue, handler, action, OnSuccessFn){};
+ MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRActionBlock action) :
+ MTRCallbackBridge<GeneralDiagnosticsClusterRadioFaultEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
- static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::RadioFault value);
+ static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum value);
};
-class MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge
- : public MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge
+class MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackSubscriptionBridge
+ : public MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge
{
public:
- MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge(
+ MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackSubscriptionBridge(
dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
MTRSubscriptionEstablishedHandler establishedHandler) :
- MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(queue, handler, action),
+ MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge(queue, handler, action),
mEstablishedHandler(establishedHandler)
{}
void OnSubscriptionEstablished();
- using MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::KeepAliveOnCallback;
- using MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::OnDone;
+ using MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge::KeepAliveOnCallback;
+ using MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge::OnDone;
private:
MTRSubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge
- : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterRadioFaultAttributeCallback>
+class MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallback>
{
public:
- MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
- MTRCallbackBridge<NullableGeneralDiagnosticsClusterRadioFaultAttributeCallback>(queue, handler, OnSuccessFn){};
+ MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+ MTRCallbackBridge<NullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
- MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRActionBlock action) :
- MTRCallbackBridge<NullableGeneralDiagnosticsClusterRadioFaultAttributeCallback>(queue, handler, action, OnSuccessFn){};
+ MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRActionBlock action) :
+ MTRCallbackBridge<NullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
static void OnSuccessFn(void * context,
- const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::RadioFault> & value);
+ const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & value);
};
-class MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge
- : public MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge
+class MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackSubscriptionBridge
+ : public MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge
{
public:
- MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge(
+ MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackSubscriptionBridge(
dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
MTRSubscriptionEstablishedHandler establishedHandler) :
- MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(queue, handler, action),
+ MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge(queue, handler, action),
mEstablishedHandler(establishedHandler)
{}
void OnSubscriptionEstablished();
- using MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::KeepAliveOnCallback;
- using MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::OnDone;
+ using MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge::KeepAliveOnCallback;
+ using MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge::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 85f1ae4..0947b5d 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
@@ -4142,7 +4142,7 @@
}
void MTRGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & value)
+ void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & value)
{
NSArray * _Nonnull objCValue;
{ // Scope for our temporary variables
@@ -4180,7 +4180,7 @@
}
void MTRGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> & value)
+ void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & value)
{
NSArray * _Nonnull objCValue;
{ // Scope for our temporary variables
@@ -4218,7 +4218,7 @@
}
void MTRGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & value)
+ void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & value)
{
NSArray * _Nonnull objCValue;
{ // Scope for our temporary variables
@@ -15110,15 +15110,15 @@
}
}
-void MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::OnSuccessFn(
- void * context, chip::app::Clusters::GeneralDiagnostics::HardwareFault value)
+void MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum value)
{
NSNumber * _Nonnull objCValue;
objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
DispatchSuccess(context, objCValue);
};
-void MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
{
if (!mQueue) {
return;
@@ -15133,8 +15133,8 @@
}
}
-void MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & value)
+void MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & value)
{
NSNumber * _Nullable objCValue;
if (value.IsNull()) {
@@ -15145,7 +15145,7 @@
DispatchSuccess(context, objCValue);
};
-void MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
{
if (!mQueue) {
return;
@@ -15160,15 +15160,15 @@
}
}
-void MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge::OnSuccessFn(
- void * context, chip::app::Clusters::GeneralDiagnostics::InterfaceType value)
+void MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, chip::app::Clusters::GeneralDiagnostics::InterfaceTypeEnum value)
{
NSNumber * _Nonnull objCValue;
objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
DispatchSuccess(context, objCValue);
};
-void MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
{
if (!mQueue) {
return;
@@ -15183,8 +15183,8 @@
}
}
-void MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::InterfaceType> & value)
+void MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::InterfaceTypeEnum> & value)
{
NSNumber * _Nullable objCValue;
if (value.IsNull()) {
@@ -15195,7 +15195,7 @@
DispatchSuccess(context, objCValue);
};
-void MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
{
if (!mQueue) {
return;
@@ -15210,15 +15210,15 @@
}
}
-void MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge::OnSuccessFn(
- void * context, chip::app::Clusters::GeneralDiagnostics::NetworkFaultType value)
+void MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum value)
{
NSNumber * _Nonnull objCValue;
objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
DispatchSuccess(context, objCValue);
};
-void MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
{
if (!mQueue) {
return;
@@ -15233,8 +15233,8 @@
}
}
-void MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & value)
+void MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & value)
{
NSNumber * _Nullable objCValue;
if (value.IsNull()) {
@@ -15245,7 +15245,7 @@
DispatchSuccess(context, objCValue);
};
-void MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
{
if (!mQueue) {
return;
@@ -15260,15 +15260,15 @@
}
}
-void MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::OnSuccessFn(
- void * context, chip::app::Clusters::GeneralDiagnostics::RadioFault value)
+void MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum value)
{
NSNumber * _Nonnull objCValue;
objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
DispatchSuccess(context, objCValue);
};
-void MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
{
if (!mQueue) {
return;
@@ -15283,8 +15283,8 @@
}
}
-void MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::RadioFault> & value)
+void MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & value)
{
NSNumber * _Nullable objCValue;
if (value.IsNull()) {
@@ -15295,7 +15295,7 @@
DispatchSuccess(context, objCValue);
};
-void MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
{
if (!mQueue) {
return;
diff --git a/src/platform/Ameba/DiagnosticDataProviderImpl.cpp b/src/platform/Ameba/DiagnosticDataProviderImpl.cpp
index dad583f..d0ad922 100644
--- a/src/platform/Ameba/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Ameba/DiagnosticDataProviderImpl.cpp
@@ -201,9 +201,9 @@
ifp->name = CharSpan::fromCharString(ifp->Name);
ifp->isOperational = true;
if ((ifa->flags) & NETIF_FLAG_ETHERNET)
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
else
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
ifp->offPremiseServicesReachableIPv4.SetNull();
ifp->offPremiseServicesReachableIPv6.SetNull();
diff --git a/src/platform/Beken/DiagnosticDataProviderImpl.cpp b/src/platform/Beken/DiagnosticDataProviderImpl.cpp
index b2f0be7..f3077a0 100644
--- a/src/platform/Beken/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Beken/DiagnosticDataProviderImpl.cpp
@@ -134,7 +134,7 @@
Platform::CopyString(ifp->Name, netif->hostname);
ifp->name = CharSpan::fromCharString(ifp->Name);
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
ifp->offPremiseServicesReachableIPv4.SetNonNull(false);
ifp->offPremiseServicesReachableIPv6.SetNonNull(false);
memcpy(ifp->MacAddress, netif->hwaddr, sizeof(netif->hwaddr));
diff --git a/src/platform/ESP32/DiagnosticDataProviderImpl.cpp b/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
index 6dc6828..c21e72e 100644
--- a/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
@@ -50,15 +50,15 @@
namespace {
-InterfaceType GetInterfaceType(const char * if_desc)
+InterfaceTypeEnum GetInterfaceType(const char * if_desc)
{
if (strncmp(if_desc, "ap", strnlen(if_desc, 2)) == 0 || strncmp(if_desc, "sta", strnlen(if_desc, 3)) == 0)
- return InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ return InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
if (strncmp(if_desc, "openthread", strnlen(if_desc, 10)) == 0)
- return InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+ return InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
if (strncmp(if_desc, "eth", strnlen(if_desc, 3)) == 0)
- return InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
- return InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+ return InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
+ return InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
}
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
diff --git a/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp b/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp
index 2deec6d..5b92bc2 100644
--- a/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp
@@ -107,7 +107,7 @@
ifp->offPremiseServicesReachableIPv4.SetNull();
ifp->offPremiseServicesReachableIPv6.SetNull();
ifp->hardwareAddress = ByteSpan(ifp->MacAddress);
- ifp->type = app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+ ifp->type = app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
static_assert(sizeof(ifp->MacAddress) >= ConfigurationManager::kPrimaryMACAddressLength, "Invalid MacAddress buffer size");
ConfigurationMgr().GetPrimary802154MACAddress(ifp->MacAddress);
diff --git a/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
index 4413309..1c9ccfb 100644
--- a/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
@@ -161,7 +161,7 @@
/* Update Network Interface list */
ifp->name = CharSpan::fromCharString(net_interface->name);
ifp->isOperational = net_interface->flags & NETIF_FLAG_LINK_UP;
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
ifp->offPremiseServicesReachableIPv4 = mipv4_offpremise;
ifp->offPremiseServicesReachableIPv6 = mipv6_offpremise;
ifp->hardwareAddress = ByteSpan(net_interface->hwaddr, net_interface->hwaddr_len);
diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp
index 4447a1a..dfeed0e 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.cpp
+++ b/src/platform/Linux/ConnectivityManagerImpl.cpp
@@ -1165,7 +1165,8 @@
// Walk through linked list, maintaining head pointer so we can free list later.
for (struct ifaddrs * ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+ if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+ InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
{
if (ConnectivityUtils::GetInterfaceHardwareAddrs(ifa->ifa_name, macAddress, kMaxHardwareAddrSize) != CHIP_NO_ERROR)
{
diff --git a/src/platform/Linux/ConnectivityUtils.cpp b/src/platform/Linux/ConnectivityUtils.cpp
index 7b9ffdd..3d85f1c 100644
--- a/src/platform/Linux/ConnectivityUtils.cpp
+++ b/src/platform/Linux/ConnectivityUtils.cpp
@@ -243,15 +243,15 @@
return result;
}
-InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
+InterfaceTypeEnum ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
{
- InterfaceType ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
- int sock = -1;
+ InterfaceTypeEnum ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
+ int sock = -1;
if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1)
{
ChipLogError(DeviceLayer, "Failed to open socket");
- return InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+ return InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
}
// Test wireless extensions for CONNECTION_WIFI
@@ -260,7 +260,7 @@
if (ioctl(sock, SIOCGIWNAME, &pwrq) != -1)
{
- ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
}
else if ((strncmp(ifname, "en", 2) == 0) || (strncmp(ifname, "eth", 3) == 0))
{
@@ -271,7 +271,7 @@
Platform::CopyString(ifr.ifr_name, ifname);
if (ioctl(sock, SIOCETHTOOL, &ifr) != -1)
- ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+ ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
}
close(sock);
@@ -420,7 +420,7 @@
can free list later */
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+ if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
{
Platform::CopyString(ifname, bufSize, ifa->ifa_name);
err = CHIP_NO_ERROR;
@@ -614,7 +614,7 @@
can free list later */
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+ if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
{
Platform::CopyString(ifname, bufSize, ifa->ifa_name);
err = CHIP_NO_ERROR;
diff --git a/src/platform/Linux/ConnectivityUtils.h b/src/platform/Linux/ConnectivityUtils.h
index 5379297..e4884e9 100644
--- a/src/platform/Linux/ConnectivityUtils.h
+++ b/src/platform/Linux/ConnectivityUtils.h
@@ -43,7 +43,7 @@
public:
static uint16_t MapChannelToFrequency(const uint16_t inBand, const uint8_t inChannel);
static uint8_t MapFrequencyToChannel(const uint16_t frequency);
- static app::Clusters::GeneralDiagnostics::InterfaceType GetInterfaceConnectionType(const char * ifname);
+ static app::Clusters::GeneralDiagnostics::InterfaceTypeEnum GetInterfaceConnectionType(const char * ifname);
static CHIP_ERROR GetInterfaceHardwareAddrs(const char * ifname, uint8_t * buf, size_t bufSize);
static CHIP_ERROR GetInterfaceIPv4Addrs(const char * ifname, uint8_t & size, NetworkInterface * ifp);
static CHIP_ERROR GetInterfaceIPv6Addrs(const char * ifname, uint8_t & size, NetworkInterface * ifp);
diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.cpp b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
index af1a0b8..4a348b8 100644
--- a/src/platform/Linux/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
@@ -91,7 +91,8 @@
// Walk through linked list, maintaining head pointer so we can free list later.
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+ if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+ InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
{
ChipLogProgress(DeviceLayer, "Found the primary Ethernet interface:%s", StringOrNullMarker(ifa->ifa_name));
break;
@@ -155,7 +156,8 @@
// Walk through linked list, maintaining head pointer so we can free list later.
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+ if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+ InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
{
ChipLogProgress(DeviceLayer, "Found the primary WiFi interface:%s", StringOrNullMarker(ifa->ifa_name));
break;
@@ -398,10 +400,10 @@
{
#if CHIP_CONFIG_TEST
// On Linux Simulation, set following hardware faults statically.
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -411,10 +413,10 @@
{
#if CHIP_CONFIG_TEST
// On Linux Simulation, set following radio faults statically.
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT));
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_CELLULAR_FAULT));
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_NFC_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -424,9 +426,9 @@
{
#if CHIP_CONFIG_TEST
// On Linux Simulation, set following radio faults statically.
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
#endif
return CHIP_NO_ERROR;
@@ -613,7 +615,8 @@
// Walk through linked list, maintaining head pointer so we can free list later.
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+ if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+ InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
{
ChipLogProgress(DeviceLayer, "Found the primary Ethernet interface:%s", StringOrNullMarker(ifa->ifa_name));
break;
@@ -778,7 +781,8 @@
// Walk through linked list, maintaining head pointer so we can free list later.
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+ if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+ InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
{
ChipLogProgress(DeviceLayer, "Found the primary WiFi interface:%s", StringOrNullMarker(ifa->ifa_name));
break;
diff --git a/src/platform/Tizen/ConnectivityUtils.cpp b/src/platform/Tizen/ConnectivityUtils.cpp
index 5c5d56b..4a1f94e 100644
--- a/src/platform/Tizen/ConnectivityUtils.cpp
+++ b/src/platform/Tizen/ConnectivityUtils.cpp
@@ -43,10 +43,10 @@
namespace DeviceLayer {
namespace Internal {
-app::Clusters::GeneralDiagnostics::InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
+app::Clusters::GeneralDiagnostics::InterfaceTypeEnum ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
{
- app::Clusters::GeneralDiagnostics::InterfaceType ret =
- app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+ app::Clusters::GeneralDiagnostics::InterfaceTypeEnum ret =
+ app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
int sock = -1;
if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1)
@@ -61,7 +61,7 @@
if (ioctl(sock, SIOCGIWNAME, &pwrq) != -1)
{
- ret = app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ ret = app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
}
else if ((strncmp(ifname, "en", 2) == 0) || (strncmp(ifname, "eth", 3) == 0))
{
@@ -72,7 +72,7 @@
Platform::CopyString(ifr.ifr_name, ifname);
if (ioctl(sock, SIOCETHTOOL, &ifr) != -1)
- ret = app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+ ret = app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
}
close(sock);
diff --git a/src/platform/Tizen/ConnectivityUtils.h b/src/platform/Tizen/ConnectivityUtils.h
index 6c8f5c8..16fb182 100644
--- a/src/platform/Tizen/ConnectivityUtils.h
+++ b/src/platform/Tizen/ConnectivityUtils.h
@@ -28,7 +28,7 @@
class ConnectivityUtils
{
public:
- static app::Clusters::GeneralDiagnostics::InterfaceType GetInterfaceConnectionType(const char * ifname);
+ static app::Clusters::GeneralDiagnostics::InterfaceTypeEnum GetInterfaceConnectionType(const char * ifname);
};
} // namespace Internal
diff --git a/src/platform/Tizen/NetworkCommissioningEthernetDriver.cpp b/src/platform/Tizen/NetworkCommissioningEthernetDriver.cpp
index 6a95f95..8679b44 100644
--- a/src/platform/Tizen/NetworkCommissioningEthernetDriver.cpp
+++ b/src/platform/Tizen/NetworkCommissioningEthernetDriver.cpp
@@ -43,7 +43,7 @@
for (const auto * ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
if (DeviceLayer::Internal::ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
- app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+ app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
{
mInterfaces.push_back(ifa->ifa_name);
if (mInterfaces.size() == mDriver->GetMaxNetworks())
diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
index c1fb842..9398359 100644
--- a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
@@ -258,19 +258,19 @@
switch (interfaceType)
{
case Inet::InterfaceType::Unknown:
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
break;
case Inet::InterfaceType::WiFi:
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
break;
case Inet::InterfaceType::Ethernet:
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
break;
case Inet::InterfaceType::Thread:
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_THREAD;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
break;
case Inet::InterfaceType::Cellular:
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_CELLULAR;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_CELLULAR;
break;
}
}
diff --git a/src/platform/android/DiagnosticDataProviderImpl.cpp b/src/platform/android/DiagnosticDataProviderImpl.cpp
index 49a8323..3b0784a 100644
--- a/src/platform/android/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/android/DiagnosticDataProviderImpl.cpp
@@ -169,7 +169,7 @@
}
jfieldID getTypeField = env->GetFieldID(nifClass, "type", "I");
- ifp->type = static_cast<InterfaceType>(env->GetIntField(nifObject, getTypeField));
+ ifp->type = static_cast<InterfaceTypeEnum>(env->GetIntField(nifObject, getTypeField));
jfieldID ipv4AddressField = env->GetFieldID(nifClass, "ipv4Address", "[B");
jbyteArray jIpv4AddressObj = static_cast<jbyteArray>(env->GetObjectField(nifObject, ipv4AddressField));
diff --git a/src/platform/android/java/chip/platform/DiagnosticDataProviderImpl.java b/src/platform/android/java/chip/platform/DiagnosticDataProviderImpl.java
index 4a90a48..e7f51e5 100644
--- a/src/platform/android/java/chip/platform/DiagnosticDataProviderImpl.java
+++ b/src/platform/android/java/chip/platform/DiagnosticDataProviderImpl.java
@@ -65,8 +65,8 @@
anInterface.name = nif.getName();
anInterface.type =
name.startsWith("wlan")
- ? NetworkInterface.INTERFACE_TYPE_WI_FI
- : NetworkInterface.INTERFACE_TYPE_ETHERNET;
+ ? NetworkInterface.INTERFACE_TYPE_ENUM_WI_FI
+ : NetworkInterface.INTERFACE_TYPE_ENUM_ETHERNET;
Enumeration<InetAddress> inetAddress = nif.getInetAddresses();
while (inetAddress.hasMoreElements()) {
diff --git a/src/platform/android/java/chip/platform/NetworkInterface.java b/src/platform/android/java/chip/platform/NetworkInterface.java
index 6898d09..aedcc4b 100644
--- a/src/platform/android/java/chip/platform/NetworkInterface.java
+++ b/src/platform/android/java/chip/platform/NetworkInterface.java
@@ -21,11 +21,11 @@
public class NetworkInterface {
- public static final int INTERFACE_TYPE_UNSPECIFIED = 0x00;
- public static final int INTERFACE_TYPE_WI_FI = 0x01;
- public static final int INTERFACE_TYPE_ETHERNET = 0x02;
- public static final int INTERFACE_TYPE_CELLULAR = 0x03;
- public static final int INTERFACE_TYPE_THREAD = 0x04;
+ public static final int INTERFACE_TYPE_ENUM_UNSPECIFIED = 0x00;
+ public static final int INTERFACE_TYPE_ENUM_WI_FI = 0x01;
+ public static final int INTERFACE_TYPE_ENUM_ETHERNET = 0x02;
+ public static final int INTERFACE_TYPE_ENUM_CELLULAR = 0x03;
+ public static final int INTERFACE_TYPE_ENUM_THREAD = 0x04;
public String name;
public boolean isOperational;
diff --git a/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp
index 9c97207..143492e 100644
--- a/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp
@@ -194,7 +194,7 @@
Platform::CopyString(ifp->Name, netif->name);
ifp->name = CharSpan::fromCharString(ifp->Name);
ifp->isOperational = true;
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
ifp->offPremiseServicesReachableIPv4.SetNull();
ifp->offPremiseServicesReachableIPv6.SetNull();
bl_efuse_read_mac(ifp->MacAddress);
diff --git a/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp
index d5e90db..5cc8f91 100644
--- a/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp
@@ -212,10 +212,10 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMaxHardwareFaults> & hardwareFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -224,8 +224,8 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRadioFaults> & radioFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -234,9 +234,9 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
#endif
return CHIP_NO_ERROR;
@@ -253,7 +253,7 @@
ifp->isOperational = true;
ifp->offPremiseServicesReachableIPv4.SetNull();
ifp->offPremiseServicesReachableIPv6.SetNull();
- ifp->type = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+ ifp->type = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
uint8_t macBuffer[ConfigurationManager::kPrimaryMACAddressLength];
ConfigurationMgr().GetPrimary802154MACAddress(macBuffer);
ifp->hardwareAddress = ByteSpan(macBuffer, ConfigurationManager::kPrimaryMACAddressLength);
diff --git a/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp b/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp
index 17d8a98..78042b7 100644
--- a/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp
@@ -205,10 +205,10 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMaxHardwareFaults> & hardwareFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -217,8 +217,8 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRadioFaults> & radioFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -227,9 +227,9 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
#endif
return CHIP_NO_ERROR;
@@ -244,7 +244,7 @@
ifp->isOperational = true;
ifp->offPremiseServicesReachableIPv4.SetNull();
ifp->offPremiseServicesReachableIPv6.SetNull();
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_THREAD;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
otExtAddress extAddr;
ThreadStackMgrImpl().GetExtAddress(extAddr);
diff --git a/src/platform/mt793x/DiagnosticDataProviderImpl.cpp b/src/platform/mt793x/DiagnosticDataProviderImpl.cpp
index 036044a..ba91779 100644
--- a/src/platform/mt793x/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/mt793x/DiagnosticDataProviderImpl.cpp
@@ -170,10 +170,10 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMaxHardwareFaults> & hardwareFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -182,8 +182,8 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRadioFaults> & radioFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -192,9 +192,9 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
#endif
return CHIP_NO_ERROR;
@@ -210,7 +210,7 @@
ifp->fabricConnected = true;
ifp->offPremiseServicesReachableIPv4.SetNonNull(false);
ifp->offPremiseServicesReachableIPv6.SetNonNull(false);
- ifp->type = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+ ifp->type = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
#else
/* TODO */
#endif
diff --git a/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp b/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp
index bb16488..5d0f48b 100644
--- a/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp
@@ -219,7 +219,7 @@
ifp->isOperational = true;
ifp->offPremiseServicesReachableIPv4.SetNull();
ifp->offPremiseServicesReachableIPv6.SetNull();
- ifp->type = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+ ifp->type = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
uint8_t macBuffer[ConfigurationManager::kPrimaryMACAddressLength];
ConfigurationMgr().GetPrimary802154MACAddress(macBuffer);
ifp->hardwareAddress = ByteSpan(macBuffer, ConfigurationManager::kPrimaryMACAddressLength);
diff --git a/src/platform/nxp/mw320/ConnectivityUtils.cpp b/src/platform/nxp/mw320/ConnectivityUtils.cpp
index c6ca3a1..956fba5 100644
--- a/src/platform/nxp/mw320/ConnectivityUtils.cpp
+++ b/src/platform/nxp/mw320/ConnectivityUtils.cpp
@@ -240,10 +240,10 @@
return result;
}
*/
-InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
+InterfaceTypeEnum ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
{
// MW320 only has the wifi interface
- InterfaceType ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ InterfaceTypeEnum ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
return ret;
}
diff --git a/src/platform/nxp/mw320/ConnectivityUtils.h b/src/platform/nxp/mw320/ConnectivityUtils.h
index 6e05a9e..ddf5039 100644
--- a/src/platform/nxp/mw320/ConnectivityUtils.h
+++ b/src/platform/nxp/mw320/ConnectivityUtils.h
@@ -43,7 +43,7 @@
public:
static uint16_t MapChannelToFrequency(const uint16_t inBand, const uint8_t inChannel);
static uint8_t MapFrequencyToChannel(const uint16_t frequency);
- static app::Clusters::GeneralDiagnostics::InterfaceType GetInterfaceConnectionType(const char * ifname);
+ static app::Clusters::GeneralDiagnostics::InterfaceTypeEnum GetInterfaceConnectionType(const char * ifname);
static CHIP_ERROR GetInterfaceHardwareAddrs(const char * ifname, uint8_t * buf, size_t bufSize);
static CHIP_ERROR GetInterfaceIPv4Addrs(const char * ifname, uint8_t & size, NetworkInterface * ifp);
static CHIP_ERROR GetInterfaceIPv6Addrs(const char * ifname, uint8_t & size, NetworkInterface * ifp);
diff --git a/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp b/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp
index 01d3485..244cd30 100644
--- a/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp
@@ -163,7 +163,7 @@
ifp->Name[Inet::InterfaceId::kMaxIfNameLength - 1] = '\0';
ifp->name = CharSpan::fromCharString(ifp->Name);
ifp->isOperational = true;
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
ifp->offPremiseServicesReachableIPv4.SetNull();
ifp->offPremiseServicesReachableIPv6.SetNull();
if (ConnectivityUtils::GetInterfaceIPv4Addrs("", size, ifp) == CHIP_NO_ERROR)
diff --git a/src/platform/qpg/DiagnosticDataProviderImpl.cpp b/src/platform/qpg/DiagnosticDataProviderImpl.cpp
index aff2056..18c3f60 100644
--- a/src/platform/qpg/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/qpg/DiagnosticDataProviderImpl.cpp
@@ -145,10 +145,10 @@
ChipLogProgress(DeviceLayer, "GetActiveHardwareFaults");
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -158,8 +158,8 @@
{
ChipLogProgress(DeviceLayer, "GetActiveRadioFaults");
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -169,9 +169,9 @@
{
ChipLogProgress(DeviceLayer, "GetActiveNetworkFaults");
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
#endif
return CHIP_NO_ERROR;
diff --git a/src/platform/silabs/DiagnosticDataProviderImpl.cpp b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
index c379f41..033886d 100644
--- a/src/platform/silabs/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
@@ -212,10 +212,10 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMaxHardwareFaults> & hardwareFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -224,8 +224,8 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRadioFaults> & radioFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -234,9 +234,9 @@
CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults)
{
#if CHIP_CONFIG_TEST
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
#endif
return CHIP_NO_ERROR;
@@ -252,7 +252,7 @@
ifp->isOperational = true;
ifp->offPremiseServicesReachableIPv4.SetNull();
ifp->offPremiseServicesReachableIPv6.SetNull();
- ifp->type = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+ ifp->type = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
uint8_t macBuffer[ConfigurationManager::kPrimaryMACAddressLength];
ConfigurationMgr().GetPrimary802154MACAddress(macBuffer);
ifp->hardwareAddress = ByteSpan(macBuffer, ConfigurationManager::kPrimaryMACAddressLength);
@@ -270,22 +270,22 @@
switch (interfaceType)
{
case Inet::InterfaceType::Unknown:
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
break;
case Inet::InterfaceType::WiFi:
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
break;
case Inet::InterfaceType::Ethernet:
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
break;
case Inet::InterfaceType::Thread:
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_THREAD;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
break;
case Inet::InterfaceType::Cellular:
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_CELLULAR;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_CELLULAR;
break;
default:
- ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
break;
}
}
diff --git a/src/platform/webos/ConnectivityManagerImpl.cpp b/src/platform/webos/ConnectivityManagerImpl.cpp
index 014dd52..9a2cf9f 100644
--- a/src/platform/webos/ConnectivityManagerImpl.cpp
+++ b/src/platform/webos/ConnectivityManagerImpl.cpp
@@ -1127,7 +1127,8 @@
// Walk through linked list, maintaining head pointer so we can free list later.
for (struct ifaddrs * ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+ if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+ InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
{
if (ConnectivityUtils::GetInterfaceHardwareAddrs(ifa->ifa_name, macAddress, kMaxHardwareAddrSize) != CHIP_NO_ERROR)
{
diff --git a/src/platform/webos/ConnectivityUtils.cpp b/src/platform/webos/ConnectivityUtils.cpp
index 73ebe93..9e31217 100644
--- a/src/platform/webos/ConnectivityUtils.cpp
+++ b/src/platform/webos/ConnectivityUtils.cpp
@@ -243,15 +243,15 @@
return result;
}
-InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
+InterfaceTypeEnum ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
{
- InterfaceType ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
- int sock = -1;
+ InterfaceTypeEnum ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
+ int sock = -1;
if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1)
{
ChipLogError(DeviceLayer, "Failed to open socket");
- return InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+ return InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
}
// Test wireless extensions for CONNECTION_WIFI
@@ -260,7 +260,7 @@
if (ioctl(sock, SIOCGIWNAME, &pwrq) != -1)
{
- ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
}
else if ((strncmp(ifname, "en", 2) == 0) || (strncmp(ifname, "eth", 3) == 0))
{
@@ -271,7 +271,7 @@
Platform::CopyString(ifr.ifr_name, ifname);
if (ioctl(sock, SIOCETHTOOL, &ifr) != -1)
- ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+ ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
}
close(sock);
@@ -328,7 +328,7 @@
can free list later */
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+ if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
{
Platform::CopyString(ifname, bufSize, ifa->ifa_name);
err = CHIP_NO_ERROR;
@@ -522,7 +522,7 @@
can free list later */
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+ if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
{
Platform::CopyString(ifname, bufSize, ifa->ifa_name);
err = CHIP_NO_ERROR;
diff --git a/src/platform/webos/ConnectivityUtils.h b/src/platform/webos/ConnectivityUtils.h
index 28c4b01..7670c81 100644
--- a/src/platform/webos/ConnectivityUtils.h
+++ b/src/platform/webos/ConnectivityUtils.h
@@ -42,7 +42,7 @@
public:
static uint16_t MapChannelToFrequency(const uint16_t inBand, const uint8_t inChannel);
static uint8_t MapFrequencyToChannel(const uint16_t frequency);
- static app::Clusters::GeneralDiagnostics::InterfaceType GetInterfaceConnectionType(const char * ifname);
+ static app::Clusters::GeneralDiagnostics::InterfaceTypeEnum GetInterfaceConnectionType(const char * ifname);
static CHIP_ERROR GetInterfaceHardwareAddrs(const char * ifname, uint8_t * buf, size_t bufSize);
static CHIP_ERROR GetWiFiInterfaceName(char * ifname, size_t bufSize);
static CHIP_ERROR GetWiFiChannelNumber(const char * ifname, uint16_t & channelNumber);
diff --git a/src/platform/webos/DiagnosticDataProviderImpl.cpp b/src/platform/webos/DiagnosticDataProviderImpl.cpp
index fa357ac..4035e24 100644
--- a/src/platform/webos/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/webos/DiagnosticDataProviderImpl.cpp
@@ -88,7 +88,8 @@
// Walk through linked list, maintaining head pointer so we can free list later.
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+ if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+ InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
{
ChipLogProgress(DeviceLayer, "Found the primary Ethernet interface:%s", StringOrNullMarker(ifa->ifa_name));
break;
@@ -152,7 +153,8 @@
// Walk through linked list, maintaining head pointer so we can free list later.
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+ if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+ InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
{
ChipLogProgress(DeviceLayer, "Found the primary WiFi interface:%s", StringOrNullMarker(ifa->ifa_name));
break;
@@ -384,10 +386,10 @@
{
#if CHIP_CONFIG_TEST
// On Linux Simulation, set following hardware faults statically.
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
- ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+ ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -397,10 +399,10 @@
{
#if CHIP_CONFIG_TEST
// On Linux Simulation, set following radio faults statically.
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT));
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_CELLULAR_FAULT));
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
- ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_NFC_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+ ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT));
#endif
return CHIP_NO_ERROR;
@@ -410,9 +412,9 @@
{
#if CHIP_CONFIG_TEST
// On Linux Simulation, set following radio faults statically.
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
- ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+ ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
#endif
return CHIP_NO_ERROR;
@@ -582,7 +584,8 @@
// Walk through linked list, maintaining head pointer so we can free list later.
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+ if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+ InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
{
ChipLogProgress(DeviceLayer, "Found the primary Ethernet interface:%s", StringOrNullMarker(ifa->ifa_name));
break;
@@ -747,7 +750,8 @@
// Walk through linked list, maintaining head pointer so we can free list later.
for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+ if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+ InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
{
ChipLogProgress(DeviceLayer, "Found the primary WiFi interface:%s", StringOrNullMarker(ifa->ifa_name));
break;
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 4e6daeb..961a9a1 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
@@ -685,9 +685,9 @@
return static_cast<EnumType>(7);
}
}
-static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::HardwareFault val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::HardwareFaultEnum val)
{
- using EnumType = GeneralDiagnostics::HardwareFault;
+ using EnumType = GeneralDiagnostics::HardwareFaultEnum;
switch (val)
{
// Need to convert consumers to using the new enum classes, so we
@@ -705,26 +705,26 @@
case EnumType::kNonVolatileMemoryError:
case EnumType::kTamperDetected:
#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
- case EMBER_ZCL_HARDWARE_FAULT_UNSPECIFIED:
- case EMBER_ZCL_HARDWARE_FAULT_RADIO:
- case EMBER_ZCL_HARDWARE_FAULT_SENSOR:
- case EMBER_ZCL_HARDWARE_FAULT_RESETTABLE_OVER_TEMP:
- case EMBER_ZCL_HARDWARE_FAULT_NON_RESETTABLE_OVER_TEMP:
- case EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE:
- case EMBER_ZCL_HARDWARE_FAULT_VISUAL_DISPLAY_FAULT:
- case EMBER_ZCL_HARDWARE_FAULT_AUDIO_OUTPUT_FAULT:
- case EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT:
- case EMBER_ZCL_HARDWARE_FAULT_NON_VOLATILE_MEMORY_ERROR:
- case EMBER_ZCL_HARDWARE_FAULT_TAMPER_DETECTED:
+ case EMBER_ZCL_HARDWARE_FAULT_ENUM_UNSPECIFIED:
+ case EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO:
+ case EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR:
+ case EMBER_ZCL_HARDWARE_FAULT_ENUM_RESETTABLE_OVER_TEMP:
+ case EMBER_ZCL_HARDWARE_FAULT_ENUM_NON_RESETTABLE_OVER_TEMP:
+ case EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE:
+ case EMBER_ZCL_HARDWARE_FAULT_ENUM_VISUAL_DISPLAY_FAULT:
+ case EMBER_ZCL_HARDWARE_FAULT_ENUM_AUDIO_OUTPUT_FAULT:
+ case EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT:
+ case EMBER_ZCL_HARDWARE_FAULT_ENUM_NON_VOLATILE_MEMORY_ERROR:
+ case EMBER_ZCL_HARDWARE_FAULT_ENUM_TAMPER_DETECTED:
#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
return val;
default:
return static_cast<EnumType>(11);
}
}
-static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::InterfaceType val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::InterfaceTypeEnum val)
{
- using EnumType = GeneralDiagnostics::InterfaceType;
+ using EnumType = GeneralDiagnostics::InterfaceTypeEnum;
switch (val)
{
// Need to convert consumers to using the new enum classes, so we
@@ -736,20 +736,20 @@
case EnumType::kCellular:
case EnumType::kThread:
#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
- case EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED:
- case EMBER_ZCL_INTERFACE_TYPE_WI_FI:
- case EMBER_ZCL_INTERFACE_TYPE_ETHERNET:
- case EMBER_ZCL_INTERFACE_TYPE_CELLULAR:
- case EMBER_ZCL_INTERFACE_TYPE_THREAD:
+ case EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED:
+ case EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI:
+ case EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET:
+ case EMBER_ZCL_INTERFACE_TYPE_ENUM_CELLULAR:
+ case EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD:
#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
return val;
default:
return static_cast<EnumType>(5);
}
}
-static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::NetworkFaultType val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::NetworkFaultEnum val)
{
- using EnumType = GeneralDiagnostics::NetworkFaultType;
+ using EnumType = GeneralDiagnostics::NetworkFaultEnum;
switch (val)
{
// Need to convert consumers to using the new enum classes, so we
@@ -760,19 +760,19 @@
case EnumType::kNetworkJammed:
case EnumType::kConnectionFailed:
#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
- case EMBER_ZCL_NETWORK_FAULT_TYPE_UNSPECIFIED:
- case EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE:
- case EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED:
- case EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED:
+ case EMBER_ZCL_NETWORK_FAULT_ENUM_UNSPECIFIED:
+ case EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE:
+ case EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED:
+ case EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED:
#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
return val;
default:
return static_cast<EnumType>(4);
}
}
-static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::RadioFault val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::RadioFaultEnum val)
{
- using EnumType = GeneralDiagnostics::RadioFault;
+ using EnumType = GeneralDiagnostics::RadioFaultEnum;
switch (val)
{
// Need to convert consumers to using the new enum classes, so we
@@ -786,13 +786,13 @@
case EnumType::kBLEFault:
case EnumType::kEthernetFault:
#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
- case EMBER_ZCL_RADIO_FAULT_UNSPECIFIED:
- case EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT:
- case EMBER_ZCL_RADIO_FAULT_CELLULAR_FAULT:
- case EMBER_ZCL_RADIO_FAULT_THREAD_FAULT:
- case EMBER_ZCL_RADIO_FAULT_NFC_FAULT:
- case EMBER_ZCL_RADIO_FAULT_BLE_FAULT:
- case EMBER_ZCL_RADIO_FAULT_ETHERNET_FAULT:
+ case EMBER_ZCL_RADIO_FAULT_ENUM_UNSPECIFIED:
+ case EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT:
+ case EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT:
+ case EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT:
+ case EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT:
+ case EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT:
+ case EMBER_ZCL_RADIO_FAULT_ENUM_ETHERNET_FAULT:
#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
return val;
default:
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 1001319..d63e9a3 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
@@ -670,8 +670,8 @@
// Need to convert consumers to using the new enum classes, so we
// don't just have casts all over.
#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for HardwareFault
-enum class HardwareFault : uint8_t
+// Enum for HardwareFaultEnum
+enum class HardwareFaultEnum : uint8_t
{
kUnspecified = 0x00,
kRadio = 0x01,
@@ -687,15 +687,15 @@
kUnknownEnumValue = 11,
};
#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using HardwareFault = EmberAfHardwareFault;
-static HardwareFault __attribute__((unused)) kHardwareFaultkUnknownEnumValue = static_cast<HardwareFault>(11);
+using HardwareFaultEnum = EmberAfHardwareFaultEnum;
+static HardwareFaultEnum __attribute__((unused)) kHardwareFaultEnumkUnknownEnumValue = static_cast<HardwareFaultEnum>(11);
#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
// Need to convert consumers to using the new enum classes, so we
// don't just have casts all over.
#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for InterfaceType
-enum class InterfaceType : uint8_t
+// Enum for InterfaceTypeEnum
+enum class InterfaceTypeEnum : uint8_t
{
kUnspecified = 0x00,
kWiFi = 0x01,
@@ -705,15 +705,15 @@
kUnknownEnumValue = 5,
};
#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using InterfaceType = EmberAfInterfaceType;
-static InterfaceType __attribute__((unused)) kInterfaceTypekUnknownEnumValue = static_cast<InterfaceType>(5);
+using InterfaceTypeEnum = EmberAfInterfaceTypeEnum;
+static InterfaceTypeEnum __attribute__((unused)) kInterfaceTypeEnumkUnknownEnumValue = static_cast<InterfaceTypeEnum>(5);
#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
// Need to convert consumers to using the new enum classes, so we
// don't just have casts all over.
#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for NetworkFaultType
-enum class NetworkFaultType : uint8_t
+// Enum for NetworkFaultEnum
+enum class NetworkFaultEnum : uint8_t
{
kUnspecified = 0x00,
kHardwareFailure = 0x01,
@@ -722,15 +722,15 @@
kUnknownEnumValue = 4,
};
#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using NetworkFaultType = EmberAfNetworkFaultType;
-static NetworkFaultType __attribute__((unused)) kNetworkFaultTypekUnknownEnumValue = static_cast<NetworkFaultType>(4);
+using NetworkFaultEnum = EmberAfNetworkFaultEnum;
+static NetworkFaultEnum __attribute__((unused)) kNetworkFaultEnumkUnknownEnumValue = static_cast<NetworkFaultEnum>(4);
#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
// Need to convert consumers to using the new enum classes, so we
// don't just have casts all over.
#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for RadioFault
-enum class RadioFault : uint8_t
+// Enum for RadioFaultEnum
+enum class RadioFaultEnum : uint8_t
{
kUnspecified = 0x00,
kWiFiFault = 0x01,
@@ -742,8 +742,8 @@
kUnknownEnumValue = 7,
};
#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using RadioFault = EmberAfRadioFault;
-static RadioFault __attribute__((unused)) kRadioFaultkUnknownEnumValue = static_cast<RadioFault>(7);
+using RadioFaultEnum = EmberAfRadioFaultEnum;
+static RadioFaultEnum __attribute__((unused)) kRadioFaultEnumkUnknownEnumValue = static_cast<RadioFaultEnum>(7);
#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
} // namespace GeneralDiagnostics
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 c796ee3..43d5fc6 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
@@ -7685,7 +7685,7 @@
chip::ByteSpan hardwareAddress;
DataModel::List<const chip::ByteSpan> IPv4Addresses;
DataModel::List<const chip::ByteSpan> IPv6Addresses;
- InterfaceType type = static_cast<InterfaceType>(0);
+ InterfaceTypeEnum type = static_cast<InterfaceTypeEnum>(0);
static constexpr bool kIsFabricScoped = false;
@@ -7702,7 +7702,7 @@
chip::ByteSpan hardwareAddress;
DataModel::DecodableList<chip::ByteSpan> IPv4Addresses;
DataModel::DecodableList<chip::ByteSpan> IPv6Addresses;
- InterfaceType type = static_cast<InterfaceType>(0);
+ InterfaceTypeEnum type = static_cast<InterfaceTypeEnum>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -7827,9 +7827,10 @@
namespace ActiveHardwareFaults {
struct TypeInfo
{
- using Type = chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::HardwareFault>;
- using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault>;
- using DecodableArgType = const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> &;
+ using Type = chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum>;
+ using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum>;
+ using DecodableArgType =
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> &;
static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
static constexpr AttributeId GetAttributeId() { return Attributes::ActiveHardwareFaults::Id; }
@@ -7839,9 +7840,9 @@
namespace ActiveRadioFaults {
struct TypeInfo
{
- using Type = chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::RadioFault>;
- using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault>;
- using DecodableArgType = const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> &;
+ using Type = chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum>;
+ using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum>;
+ using DecodableArgType = const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> &;
static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
static constexpr AttributeId GetAttributeId() { return Attributes::ActiveRadioFaults::Id; }
@@ -7851,9 +7852,9 @@
namespace ActiveNetworkFaults {
struct TypeInfo
{
- using Type = chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::NetworkFaultType>;
- using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType>;
- using DecodableArgType = const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> &;
+ using Type = chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum>;
+ using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum>;
+ using DecodableArgType = const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> &;
static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
static constexpr AttributeId GetAttributeId() { return Attributes::ActiveNetworkFaults::Id; }
@@ -7947,8 +7948,8 @@
static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
static constexpr bool kIsFabricScoped = false;
- DataModel::List<const HardwareFault> current;
- DataModel::List<const HardwareFault> previous;
+ DataModel::List<const HardwareFaultEnum> current;
+ DataModel::List<const HardwareFaultEnum> previous;
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
};
@@ -7960,8 +7961,8 @@
static constexpr EventId GetEventId() { return Events::HardwareFaultChange::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
- DataModel::DecodableList<HardwareFault> current;
- DataModel::DecodableList<HardwareFault> previous;
+ DataModel::DecodableList<HardwareFaultEnum> current;
+ DataModel::DecodableList<HardwareFaultEnum> previous;
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
@@ -7983,8 +7984,8 @@
static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
static constexpr bool kIsFabricScoped = false;
- DataModel::List<const RadioFault> current;
- DataModel::List<const RadioFault> previous;
+ DataModel::List<const RadioFaultEnum> current;
+ DataModel::List<const RadioFaultEnum> previous;
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
};
@@ -7996,8 +7997,8 @@
static constexpr EventId GetEventId() { return Events::RadioFaultChange::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
- DataModel::DecodableList<RadioFault> current;
- DataModel::DecodableList<RadioFault> previous;
+ DataModel::DecodableList<RadioFaultEnum> current;
+ DataModel::DecodableList<RadioFaultEnum> previous;
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
@@ -8019,8 +8020,8 @@
static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
static constexpr bool kIsFabricScoped = false;
- DataModel::List<const NetworkFaultType> current;
- DataModel::List<const NetworkFaultType> previous;
+ DataModel::List<const NetworkFaultEnum> current;
+ DataModel::List<const NetworkFaultEnum> previous;
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
};
@@ -8032,8 +8033,8 @@
static constexpr EventId GetEventId() { return Events::NetworkFaultChange::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
- DataModel::DecodableList<NetworkFaultType> current;
- DataModel::DecodableList<NetworkFaultType> previous;
+ DataModel::DecodableList<NetworkFaultEnum> current;
+ DataModel::DecodableList<NetworkFaultEnum> previous;
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h
index 7f838a5..36dc141 100644
--- a/zzz_generated/app-common/app-common/zap-generated/enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/enums.h
@@ -90,20 +90,20 @@
EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
};
-// Enum for HardwareFault
-enum EmberAfHardwareFault : uint8_t
+// Enum for HardwareFaultEnum
+enum EmberAfHardwareFaultEnum : uint8_t
{
- EMBER_ZCL_HARDWARE_FAULT_UNSPECIFIED = 0,
- EMBER_ZCL_HARDWARE_FAULT_RADIO = 1,
- EMBER_ZCL_HARDWARE_FAULT_SENSOR = 2,
- EMBER_ZCL_HARDWARE_FAULT_RESETTABLE_OVER_TEMP = 3,
- EMBER_ZCL_HARDWARE_FAULT_NON_RESETTABLE_OVER_TEMP = 4,
- EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE = 5,
- EMBER_ZCL_HARDWARE_FAULT_VISUAL_DISPLAY_FAULT = 6,
- EMBER_ZCL_HARDWARE_FAULT_AUDIO_OUTPUT_FAULT = 7,
- EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT = 8,
- EMBER_ZCL_HARDWARE_FAULT_NON_VOLATILE_MEMORY_ERROR = 9,
- EMBER_ZCL_HARDWARE_FAULT_TAMPER_DETECTED = 10,
+ EMBER_ZCL_HARDWARE_FAULT_ENUM_UNSPECIFIED = 0,
+ EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO = 1,
+ EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR = 2,
+ EMBER_ZCL_HARDWARE_FAULT_ENUM_RESETTABLE_OVER_TEMP = 3,
+ EMBER_ZCL_HARDWARE_FAULT_ENUM_NON_RESETTABLE_OVER_TEMP = 4,
+ EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE = 5,
+ EMBER_ZCL_HARDWARE_FAULT_ENUM_VISUAL_DISPLAY_FAULT = 6,
+ EMBER_ZCL_HARDWARE_FAULT_ENUM_AUDIO_OUTPUT_FAULT = 7,
+ EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT = 8,
+ EMBER_ZCL_HARDWARE_FAULT_ENUM_NON_VOLATILE_MEMORY_ERROR = 9,
+ EMBER_ZCL_HARDWARE_FAULT_ENUM_TAMPER_DETECTED = 10,
};
// Enum for HueDirection
@@ -158,14 +158,14 @@
EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_ACTUATOR = 5,
};
-// Enum for InterfaceType
-enum EmberAfInterfaceType : uint8_t
+// Enum for InterfaceTypeEnum
+enum EmberAfInterfaceTypeEnum : uint8_t
{
- EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED = 0,
- EMBER_ZCL_INTERFACE_TYPE_WI_FI = 1,
- EMBER_ZCL_INTERFACE_TYPE_ETHERNET = 2,
- EMBER_ZCL_INTERFACE_TYPE_CELLULAR = 3,
- EMBER_ZCL_INTERFACE_TYPE_THREAD = 4,
+ EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED = 0,
+ EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI = 1,
+ EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET = 2,
+ EMBER_ZCL_INTERFACE_TYPE_ENUM_CELLULAR = 3,
+ EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD = 4,
};
// Enum for KeypadLockout
@@ -186,13 +186,13 @@
EMBER_ZCL_MOVE_MODE_DOWN = 1,
};
-// Enum for NetworkFaultType
-enum EmberAfNetworkFaultType : uint8_t
+// Enum for NetworkFaultEnum
+enum EmberAfNetworkFaultEnum : uint8_t
{
- EMBER_ZCL_NETWORK_FAULT_TYPE_UNSPECIFIED = 0,
- EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE = 1,
- EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED = 2,
- EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED = 3,
+ EMBER_ZCL_NETWORK_FAULT_ENUM_UNSPECIFIED = 0,
+ EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE = 1,
+ EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED = 2,
+ EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED = 3,
};
// Enum for OnOffDelayedAllOffEffectVariant
@@ -231,16 +231,16 @@
EMBER_ZCL_PHY_RATE_ENUM_RATE400_G = 9,
};
-// Enum for RadioFault
-enum EmberAfRadioFault : uint8_t
+// Enum for RadioFaultEnum
+enum EmberAfRadioFaultEnum : uint8_t
{
- EMBER_ZCL_RADIO_FAULT_UNSPECIFIED = 0,
- EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT = 1,
- EMBER_ZCL_RADIO_FAULT_CELLULAR_FAULT = 2,
- EMBER_ZCL_RADIO_FAULT_THREAD_FAULT = 3,
- EMBER_ZCL_RADIO_FAULT_NFC_FAULT = 4,
- EMBER_ZCL_RADIO_FAULT_BLE_FAULT = 5,
- EMBER_ZCL_RADIO_FAULT_ETHERNET_FAULT = 6,
+ EMBER_ZCL_RADIO_FAULT_ENUM_UNSPECIFIED = 0,
+ EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT = 1,
+ EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT = 2,
+ EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT = 3,
+ EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT = 4,
+ EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT = 5,
+ EMBER_ZCL_RADIO_FAULT_ENUM_ETHERNET_FAULT = 6,
};
// Enum for RoutingRole
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 f02cb57..e5d1d79 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -5627,17 +5627,17 @@
return DataModelLogger::LogValue("BootReason", 1, value);
}
case GeneralDiagnostics::Attributes::ActiveHardwareFaults::Id: {
- chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> value;
+ chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("ActiveHardwareFaults", 1, value);
}
case GeneralDiagnostics::Attributes::ActiveRadioFaults::Id: {
- chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> value;
+ chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("ActiveRadioFaults", 1, value);
}
case GeneralDiagnostics::Attributes::ActiveNetworkFaults::Id: {
- chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> value;
+ chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("ActiveNetworkFaults", 1, value);
}
diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h
index 2deb119..3f697a1 100644
--- a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h
+++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h
@@ -195,11 +195,11 @@
const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType> &
data);
typedef void (*GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & data);
+ void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & data);
typedef void (*GeneralDiagnosticsActiveRadioFaultsListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> & data);
+ void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & data);
typedef void (*GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & data);
+ void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & data);
typedef void (*GeneralDiagnosticsGeneratedCommandListListAttributeCallback)(
void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
typedef void (*GeneralDiagnosticsAcceptedCommandListListAttributeCallback)(
