Skip to content

Commit

Permalink
Align General Diagnostics cluster with the spec again. (#24469)
Browse files Browse the repository at this point in the history 
* Align General Diagnostics cluster with the spec again.

The spec changed in https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6151

* Regenerate generated code.
  • Loading branch information
@bzbarsky-apple @pull
bzbarsky-apple authored and pull[bot] committed Oct 30, 2023
1 parent 88d57de commit 2515576
Show file tree
Hide file tree
Showing 89 changed files with 1,140 additions and 1,090 deletions.
28 changes: 14 additions & 14 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ server cluster GeneralDiagnostics = 51 {
kSoftwareReset = 6;
}

enum HardwareFault : ENUM8 {
enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
Expand All @@ -1137,22 +1137,22 @@ server cluster GeneralDiagnostics = 51 {
kTamperDetected = 10;
}

enum InterfaceType : ENUM8 {
enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
kCellular = 3;
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;
Expand All @@ -1170,22 +1170,22 @@ server cluster GeneralDiagnostics = 51 {
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 {
Expand All @@ -1197,9 +1197,9 @@ server cluster GeneralDiagnostics = 51 {
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;
Expand Down
34 changes: 17 additions & 17 deletions examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,13 @@ void AllClustersAppCommandHandler::OnGeneralFaultEventHandler(uint32_t eventId)

#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);
}
Expand All @@ -200,13 +200,13 @@ void AllClustersAppCommandHandler::OnGeneralFaultEventHandler(uint32_t eventId)

#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);
}
Expand All @@ -217,12 +217,12 @@ void AllClustersAppCommandHandler::OnGeneralFaultEventHandler(uint32_t eventId)

#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);
}
Expand Down
22 changes: 11 additions & 11 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ server cluster GeneralDiagnostics = 51 {
kSoftwareReset = 6;
}

enum HardwareFault : ENUM8 {
enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
Expand All @@ -1066,22 +1066,22 @@ server cluster GeneralDiagnostics = 51 {
kTamperDetected = 10;
}

enum InterfaceType : ENUM8 {
enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
kCellular = 3;
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;
Expand All @@ -1099,22 +1099,22 @@ server cluster GeneralDiagnostics = 51 {
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 {
Expand Down
28 changes: 14 additions & 14 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ server cluster GeneralDiagnostics = 51 {
kSoftwareReset = 6;
}

enum HardwareFault : ENUM8 {
enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
Expand All @@ -815,22 +815,22 @@ server cluster GeneralDiagnostics = 51 {
kTamperDetected = 10;
}

enum InterfaceType : ENUM8 {
enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
kCellular = 3;
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;
Expand All @@ -848,22 +848,22 @@ server cluster GeneralDiagnostics = 51 {
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 {
Expand All @@ -875,9 +875,9 @@ server cluster GeneralDiagnostics = 51 {
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;
Expand Down
28 changes: 14 additions & 14 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ server cluster GeneralDiagnostics = 51 {
kSoftwareReset = 6;
}

enum HardwareFault : ENUM8 {
enum HardwareFaultEnum : ENUM8 {
kUnspecified = 0;
kRadio = 1;
kSensor = 2;
Expand All @@ -670,22 +670,22 @@ server cluster GeneralDiagnostics = 51 {
kTamperDetected = 10;
}

enum InterfaceType : ENUM8 {
enum InterfaceTypeEnum : ENUM8 {
kUnspecified = 0;
kWiFi = 1;
kEthernet = 2;
kCellular = 3;
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;
Expand All @@ -703,22 +703,22 @@ server cluster GeneralDiagnostics = 51 {
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 {
Expand All @@ -730,9 +730,9 @@ server cluster GeneralDiagnostics = 51 {
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;
Expand Down
Loading

0 comments on commit 2515576

Please sign in to comment.