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 81cf25fc84a2b6..dd31241881832e 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 @@ -1113,7 +1113,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -1123,7 +1123,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -1152,7 +1152,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -1162,7 +1162,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -1174,13 +1174,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -1189,17 +1189,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -4044,7 +4044,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 76a1c03975003c..33bca5d8429039 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -3415,11 +3415,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp index 408b73ed6c8ac8..d7bebc065904f4 100644 --- a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp +++ b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp @@ -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_TYPE_RADIO)); - ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE)); + ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_RADIO)); + ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE)); - ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO)); - ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_SENSOR)); - ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE)); - ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_USER_INTERFACE_FAULT)); + 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)); #endif Clusters::GeneralDiagnosticsServer::Instance().OnHardwareFaultsDetect(previous, current); } @@ -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_TYPE_WI_FI_FAULT)); - ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT)); + ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT)); + ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT)); - ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_WI_FI_FAULT)); - ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_CELLULAR_FAULT)); - ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT)); - ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_NFC_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)); #endif Clusters::GeneralDiagnosticsServer::Instance().OnRadioFaultsDetect(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 03701fc1b20c53..b8051b249c47f4 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 @@ -1042,7 +1042,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -1052,7 +1052,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -1081,7 +1081,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -1091,7 +1091,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -1103,13 +1103,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -1118,10 +1118,10 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 516c49fb6b7108..3a9c073791d489 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -3415,11 +3415,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 0, "storageOption": "External", "singleton": 0, diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 3c1b616b3feac5..26b4f71e684bb3 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -791,7 +791,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -801,7 +801,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -830,7 +830,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -840,7 +840,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -852,13 +852,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -867,17 +867,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1578,7 +1578,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index 1948ac7bce1f74..e73615e8ab3932 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -2177,11 +2177,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 504061e0f58d39..91d380df17e411 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -646,7 +646,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -656,7 +656,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -685,7 +685,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -695,7 +695,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -707,13 +707,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -722,17 +722,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1390,7 +1390,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index 6b7df1a03281d5..b6d0747a158707 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 9c5a387c3a47f0..038fcb6de0977f 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -758,7 +758,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -768,7 +768,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -797,7 +797,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -807,7 +807,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -819,13 +819,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -834,17 +834,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1467,7 +1467,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index 924ab892eecf3f..36b0d622ac2b0b 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -2685,11 +2685,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index fc111c096b4830..2f043101bdcf2b 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -631,7 +631,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -641,7 +641,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -670,7 +670,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -680,7 +680,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -692,13 +692,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -707,17 +707,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1141,7 +1141,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index 971297e1bf39d4..30c6a46937fc4a 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index b79a4a9ed301ad..4bfa4d7b38575b 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -780,7 +780,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -790,7 +790,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -819,7 +819,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -829,7 +829,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -841,13 +841,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -856,17 +856,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1287,7 +1287,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index 197a544b63bb0b..37115ffd01a10d 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index f9065c571e73f0..afb4daa4f02ab3 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -631,7 +631,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -641,7 +641,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -670,7 +670,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -680,7 +680,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -692,13 +692,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -707,17 +707,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1526,7 +1526,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 6fdd82f2a92eba..f0dec5e9969bb2 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 07dd8cc4dbb24a..838c58bbb56a8f 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -780,7 +780,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -790,7 +790,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -819,7 +819,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -829,7 +829,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -841,13 +841,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -856,17 +856,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1542,7 +1542,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index ed74052d1a9128..19752defefad7b 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 38d0ae6a8d3eae..f08b1286aa8a62 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -633,7 +633,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -643,7 +643,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -672,7 +672,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -682,7 +682,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -694,13 +694,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -709,17 +709,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1200,7 +1200,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index 634824d729bc64..b98d19f53c521a 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -2733,11 +2733,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 0df49dec4fddad..b60b27a39c94a0 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -644,7 +644,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -654,7 +654,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -683,7 +683,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -693,7 +693,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -705,13 +705,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -720,17 +720,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1153,7 +1153,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index c8424aee9f1a39..0661975578c8d0 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index d1c5e67fc79862..ac781a675bfb8d 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -773,7 +773,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -783,7 +783,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -812,7 +812,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -822,7 +822,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -834,13 +834,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -849,17 +849,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1395,7 +1395,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 12bc28d09deeb4..b242891ce36f7b 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 46478dc8eb4e20..13a9e11f9edfa1 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -644,7 +644,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -654,7 +654,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -683,7 +683,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -693,7 +693,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -705,13 +705,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -720,17 +720,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1153,7 +1153,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index db501f62b4e0d4..9c02a9841f4bde 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 52bc8a6a235616..0af0d7ed7fdb3a 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -644,7 +644,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -654,7 +654,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -683,7 +683,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -693,7 +693,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -705,13 +705,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -720,17 +720,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1157,7 +1157,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index cd6ef1952f2dcc..448ff4e6355ce2 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 973f496f56c8fc..8cedada81e9c80 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -644,7 +644,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -654,7 +654,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -683,7 +683,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -693,7 +693,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -705,13 +705,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -720,17 +720,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1152,7 +1152,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index 7f0de5650c4329..ace1c0f1e8e25f 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index c04de798ba0f0d..70b088eefe1682 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -780,7 +780,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -790,7 +790,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -819,7 +819,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -829,7 +829,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -841,13 +841,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -856,17 +856,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1277,7 +1277,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index ece0ee2a052aa8..08c03cbd11edb5 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index f9eee7ddeafaef..7a51377ff42501 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -723,7 +723,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -733,7 +733,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -762,7 +762,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -772,7 +772,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -784,13 +784,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -799,17 +799,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1220,7 +1220,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index 3394f2f770e006..48508dfbbd64db 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index b26bc9a9ae6dba..a0501828d5e951 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -681,7 +681,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -691,7 +691,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -720,7 +720,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -730,7 +730,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -742,13 +742,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -757,17 +757,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1178,7 +1178,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 64777e266df8bc..93459c3b97f63d 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 05724a4da55c9c..8c510898487586 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -649,7 +649,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -659,7 +659,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -688,7 +688,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -698,7 +698,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -710,13 +710,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -725,17 +725,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1162,7 +1162,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index 8525d0e050db84..86d3292626df6b 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index d3c88eb27cb9a7..700353c7f58506 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -771,7 +771,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -781,7 +781,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -810,7 +810,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -820,7 +820,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -832,13 +832,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -847,17 +847,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1268,7 +1268,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index 1d1de16b31859a..fefc5542214616 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 6192a201ddf6d3..be2615969272ce 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -644,7 +644,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -654,7 +654,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -683,7 +683,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -693,7 +693,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -705,13 +705,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -720,17 +720,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1152,7 +1152,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index 366d20b713a8ea..df51d29f1742dc 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index be4033d3193a83..2a693e4b1e6fd6 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -631,7 +631,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -641,7 +641,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -670,7 +670,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -680,7 +680,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -692,13 +692,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -707,17 +707,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1290,7 +1290,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index 871682eb0ea6a5..aca73d246954a1 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -2637,11 +2637,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index aa61ccb2b9d257..fa49aa6362caab 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -631,7 +631,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -641,7 +641,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -670,7 +670,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -680,7 +680,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -692,13 +692,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -707,17 +707,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1270,7 +1270,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index 6d39ef464cdaa2..bb476c7b82fa8a 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -2589,11 +2589,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, 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 fac8abe275b249..611cd6b8306dfb 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 @@ -634,7 +634,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -644,7 +644,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -673,7 +673,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -683,7 +683,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -695,13 +695,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -710,17 +710,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1366,7 +1366,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index 240c199920563a..9e9944246b3119 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -2685,11 +2685,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index 3c1b616b3feac5..26b4f71e684bb3 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -791,7 +791,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -801,7 +801,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -830,7 +830,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -840,7 +840,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -852,13 +852,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -867,17 +867,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1578,7 +1578,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap index 1948ac7bce1f74..e73615e8ab3932 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap @@ -2177,11 +2177,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, 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 304a3b013c2cdd..0d1a1c382bfaa5 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 @@ -836,7 +836,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -846,7 +846,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -875,7 +875,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -885,7 +885,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -897,13 +897,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -912,17 +912,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1830,7 +1830,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index 145e0e044d3fec..7531018282f915 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -2667,11 +2667,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 6941b5c4c7c1c9..c1c694608683a5 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -792,7 +792,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -802,7 +802,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -831,7 +831,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -841,7 +841,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -853,13 +853,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -868,17 +868,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1817,7 +1817,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 16de5c96dc21ce..f1149ad7c0ad82 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -2685,11 +2685,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index c76cc902b026b1..f130629386ff02 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -707,7 +707,7 @@ server cluster NetworkCommissioning = 49 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -717,7 +717,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -746,7 +746,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -756,7 +756,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -768,13 +768,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -783,10 +783,10 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index 92ac1c2930ffdc..b9ac3fdb17a0a3 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -2871,11 +2871,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 0, "storageOption": "External", "singleton": 0, diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 2fcd9006309e29..1ffe1367aee41b 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -708,7 +708,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -718,7 +718,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -747,7 +747,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -757,7 +757,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -769,13 +769,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -784,17 +784,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -2003,7 +2003,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 8ac3ca3a0e298a..c9cd0207b0224e 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -2613,11 +2613,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, 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 631d8303ffa7c8..53e94893fd520a 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 @@ -495,7 +495,7 @@ server cluster NetworkCommissioning = 49 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -505,7 +505,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -534,7 +534,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -544,7 +544,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -556,13 +556,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -571,17 +571,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -915,7 +915,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index 4ffb2bf292a170..77a71f47dac91d 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -2475,11 +2475,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, 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 a2ce3e2b02aa6f..0f6471521fd769 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 @@ -660,7 +660,7 @@ server cluster NetworkCommissioning = 49 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -670,7 +670,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -699,7 +699,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -709,7 +709,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -721,13 +721,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -736,17 +736,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1081,7 +1081,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index 45c956b1da3a61..59756eed342383 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -2529,11 +2529,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 735bc9df2e3d7d..1cd80b3b84eb89 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -972,7 +972,7 @@ server cluster NetworkCommissioning = 49 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -982,7 +982,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -1011,7 +1011,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -1021,7 +1021,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -1033,13 +1033,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -1048,17 +1048,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -2858,7 +2858,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 68583939aaf2ee..69e0bb8dcdfaf8 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -2195,11 +2195,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index dfb8f49b950deb..c2aa039292b92c 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -949,7 +949,7 @@ server cluster NetworkCommissioning = 49 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -959,7 +959,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -988,7 +988,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -998,7 +998,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -1010,13 +1010,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -1025,17 +1025,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -2848,7 +2848,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index ce4e2c70f33e50..64e3d1784795a3 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -2395,11 +2395,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 5ceb261f6af7cc..756c8659f9acff 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -659,7 +659,7 @@ server cluster NetworkCommissioning = 49 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -669,7 +669,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -698,7 +698,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -708,7 +708,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -720,13 +720,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -735,10 +735,10 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index cc1bfa9cff07e1..a0305007ef2ae0 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -3101,11 +3101,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 0, "storageOption": "External", "singleton": 0, 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 a0d543be5c3e48..97239df2d8a114 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 @@ -558,7 +558,7 @@ server cluster NetworkCommissioning = 49 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -568,7 +568,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -597,7 +597,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -607,7 +607,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -619,13 +619,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -634,10 +634,10 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 1f1484134279a6..396738d9530d42 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -3049,11 +3049,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 0, "storageOption": "External", "singleton": 0, diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 44b5f9c7eba810..05de5a718a65e6 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -402,7 +402,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -412,7 +412,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -441,7 +441,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -451,7 +451,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -463,13 +463,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -478,17 +478,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -938,7 +938,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap index 1a2dd5df66f990..220e18c3578ca8 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap @@ -1813,11 +1813,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 78c1f6d91045c2..b04286a27a899e 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -796,7 +796,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -806,7 +806,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -835,7 +835,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -845,7 +845,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -857,13 +857,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -872,17 +872,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1612,7 +1612,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 8b877ec020972d..c505ffa6829bd9 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -2699,11 +2699,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index dd3ed3a662be02..e1ed622db28296 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -841,7 +841,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -851,7 +851,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -880,7 +880,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -890,7 +890,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -902,13 +902,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -917,17 +917,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -2247,7 +2247,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index b80cbc91ef162f..da63ed737daf2a 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -2509,11 +2509,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, 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 6eaf640fc0afae..99bd3c236c458a 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 @@ -1013,7 +1013,7 @@ server cluster DiagnosticLogs = 50 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -1023,7 +1023,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -1052,7 +1052,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -1062,7 +1062,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -1074,13 +1074,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -1089,17 +1089,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -2261,7 +2261,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index bd9dbc271e6268..4cf318b57b9935 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -2459,11 +2459,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index e16d40ae2aa4de..9af01b3bc696f2 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -845,7 +845,7 @@ server cluster NetworkCommissioning = 49 { } server cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -855,7 +855,7 @@ server cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -884,7 +884,7 @@ server cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -894,7 +894,7 @@ server cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -906,13 +906,13 @@ server cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -921,17 +921,17 @@ server cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1737,7 +1737,7 @@ endpoint 0 { callback attribute rebootCount; callback attribute upTime; callback attribute totalOperationalHours; - callback attribute bootReasons; + callback attribute bootReason; callback attribute activeHardwareFaults; callback attribute activeRadioFaults; callback attribute activeNetworkFaults; diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index ad313c8454318d..9823f1a7004e34 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -3289,11 +3289,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp b/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp index d58cb75d1fb49e..e0a1ddc3c06bc1 100644 --- a/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp +++ b/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp @@ -38,13 +38,13 @@ CHIP_ERROR GenericFaultTestEventTriggerDelegate::HandleEventTrigger(uint64_t eve // Fault injection GeneralFaults hwFaultsPrevious; GeneralFaults hwFaultsCurrent; - ReturnErrorOnFailure(hwFaultsPrevious.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO)); - ReturnErrorOnFailure(hwFaultsPrevious.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE)); + ReturnErrorOnFailure(hwFaultsPrevious.add(EMBER_ZCL_HARDWARE_FAULT_RADIO)); + ReturnErrorOnFailure(hwFaultsPrevious.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE)); - ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO)); - ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_SENSOR)); - ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE)); - ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_USER_INTERFACE_FAULT)); + 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)); app::Clusters::GeneralDiagnosticsServer::Instance().OnHardwareFaultsDetect(hwFaultsPrevious, hwFaultsCurrent); @@ -52,13 +52,13 @@ CHIP_ERROR GenericFaultTestEventTriggerDelegate::HandleEventTrigger(uint64_t eve GeneralFaults radioFaultsPrevious; GeneralFaults radioFaultsCurrent; - ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_TYPE_WI_FI_FAULT)); - ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT)); + ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT)); + ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT)); - ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_TYPE_WI_FI_FAULT)); - ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_TYPE_CELLULAR_FAULT)); - ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT)); - ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_TYPE_NFC_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)); app::Clusters::GeneralDiagnosticsServer::Instance().OnRadioFaultsDetect(radioFaultsPrevious, radioFaultsCurrent); 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 64607c32032cf9..ccb9fd4a0f9239 100644 --- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp +++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp @@ -197,7 +197,7 @@ CHIP_ERROR GeneralDiagosticsAttrAccess::Read(const ConcreteReadAttributePath & a case TotalOperationalHours::Id: { return ReadIfSupported(&DiagnosticDataProvider::GetTotalOperationalHours, aEncoder); } - case BootReasons::Id: { + case BootReason::Id: { return ReadIfSupported(&DiagnosticDataProvider::GetBootReason, aEncoder); } case TestEventTriggersEnabled::Id: { @@ -242,11 +242,11 @@ GeneralDiagnosticsServer & GeneralDiagnosticsServer::Instance() } // Gets called when the device has been rebooted. -void GeneralDiagnosticsServer::OnDeviceReboot(BootReasonType bootReason) +void GeneralDiagnosticsServer::OnDeviceReboot(BootReasonEnum bootReason) { ChipLogDetail(Zcl, "GeneralDiagnostics: OnDeviceReboot"); - ReportAttributeOnAllEndpoints(GeneralDiagnostics::Attributes::BootReasons::Id); + ReportAttributeOnAllEndpoints(GeneralDiagnostics::Attributes::BootReason::Id); // GeneralDiagnostics cluster should exist only for endpoint 0. if (emberAfContainsServer(0, GeneralDiagnostics::Id)) @@ -276,10 +276,9 @@ void GeneralDiagnosticsServer::OnHardwareFaultsDetect(const GeneralFaults currentList(reinterpret_cast(current.data()), - current.size()); - DataModel::List previousList(reinterpret_cast(previous.data()), - previous.size()); + DataModel::List currentList(reinterpret_cast(current.data()), current.size()); + DataModel::List previousList(reinterpret_cast(previous.data()), + previous.size()); Events::HardwareFaultChange::Type event{ currentList, previousList }; if (CHIP_NO_ERROR != LogEvent(event, endpointId, eventNumber)) @@ -303,9 +302,8 @@ void GeneralDiagnosticsServer::OnRadioFaultsDetect(const GeneralFaults currentList(reinterpret_cast(current.data()), current.size()); - DataModel::List previousList(reinterpret_cast(previous.data()), - previous.size()); + DataModel::List currentList(reinterpret_cast(current.data()), current.size()); + DataModel::List previousList(reinterpret_cast(previous.data()), previous.size()); Events::RadioFaultChange::Type event{ currentList, previousList }; if (CHIP_NO_ERROR != LogEvent(event, endpointId, eventNumber)) @@ -383,7 +381,7 @@ bool emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(CommandHandler * c void MatterGeneralDiagnosticsPluginServerInitCallback() { - BootReasonType bootReason; + BootReasonEnum bootReason; registerAttributeAccessOverride(&gAttrAccess); ConnectivityMgr().SetDelegate(&gDiagnosticDelegate); diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.h b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.h index ee0ac70b3473a8..144bae3264e8ad 100644 --- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.h +++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.h @@ -40,7 +40,7 @@ class GeneralDiagnosticsServer * @brief * Called after the current device is rebooted. */ - void OnDeviceReboot(GeneralDiagnostics::BootReasonType bootReason); + void OnDeviceReboot(GeneralDiagnostics::BootReasonEnum bootReason); /** * @brief diff --git a/src/app/clusters/mode-select-server/mode-select-server.cpp b/src/app/clusters/mode-select-server/mode-select-server.cpp index 14b388445f2621..bf3e9872a46ea7 100644 --- a/src/app/clusters/mode-select-server/mode-select-server.cpp +++ b/src/app/clusters/mode-select-server/mode-select-server.cpp @@ -42,7 +42,7 @@ using namespace chip::app::Clusters; using namespace chip::app::Clusters::ModeSelect; using namespace chip::Protocols; -using BootReasonType = GeneralDiagnostics::BootReasonType; +using BootReasonType = GeneralDiagnostics::BootReasonEnum; static InteractionModel::Status verifyModeValue(const EndpointId endpointId, const uint8_t newMode); diff --git a/src/app/common/templates/weak-enum-list.yaml b/src/app/common/templates/weak-enum-list.yaml index 1806d0d8639b96..aa4bee14441513 100644 --- a/src/app/common/templates/weak-enum-list.yaml +++ b/src/app/common/templates/weak-enum-list.yaml @@ -10,7 +10,7 @@ - ContentLaunchStatus - ContentLaunchStreamingType - EnhancedColorMode -- HardwareFaultType +- HardwareFault - HueDirection - HueMoveMode - HueStepMode @@ -26,7 +26,7 @@ - OnOffDyingLightEffectVariant - OnOffEffectIdentifier - PHYRate -- RadioFaultType +- RadioFault - RoutingRole - SaturationMoveMode - SaturationStepMode diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml index f2cba95fa0385f..bbf9ae7e553663 100644 --- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml @@ -144,7 +144,7 @@ tests: - label: "TH reads BootReason attribute value from DUT." PICS: DGGEN.S.A0004 command: "readAttribute" - attribute: "BootReasons" + attribute: "BootReason" response: constraints: minValue: 0 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 46e8e9d32c8d02..d643585c80162c 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 @@ limitations under the License. --> - + @@ -30,7 +30,7 @@ limitations under the License. - + @@ -47,7 +47,7 @@ limitations under the License. - + @@ -65,7 +65,7 @@ limitations under the License. - + @@ -83,14 +83,14 @@ limitations under the License. 0x0033 GENERAL_DIAGNOSTICS_CLUSTER The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. - NetworkInterfaces + NetworkInterfaces RebootCount UpTime TotalOperationalHours - BootReasons - ActiveHardwareFaults - ActiveRadioFaults - ActiveNetworkFaults + BootReason + ActiveHardwareFaults + ActiveRadioFaults + ActiveNetworkFaults TestEventTriggersEnabled @@ -102,13 +102,13 @@ limitations under the License. Indicate a change in the set of hardware faults currently detected by the Node. - - + + Indicate a change in the set of radio faults currently detected by the Node. - - + + Indicate a change in the set of network faults currently detected by the Node. @@ -117,7 +117,7 @@ limitations under the License. Indicate the reason that caused the device to start-up. - + diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index ee7578e6e297f9..3d63429fc4966c 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -158,7 +158,7 @@ "RebootCount", "UpTime", "TotalOperationalHours", - "BootReasons" + "BootReason" ], "Group Key Management": [ "ClusterRevision", diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 8ef2220096366d..d4003b118101da 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -152,7 +152,7 @@ "RebootCount", "UpTime", "TotalOperationalHours", - "BootReasons" + "BootReason" ], "Group Key Management": [ "ClusterRevision", diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 66c8abac48aab6..b381c70ad71efe 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1289,7 +1289,7 @@ client cluster DiagnosticLogs = 50 { } client cluster GeneralDiagnostics = 51 { - enum BootReasonType : ENUM8 { + enum BootReasonEnum : ENUM8 { kUnspecified = 0; kPowerOnReboot = 1; kBrownOutReset = 2; @@ -1299,7 +1299,7 @@ client cluster GeneralDiagnostics = 51 { kSoftwareReset = 6; } - enum HardwareFaultType : ENUM8 { + enum HardwareFault : ENUM8 { kUnspecified = 0; kRadio = 1; kSensor = 2; @@ -1328,7 +1328,7 @@ client cluster GeneralDiagnostics = 51 { kConnectionFailed = 3; } - enum RadioFaultType : ENUM8 { + enum RadioFault : ENUM8 { kUnspecified = 0; kWiFiFault = 1; kCellularFault = 2; @@ -1338,7 +1338,7 @@ client cluster GeneralDiagnostics = 51 { kEthernetFault = 6; } - struct NetworkInterfaceType { + struct NetworkInterface { char_string<32> name = 0; boolean isOperational = 1; nullable boolean offPremiseServicesReachableIPv4 = 2; @@ -1350,13 +1350,13 @@ client cluster GeneralDiagnostics = 51 { } critical event HardwareFaultChange = 0 { - HardwareFaultType current[] = 0; - HardwareFaultType previous[] = 1; + HardwareFault current[] = 0; + HardwareFault previous[] = 1; } critical event RadioFaultChange = 1 { - RadioFaultType current[] = 0; - RadioFaultType previous[] = 1; + RadioFault current[] = 0; + RadioFault previous[] = 1; } critical event NetworkFaultChange = 2 { @@ -1365,17 +1365,17 @@ client cluster GeneralDiagnostics = 51 { } critical event BootReason = 3 { - BootReasonType bootReason = 0; + BootReasonEnum bootReason = 0; } - readonly attribute NetworkInterfaceType networkInterfaces[] = 0; + readonly attribute NetworkInterface networkInterfaces[] = 0; readonly attribute int16u rebootCount = 1; readonly attribute int64u upTime = 2; readonly attribute int32u totalOperationalHours = 3; - readonly attribute enum8 bootReasons = 4; - readonly attribute ENUM8 activeHardwareFaults[] = 5; - readonly attribute ENUM8 activeRadioFaults[] = 6; - readonly attribute ENUM8 activeNetworkFaults[] = 7; + readonly attribute BootReasonEnum bootReason = 4; + readonly attribute HardwareFault activeHardwareFaults[] = 5; + readonly attribute RadioFault activeRadioFaults[] = 6; + readonly attribute NetworkFaultType activeNetworkFaults[] = 7; readonly attribute boolean testEventTriggersEnabled = 8; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 4d4f1497afbe59..5c84d6016ba867 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -5285,11 +5285,11 @@ "reportableChange": 0 }, { - "name": "BootReasons", + "name": "BootReason", "code": 4, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BootReasonEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index ec79f9a7041a34..e1cf6744fcc255 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -4894,30 +4894,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), static_cast(entry_0.type), newElement_0_type); - jclass networkInterfaceTypeStructClass_1; + jclass networkInterfaceStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType", - networkInterfaceTypeStructClass_1); + env, "chip/devicecontroller/ChipStructs$GeneralDiagnosticsClusterNetworkInterface", + networkInterfaceStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType"); + ChipLogError(Zcl, "Could not find class ChipStructs$GeneralDiagnosticsClusterNetworkInterface"); return nullptr; } - jmethodID networkInterfaceTypeStructCtor_1 = - env->GetMethodID(networkInterfaceTypeStructClass_1, "", + jmethodID networkInterfaceStructCtor_1 = + env->GetMethodID(networkInterfaceStructClass_1, "", "(Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;[BLjava/util/" "ArrayList;Ljava/util/ArrayList;Ljava/lang/Integer;)V"); - if (networkInterfaceTypeStructCtor_1 == nullptr) + if (networkInterfaceStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$GeneralDiagnosticsClusterNetworkInterface constructor"); return nullptr; } - newElement_0 = - env->NewObject(networkInterfaceTypeStructClass_1, networkInterfaceTypeStructCtor_1, newElement_0_name, - newElement_0_isOperational, newElement_0_offPremiseServicesReachableIPv4, - newElement_0_offPremiseServicesReachableIPv6, newElement_0_hardwareAddress, - newElement_0_IPv4Addresses, newElement_0_IPv6Addresses, newElement_0_type); + newElement_0 = env->NewObject(networkInterfaceStructClass_1, networkInterfaceStructCtor_1, newElement_0_name, + newElement_0_isOperational, newElement_0_offPremiseServicesReachableIPv4, + newElement_0_offPremiseServicesReachableIPv6, newElement_0_hardwareAddress, + newElement_0_IPv4Addresses, newElement_0_IPv6Addresses, newElement_0_type); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; @@ -4967,8 +4966,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR cppValue, value); return value; } - case Attributes::BootReasons::Id: { - using TypeInfo = Attributes::BootReasons::TypeInfo; + case Attributes::BootReason::Id: { + using TypeInfo = Attributes::BootReason::TypeInfo; TypeInfo::DecodableType cppValue; *aError = app::DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) @@ -4979,7 +4978,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR std::string valueClassName = "java/lang/Integer"; std::string valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), - cppValue, value); + static_cast(cppValue), value); return value; } case Attributes::ActiveHardwareFaults::Id: { @@ -5001,7 +5000,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR std::string newElement_0ClassName = "java/lang/Integer"; std::string newElement_0CtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0); + newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast(entry_0), newElement_0); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; @@ -5025,7 +5024,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR std::string newElement_0ClassName = "java/lang/Integer"; std::string newElement_0CtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0); + newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast(entry_0), newElement_0); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; @@ -5049,7 +5048,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR std::string newElement_0ClassName = "java/lang/Integer"; std::string newElement_0CtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0); + newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast(entry_0), newElement_0); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h index a5748b0b95939f..dd2f0d7151d101 100644 --- a/src/controller/java/zap-generated/CHIPCallbackTypes.h +++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h @@ -533,8 +533,8 @@ typedef void (*CHIPGeneralDiagnosticsClusterUpTimeAttributeCallbackType)( void *, chip::app::Clusters::GeneralDiagnostics::Attributes::UpTime::TypeInfo::DecodableArgType); typedef void (*CHIPGeneralDiagnosticsClusterTotalOperationalHoursAttributeCallbackType)( void *, chip::app::Clusters::GeneralDiagnostics::Attributes::TotalOperationalHours::TypeInfo::DecodableArgType); -typedef void (*CHIPGeneralDiagnosticsClusterBootReasonsAttributeCallbackType)( - void *, chip::app::Clusters::GeneralDiagnostics::Attributes::BootReasons::TypeInfo::DecodableArgType); +typedef void (*CHIPGeneralDiagnosticsClusterBootReasonAttributeCallbackType)( + void *, chip::app::Clusters::GeneralDiagnostics::Attributes::BootReason::TypeInfo::DecodableArgType); typedef void (*CHIPGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallbackType)( void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::ActiveHardwareFaults::TypeInfo::DecodableType &); typedef void (*CHIPGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallbackType)( diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index c545a02d6cbdbe..9a11bc3594dbe8 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -7740,8 +7740,8 @@ CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::~CHIPGeneralDiagnostic void CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::CallbackFn( void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list) + const chip::app::DataModel::DecodableList & + list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -7846,26 +7846,25 @@ void CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::CallbackFn( newElement_0_typeCtorSignature.c_str(), static_cast(entry_0.type), newElement_0_type); - jclass networkInterfaceTypeStructClass_1; + jclass networkInterfaceStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType", - networkInterfaceTypeStructClass_1); + env, "chip/devicecontroller/ChipStructs$GeneralDiagnosticsClusterNetworkInterface", networkInterfaceStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType"); + ChipLogError(Zcl, "Could not find class ChipStructs$GeneralDiagnosticsClusterNetworkInterface"); return; } - jmethodID networkInterfaceTypeStructCtor_1 = - env->GetMethodID(networkInterfaceTypeStructClass_1, "", + jmethodID networkInterfaceStructCtor_1 = + env->GetMethodID(networkInterfaceStructClass_1, "", "(Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;[BLjava/util/" "ArrayList;Ljava/util/ArrayList;Ljava/lang/Integer;)V"); - if (networkInterfaceTypeStructCtor_1 == nullptr) + if (networkInterfaceStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$GeneralDiagnosticsClusterNetworkInterface constructor"); return; } - newElement_0 = env->NewObject(networkInterfaceTypeStructClass_1, networkInterfaceTypeStructCtor_1, newElement_0_name, + newElement_0 = env->NewObject(networkInterfaceStructClass_1, networkInterfaceStructCtor_1, newElement_0_name, newElement_0_isOperational, newElement_0_offPremiseServicesReachableIPv4, newElement_0_offPremiseServicesReachableIPv6, newElement_0_hardwareAddress, newElement_0_IPv4Addresses, newElement_0_IPv6Addresses, newElement_0_type); @@ -7907,7 +7906,7 @@ CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::~CHIPGeneralDiagnos } void CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::CallbackFn( - void * context, const chip::app::DataModel::DecodableList & list) + void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -7938,8 +7937,8 @@ void CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::CallbackFn( jobject newElement_0; std::string newElement_0ClassName = "java/lang/Integer"; std::string newElement_0CtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0ClassName.c_str(), - newElement_0CtorSignature.c_str(), entry_0, newElement_0); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast(entry_0), newElement_0); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } @@ -7977,8 +7976,8 @@ CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::~CHIPGeneralDiagnostic env->DeleteGlobalRef(javaCallbackRef); } -void CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::DecodableList & list) +void CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CallbackFn( + void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -8009,8 +8008,8 @@ void CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CallbackFn(void * jobject newElement_0; std::string newElement_0ClassName = "java/lang/Integer"; std::string newElement_0CtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0ClassName.c_str(), - newElement_0CtorSignature.c_str(), entry_0, newElement_0); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast(entry_0), newElement_0); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } @@ -8049,7 +8048,7 @@ CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::~CHIPGeneralDiagnost } void CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::CallbackFn( - void * context, const chip::app::DataModel::DecodableList & list) + void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -8080,8 +8079,8 @@ void CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::CallbackFn( jobject newElement_0; std::string newElement_0ClassName = "java/lang/Integer"; std::string newElement_0CtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0ClassName.c_str(), - newElement_0CtorSignature.c_str(), entry_0, newElement_0); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast(entry_0), newElement_0); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index 762efaab4592ef..c346a6444e7095 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -3278,7 +3278,7 @@ class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list); + chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType> & list); static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( @@ -3308,7 +3308,9 @@ class CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback } } - static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); + static void + CallbackFn(void * context, + const chip::app::DataModel::DecodableList & list); static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( @@ -3338,7 +3340,8 @@ class CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback } } - static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); + static void CallbackFn(void * context, + const chip::app::DataModel::DecodableList & list); static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( @@ -3368,7 +3371,9 @@ class CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback } } - static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); + static void + CallbackFn(void * context, + const chip::app::DataModel::DecodableList & list); static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 9f3d52253c5244..9741978e63828d 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -6653,7 +6653,7 @@ private native void testEventTrigger( @Nullable Integer timedInvokeTimeoutMs); public interface NetworkInterfacesAttributeCallback { - void onSuccess(List valueList); + void onSuccess(List valueList); void onError(Exception ex); @@ -6744,13 +6744,13 @@ public void subscribeTotalOperationalHoursAttribute( subscribeTotalOperationalHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - public void readBootReasonsAttribute(IntegerAttributeCallback callback) { - readBootReasonsAttribute(chipClusterPtr, callback); + public void readBootReasonAttribute(IntegerAttributeCallback callback) { + readBootReasonAttribute(chipClusterPtr, callback); } - public void subscribeBootReasonsAttribute( + public void subscribeBootReasonAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - subscribeBootReasonsAttribute(chipClusterPtr, callback, minInterval, maxInterval); + subscribeBootReasonAttribute(chipClusterPtr, callback, minInterval, maxInterval); } public void readActiveHardwareFaultsAttribute(ActiveHardwareFaultsAttributeCallback callback) { @@ -6861,10 +6861,10 @@ private native void readTotalOperationalHoursAttribute( private native void subscribeTotalOperationalHoursAttribute( long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval); - private native void readBootReasonsAttribute( + private native void readBootReasonAttribute( long chipClusterPtr, IntegerAttributeCallback callback); - private native void subscribeBootReasonsAttribute( + private native void subscribeBootReasonAttribute( long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval); private native void readActiveHardwareFaultsAttribute( diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java index 283f7f1d947f78..853e4167cb936c 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java @@ -971,7 +971,7 @@ public static String attributeIdToName(long clusterId, long attributeId) { return "TotalOperationalHours"; } if (attributeId == 4L) { - return "BootReasons"; + return "BootReason"; } if (attributeId == 5L) { return "ActiveHardwareFaults"; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index baa99f3a1146f6..002ace5f91a591 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -616,7 +616,7 @@ public String toString() { } } - public static class GeneralDiagnosticsClusterNetworkInterfaceType { + public static class GeneralDiagnosticsClusterNetworkInterface { public String name; public Boolean isOperational; public @Nullable Boolean offPremiseServicesReachableIPv4; @@ -626,7 +626,7 @@ public static class GeneralDiagnosticsClusterNetworkInterfaceType { public ArrayList IPv6Addresses; public Integer type; - public GeneralDiagnosticsClusterNetworkInterfaceType( + public GeneralDiagnosticsClusterNetworkInterface( String name, Boolean isOperational, @Nullable Boolean offPremiseServicesReachableIPv4, @@ -648,7 +648,7 @@ public GeneralDiagnosticsClusterNetworkInterfaceType( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("GeneralDiagnosticsClusterNetworkInterfaceType {\n"); + output.append("GeneralDiagnosticsClusterNetworkInterface {\n"); output.append("\tname: "); output.append(name); output.append("\n"); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index b66c3be90ad143..250a3e532f1f72 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -2609,12 +2609,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess( - List valueList) { + public void onSuccess(List valueList) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo commandResponseInfo = new CommandResponseInfo( - "valueList", "List"); + "valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java index b580eba99b8c01..50ea7744c347b8 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java @@ -3164,18 +3164,18 @@ public Map> getReadAttributeMap() { readGeneralDiagnosticsInteractionInfo.put( "readTotalOperationalHoursAttribute", readGeneralDiagnosticsTotalOperationalHoursAttributeInteractionInfo); - Map readGeneralDiagnosticsBootReasonsCommandParams = + Map readGeneralDiagnosticsBootReasonCommandParams = new LinkedHashMap(); - InteractionInfo readGeneralDiagnosticsBootReasonsAttributeInteractionInfo = + InteractionInfo readGeneralDiagnosticsBootReasonAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.GeneralDiagnosticsCluster) cluster) - .readBootReasonsAttribute((ChipClusters.IntegerAttributeCallback) callback); + .readBootReasonAttribute((ChipClusters.IntegerAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readGeneralDiagnosticsBootReasonsCommandParams); + readGeneralDiagnosticsBootReasonCommandParams); readGeneralDiagnosticsInteractionInfo.put( - "readBootReasonsAttribute", readGeneralDiagnosticsBootReasonsAttributeInteractionInfo); + "readBootReasonAttribute", readGeneralDiagnosticsBootReasonAttributeInteractionInfo); Map readGeneralDiagnosticsActiveHardwareFaultsCommandParams = new LinkedHashMap(); InteractionInfo readGeneralDiagnosticsActiveHardwareFaultsAttributeInteractionInfo = diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index c5b4f9a33ce088..1fe68ce43a2b33 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -2055,7 +2055,7 @@ class ChipClusters: "reportable": True, }, 0x00000004: { - "attributeName": "BootReasons", + "attributeName": "BootReason", "attributeId": 0x00000004, "type": "int", "reportable": True, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 07594ef887e438..b6f00e98429bff 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -7257,14 +7257,14 @@ class GeneralDiagnostics(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="networkInterfaces", Tag=0x00000000, Type=typing.List[GeneralDiagnostics.Structs.NetworkInterfaceType]), + ClusterObjectFieldDescriptor(Label="networkInterfaces", Tag=0x00000000, Type=typing.List[GeneralDiagnostics.Structs.NetworkInterface]), ClusterObjectFieldDescriptor(Label="rebootCount", Tag=0x00000001, Type=uint), ClusterObjectFieldDescriptor(Label="upTime", Tag=0x00000002, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="totalOperationalHours", Tag=0x00000003, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="bootReasons", Tag=0x00000004, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="activeHardwareFaults", Tag=0x00000005, Type=typing.Optional[typing.List[uint]]), - ClusterObjectFieldDescriptor(Label="activeRadioFaults", Tag=0x00000006, Type=typing.Optional[typing.List[uint]]), - ClusterObjectFieldDescriptor(Label="activeNetworkFaults", Tag=0x00000007, Type=typing.Optional[typing.List[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="testEventTriggersEnabled", Tag=0x00000008, Type=bool), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), @@ -7273,14 +7273,14 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - networkInterfaces: 'typing.List[GeneralDiagnostics.Structs.NetworkInterfaceType]' = None + networkInterfaces: 'typing.List[GeneralDiagnostics.Structs.NetworkInterface]' = None rebootCount: 'uint' = None upTime: 'typing.Optional[uint]' = None totalOperationalHours: 'typing.Optional[uint]' = None - bootReasons: 'typing.Optional[uint]' = None - activeHardwareFaults: 'typing.Optional[typing.List[uint]]' = None - activeRadioFaults: 'typing.Optional[typing.List[uint]]' = None - activeNetworkFaults: 'typing.Optional[typing.List[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 testEventTriggersEnabled: 'bool' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None @@ -7289,7 +7289,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class BootReasonType(IntEnum): + class BootReasonEnum(IntEnum): kUnspecified = 0x00 kPowerOnReboot = 0x01 kBrownOutReset = 0x02 @@ -7298,7 +7298,7 @@ class BootReasonType(IntEnum): kSoftwareUpdateCompleted = 0x05 kSoftwareReset = 0x06 - class HardwareFaultType(IntEnum): + class HardwareFault(IntEnum): kUnspecified = 0x00 kRadio = 0x01 kSensor = 0x02 @@ -7324,7 +7324,7 @@ class NetworkFaultType(IntEnum): kNetworkJammed = 0x02 kConnectionFailed = 0x03 - class RadioFaultType(IntEnum): + class RadioFault(IntEnum): kUnspecified = 0x00 kWiFiFault = 0x01 kCellularFault = 0x02 @@ -7336,7 +7336,7 @@ class RadioFaultType(IntEnum): class Structs: @dataclass - class NetworkInterfaceType(ClusterObject): + class NetworkInterface(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -7395,9 +7395,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[GeneralDiagnostics.Structs.NetworkInterfaceType]) + return ClusterObjectFieldDescriptor(Type=typing.List[GeneralDiagnostics.Structs.NetworkInterface]) - value: 'typing.List[GeneralDiagnostics.Structs.NetworkInterfaceType]' = field(default_factory=lambda: []) + value: 'typing.List[GeneralDiagnostics.Structs.NetworkInterface]' = field(default_factory=lambda: []) @dataclass class RebootCount(ClusterAttributeDescriptor): @@ -7448,7 +7448,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class BootReasons(ClusterAttributeDescriptor): + class BootReason(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0033 @@ -7459,9 +7459,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + return ClusterObjectFieldDescriptor(Type=typing.Optional[GeneralDiagnostics.Enums.BootReasonEnum]) - value: 'typing.Optional[uint]' = None + value: 'typing.Optional[GeneralDiagnostics.Enums.BootReasonEnum]' = None @dataclass class ActiveHardwareFaults(ClusterAttributeDescriptor): @@ -7475,9 +7475,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[uint]]) + return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFault]]) - value: 'typing.Optional[typing.List[uint]]' = None + value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFault]]' = None @dataclass class ActiveRadioFaults(ClusterAttributeDescriptor): @@ -7491,9 +7491,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[uint]]) + return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFault]]) - value: 'typing.Optional[typing.List[uint]]' = None + value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFault]]' = None @dataclass class ActiveNetworkFaults(ClusterAttributeDescriptor): @@ -7507,9 +7507,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[uint]]) + return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultType]]) - value: 'typing.Optional[typing.List[uint]]' = None + value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultType]]' = None @dataclass class TestEventTriggersEnabled(ClusterAttributeDescriptor): @@ -7623,12 +7623,12 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.HardwareFaultType]), - ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.HardwareFaultType]), + ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.HardwareFault]), + ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.HardwareFault]), ]) - current: 'typing.List[GeneralDiagnostics.Enums.HardwareFaultType]' = field(default_factory=lambda: []) - previous: 'typing.List[GeneralDiagnostics.Enums.HardwareFaultType]' = field(default_factory=lambda: []) + current: 'typing.List[GeneralDiagnostics.Enums.HardwareFault]' = field(default_factory=lambda: []) + previous: 'typing.List[GeneralDiagnostics.Enums.HardwareFault]' = field(default_factory=lambda: []) @dataclass class RadioFaultChange(ClusterEvent): @@ -7644,12 +7644,12 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.RadioFaultType]), - ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.RadioFaultType]), + ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.RadioFault]), + ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.RadioFault]), ]) - current: 'typing.List[GeneralDiagnostics.Enums.RadioFaultType]' = field(default_factory=lambda: []) - previous: 'typing.List[GeneralDiagnostics.Enums.RadioFaultType]' = field(default_factory=lambda: []) + current: 'typing.List[GeneralDiagnostics.Enums.RadioFault]' = field(default_factory=lambda: []) + previous: 'typing.List[GeneralDiagnostics.Enums.RadioFault]' = field(default_factory=lambda: []) @dataclass class NetworkFaultChange(ClusterEvent): @@ -7686,10 +7686,10 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="bootReason", Tag=0, Type=GeneralDiagnostics.Enums.BootReasonType), + ClusterObjectFieldDescriptor(Label="bootReason", Tag=0, Type=GeneralDiagnostics.Enums.BootReasonEnum), ]) - bootReason: 'GeneralDiagnostics.Enums.BootReasonType' = 0 + bootReason: 'GeneralDiagnostics.Enums.BootReasonEnum' = 0 @dataclass diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 3de24e29e05fe3..174774dc9b3b26 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -4723,6 +4723,8 @@ WiFiNetworkDiagnostics: - BSSID - RSSI + GeneralDiagnostics: + - BootReason commands: OTASoftwareUpdateProvider: - QueryImage @@ -4967,6 +4969,8 @@ - AccessControlExtensionStruct SoftwareDiagnostics: - ThreadMetricsStruct + GeneralDiagnostics: + - NetworkInterface struct fields: UnitTesting: SimpleStruct: @@ -5051,6 +5055,16 @@ - stackFreeCurrent - stackFreeMinimum - stackSize + GeneralDiagnostics: + NetworkInterface: + - name + - isOperational + - offPremiseServicesReachableIPv4 + - offPremiseServicesReachableIPv6 + - hardwareAddress + - iPv4Addresses + - iPv6Addresses + - type events: OTASoftwareUpdateRequestor: - StateTransition @@ -5131,6 +5145,10 @@ - ConnectionStatusEnum EthernetNetworkDiagnostics: - PHYRate + GeneralDiagnostics: + - HardwareFault + - RadioFault + - BootReasonEnum enum values: OTASoftwareUpdateProvider: OTAApplyUpdateAction: @@ -5215,6 +5233,35 @@ - Rate100G - Rate200G - Rate400G + GeneralDiagnostics: + HardwareFault: + - Unspecified + - Radio + - Sensor + - ResettableOverTemp + - NonResettableOverTemp + - PowerSource + - VisualDisplayFault + - AudioOutputFault + - UserInterfaceFault + - NonVolatileMemoryError + - TamperDetected + RadioFault: + - Unspecified + - WiFiFault + - CellularFault + - ThreadFault + - NFCFault + - BLEFault + - EthernetFault + BootReasonEnum: + - Unspecified + - PowerOnReboot + - BrownOutReset + - SoftwareWatchdogReset + - HardwareWatchdogReset + - SoftwareUpdateCompleted + - SoftwareReset bitmaps: UnitTesting: - Bitmap8MaskMap @@ -5282,6 +5329,8 @@ WiFiNetworkDiagnostics: - Bssid - Rssi + GeneralDiagnostics: + - BootReasons command fields: Groups: AddGroup: @@ -5317,6 +5366,8 @@ - BatChargeFaultChangeType SoftwareDiagnostics: - ThreadMetrics + GeneralDiagnostics: + - NetworkInterfaceType struct fields: Descriptor: DeviceTypeStruct: @@ -5333,6 +5384,10 @@ - ThreadConnectionStatus EthernetNetworkDiagnostics: - PHYRateType + GeneralDiagnostics: + - HardwareFaultType + - RadioFaultType + - BootReasonType enum values: GeneralCommissioning: CommissioningError: @@ -5413,6 +5468,8 @@ WiFiNetworkDiagnostics: BSSID: Bssid RSSI: Rssi + GeneralDiagnostics: + BootReason: BootReasons commands: OTASoftwareUpdateRequestor: AnnounceOTAProvider: AnnounceOtaProvider @@ -5453,6 +5510,8 @@ AccessControlExtensionStruct: ExtensionEntry SoftwareDiagnostics: ThreadMetricsStruct: ThreadMetrics + GeneralDiagnostics: + NetworkInterface: NetworkInterfaceType struct fields: Descriptor: DeviceTypeStruct: @@ -5469,6 +5528,10 @@ ConnectionStatusEnum: ThreadConnectionStatus EthernetNetworkDiagnostics: PHYRate: PHYRateType + GeneralDiagnostics: + HardwareFault: HardwareFaultType + RadioFault: RadioFaultType + BootReasonEnum: BootReasonType enum values: GeneralCommissioning: CommissioningError: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 56457b9a04d0cd..a5ffd8d0eb3010 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -4301,8 +4301,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRGeneralDiagnosticsClusterNetworkInterfaceType * newElement_0; - newElement_0 = [MTRGeneralDiagnosticsClusterNetworkInterfaceType new]; + MTRGeneralDiagnosticsClusterNetworkInterface * newElement_0; + newElement_0 = [MTRGeneralDiagnosticsClusterNetworkInterface new]; newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data() length:entry_0.name.size() encoding:NSUTF8StringEncoding]; @@ -4398,15 +4398,15 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & value = [NSNumber numberWithUnsignedInt:cppValue]; return value; } - case Attributes::BootReasons::Id: { - using TypeInfo = Attributes::BootReasons::TypeInfo; + case Attributes::BootReason::Id: { + using TypeInfo = Attributes::BootReason::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { return nil; } NSNumber * _Nonnull value; - value = [NSNumber numberWithUnsignedChar:cppValue]; + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)]; return value; } case Attributes::ActiveHardwareFaults::Id: { @@ -4423,7 +4423,7 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); NSNumber * newElement_0; - newElement_0 = [NSNumber numberWithUnsignedChar:entry_0]; + newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -4449,7 +4449,7 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); NSNumber * newElement_0; - newElement_0 = [NSNumber numberWithUnsignedChar:entry_0]; + newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -4475,7 +4475,7 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); NSNumber * newElement_0; - newElement_0 = [NSNumber numberWithUnsignedChar:entry_0]; + newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 167993763813cc..3d2835298fb782 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -3955,16 +3955,16 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; -- (void)readAttributeBootReasonsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +- (void)readAttributeBootReasonWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; -- (void)subscribeAttributeBootReasonsWithParams:(MTRSubscribeParams *)params - subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +- (void)subscribeAttributeBootReasonWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_NEWLY_AVAILABLE; -+ (void)readAttributeBootReasonsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer - endpoint:(NSNumber *)endpoint - queue:(dispatch_queue_t)queue - completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion ++ (void)readAttributeBootReasonWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (void)readAttributeActiveHardwareFaultsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion @@ -17559,32 +17559,91 @@ typedef NS_ENUM(uint8_t, MTRDiagnosticLogsLogsTransferProtocol) { MTRDiagnosticLogsLogsTransferProtocolBDX API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsBootReason) { + MTRGeneralDiagnosticsBootReasonUnspecified MTR_NEWLY_AVAILABLE = 0x00, + MTRGeneralDiagnosticsBootReasonPowerOnReboot MTR_NEWLY_AVAILABLE = 0x01, + MTRGeneralDiagnosticsBootReasonBrownOutReset MTR_NEWLY_AVAILABLE = 0x02, + MTRGeneralDiagnosticsBootReasonSoftwareWatchdogReset MTR_NEWLY_AVAILABLE = 0x03, + MTRGeneralDiagnosticsBootReasonHardwareWatchdogReset MTR_NEWLY_AVAILABLE = 0x04, + MTRGeneralDiagnosticsBootReasonSoftwareUpdateCompleted MTR_NEWLY_AVAILABLE = 0x05, + MTRGeneralDiagnosticsBootReasonSoftwareReset MTR_NEWLY_AVAILABLE = 0x06, +} MTR_NEWLY_AVAILABLE; + typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsBootReasonType) { - MTRGeneralDiagnosticsBootReasonTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRGeneralDiagnosticsBootReasonTypePowerOnReboot API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRGeneralDiagnosticsBootReasonTypeBrownOutReset API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRGeneralDiagnosticsBootReasonTypeSoftwareWatchdogReset API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRGeneralDiagnosticsBootReasonTypeHardwareWatchdogReset API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, + MTRGeneralDiagnosticsBootReasonTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsBootReasonUnspecified") + = 0x00, + MTRGeneralDiagnosticsBootReasonTypePowerOnReboot API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsBootReasonPowerOnReboot") + = 0x01, + MTRGeneralDiagnosticsBootReasonTypeBrownOutReset API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsBootReasonBrownOutReset") + = 0x02, + MTRGeneralDiagnosticsBootReasonTypeSoftwareWatchdogReset API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsBootReasonSoftwareWatchdogReset") + = 0x03, + MTRGeneralDiagnosticsBootReasonTypeHardwareWatchdogReset API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsBootReasonHardwareWatchdogReset") + = 0x04, MTRGeneralDiagnosticsBootReasonTypeSoftwareUpdateCompleted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsBootReasonSoftwareUpdateCompleted") = 0x05, - MTRGeneralDiagnosticsBootReasonTypeSoftwareReset API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRGeneralDiagnosticsBootReasonTypeSoftwareReset API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsBootReasonSoftwareReset") + = 0x06, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsBootReason"); + +typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsHardwareFault) { + MTRGeneralDiagnosticsHardwareFaultUnspecified MTR_NEWLY_AVAILABLE = 0x00, + MTRGeneralDiagnosticsHardwareFaultRadio MTR_NEWLY_AVAILABLE = 0x01, + MTRGeneralDiagnosticsHardwareFaultSensor MTR_NEWLY_AVAILABLE = 0x02, + MTRGeneralDiagnosticsHardwareFaultResettableOverTemp MTR_NEWLY_AVAILABLE = 0x03, + MTRGeneralDiagnosticsHardwareFaultNonResettableOverTemp MTR_NEWLY_AVAILABLE = 0x04, + MTRGeneralDiagnosticsHardwareFaultPowerSource MTR_NEWLY_AVAILABLE = 0x05, + MTRGeneralDiagnosticsHardwareFaultVisualDisplayFault MTR_NEWLY_AVAILABLE = 0x06, + MTRGeneralDiagnosticsHardwareFaultAudioOutputFault MTR_NEWLY_AVAILABLE = 0x07, + MTRGeneralDiagnosticsHardwareFaultUserInterfaceFault MTR_NEWLY_AVAILABLE = 0x08, + MTRGeneralDiagnosticsHardwareFaultNonVolatileMemoryError MTR_NEWLY_AVAILABLE = 0x09, + MTRGeneralDiagnosticsHardwareFaultTamperDetected MTR_NEWLY_AVAILABLE = 0x0A, +} MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsHardwareFaultType) { - MTRGeneralDiagnosticsHardwareFaultTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRGeneralDiagnosticsHardwareFaultTypeRadio API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRGeneralDiagnosticsHardwareFaultTypeSensor API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRGeneralDiagnosticsHardwareFaultTypeResettableOverTemp API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, + MTRGeneralDiagnosticsHardwareFaultTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsHardwareFaultUnspecified") + = 0x00, + MTRGeneralDiagnosticsHardwareFaultTypeRadio API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsHardwareFaultRadio") + = 0x01, + MTRGeneralDiagnosticsHardwareFaultTypeSensor API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsHardwareFaultSensor") + = 0x02, + MTRGeneralDiagnosticsHardwareFaultTypeResettableOverTemp API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsHardwareFaultResettableOverTemp") + = 0x03, MTRGeneralDiagnosticsHardwareFaultTypeNonResettableOverTemp API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsHardwareFaultNonResettableOverTemp") = 0x04, - MTRGeneralDiagnosticsHardwareFaultTypePowerSource API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, - MTRGeneralDiagnosticsHardwareFaultTypeVisualDisplayFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06, - MTRGeneralDiagnosticsHardwareFaultTypeAudioOutputFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07, - MTRGeneralDiagnosticsHardwareFaultTypeUserInterfaceFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08, + MTRGeneralDiagnosticsHardwareFaultTypePowerSource API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsHardwareFaultPowerSource") + = 0x05, + MTRGeneralDiagnosticsHardwareFaultTypeVisualDisplayFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsHardwareFaultVisualDisplayFault") + = 0x06, + MTRGeneralDiagnosticsHardwareFaultTypeAudioOutputFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsHardwareFaultAudioOutputFault") + = 0x07, + MTRGeneralDiagnosticsHardwareFaultTypeUserInterfaceFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsHardwareFaultUserInterfaceFault") + = 0x08, MTRGeneralDiagnosticsHardwareFaultTypeNonVolatileMemoryError API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsHardwareFaultNonVolatileMemoryError") = 0x09, - MTRGeneralDiagnosticsHardwareFaultTypeTamperDetected API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0A, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRGeneralDiagnosticsHardwareFaultTypeTamperDetected API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsHardwareFaultTamperDetected") + = 0x0A, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsHardwareFault"); typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsInterfaceType) { MTRGeneralDiagnosticsInterfaceTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, @@ -17601,15 +17660,40 @@ typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsNetworkFaultType) { 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)); +typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsRadioFault) { + MTRGeneralDiagnosticsRadioFaultUnspecified MTR_NEWLY_AVAILABLE = 0x00, + MTRGeneralDiagnosticsRadioFaultWiFiFault MTR_NEWLY_AVAILABLE = 0x01, + MTRGeneralDiagnosticsRadioFaultCellularFault MTR_NEWLY_AVAILABLE = 0x02, + MTRGeneralDiagnosticsRadioFaultThreadFault MTR_NEWLY_AVAILABLE = 0x03, + MTRGeneralDiagnosticsRadioFaultNFCFault MTR_NEWLY_AVAILABLE = 0x04, + MTRGeneralDiagnosticsRadioFaultBLEFault MTR_NEWLY_AVAILABLE = 0x05, + MTRGeneralDiagnosticsRadioFaultEthernetFault MTR_NEWLY_AVAILABLE = 0x06, +} MTR_NEWLY_AVAILABLE; + typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsRadioFaultType) { - MTRGeneralDiagnosticsRadioFaultTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRGeneralDiagnosticsRadioFaultTypeWiFiFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRGeneralDiagnosticsRadioFaultTypeCellularFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRGeneralDiagnosticsRadioFaultTypeThreadFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRGeneralDiagnosticsRadioFaultTypeNFCFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, - MTRGeneralDiagnosticsRadioFaultTypeBLEFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, - MTRGeneralDiagnosticsRadioFaultTypeEthernetFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRGeneralDiagnosticsRadioFaultTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsRadioFaultUnspecified") + = 0x00, + MTRGeneralDiagnosticsRadioFaultTypeWiFiFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsRadioFaultWiFiFault") + = 0x01, + MTRGeneralDiagnosticsRadioFaultTypeCellularFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsRadioFaultCellularFault") + = 0x02, + MTRGeneralDiagnosticsRadioFaultTypeThreadFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsRadioFaultThreadFault") + = 0x03, + MTRGeneralDiagnosticsRadioFaultTypeNFCFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsRadioFaultNFCFault") + = 0x04, + MTRGeneralDiagnosticsRadioFaultTypeBLEFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsRadioFaultBLEFault") + = 0x05, + MTRGeneralDiagnosticsRadioFaultTypeEthernetFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsRadioFaultEthernetFault") + = 0x06, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsRadioFault"); typedef NS_OPTIONS(uint32_t, MTRSoftwareDiagnosticsFeature) { MTRSoftwareDiagnosticsFeatureWaterMarks API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, @@ -24361,21 +24445,21 @@ typedef NS_ENUM(uint8_t, MTRFaultInjectionFaultType) { - (void)readAttributeBootReasonsWithCompletionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use readAttributeBootReasonsWithCompletion:"); + MTR_NEWLY_DEPRECATED("Please use readAttributeBootReasonWithCompletion:"); - (void)subscribeAttributeBootReasonsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(MTRSubscribeParams * _Nullable)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use subscribeAttributeBootReasonsWithParams:subscriptionEstablished:"); + MTR_NEWLY_DEPRECATED("Please use subscribeAttributeBootReasonWithParams:subscriptionEstablished:"); + (void)readAttributeBootReasonsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use readAttributeBootReasonsWithAttributeCache:endpoint:queue:completion:"); + MTR_NEWLY_DEPRECATED("Please use readAttributeBootReasonWithAttributeCache:endpoint:queue:completion:"); - (void)readAttributeActiveHardwareFaultsWithCompletionHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 8fef3b8f231927..5c069f177d2013 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -25888,35 +25888,35 @@ + (void)readAttributeTotalOperationalHoursWithClusterStateCache:(MTRClusterState }); } -- (void)readAttributeBootReasonsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +- (void)readAttributeBootReasonWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = GeneralDiagnostics::Attributes::BootReasons::TypeInfo; - return MTRReadAttribute( + using TypeInfo = GeneralDiagnostics::Attributes::BootReason::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } -- (void)subscribeAttributeBootReasonsWithParams:(MTRSubscribeParams * _Nonnull)params - subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +- (void)subscribeAttributeBootReasonWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = GeneralDiagnostics::Attributes::BootReasons::TypeInfo; - MTRSubscribeAttribute(params, - subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), - TypeInfo::GetAttributeId()); + using TypeInfo = GeneralDiagnostics::Attributes::BootReason::TypeInfo; + MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } -+ (void)readAttributeBootReasonsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer - endpoint:(NSNumber *)endpoint - queue:(dispatch_queue_t)queue - completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion ++ (void)readAttributeBootReasonWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRInt8uAttributeCallbackBridge(queue, completion); - std::move(*bridge).DispatchLocalAction( - clusterStateCacheContainer.baseDevice, ^(Int8uAttributeCallback successCb, MTRErrorCallback failureCb) { + auto * bridge = new MTRGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge(queue, completion); + std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, + ^(GeneralDiagnosticsClusterBootReasonEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = GeneralDiagnostics::Attributes::BootReasons::TypeInfo; + using TypeInfo = GeneralDiagnostics::Attributes::BootReason::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -26517,7 +26517,7 @@ + (void)readAttributeTotalOperationalHoursWithAttributeCache:(MTRAttributeCacheC - (void)readAttributeBootReasonsWithCompletionHandler:(void (^)( NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - [self readAttributeBootReasonsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + [self readAttributeBootReasonWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. completionHandler(static_cast(value), error); }]; @@ -26535,12 +26535,12 @@ - (void)subscribeAttributeBootReasonsWithMinInterval:(NSNumber * _Nonnull)minInt subscribeParams.minInterval = minInterval; subscribeParams.maxInterval = maxInterval; } - [self subscribeAttributeBootReasonsWithParams:subscribeParams - subscriptionEstablished:subscriptionEstablishedHandler - reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - // Cast is safe because subclass does not add any selectors. - reportHandler(static_cast(value), error); - }]; + [self subscribeAttributeBootReasonWithParams:subscribeParams + subscriptionEstablished:subscriptionEstablishedHandler + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + // Cast is safe because subclass does not add any selectors. + reportHandler(static_cast(value), error); + }]; } + (void)readAttributeBootReasonsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint @@ -26548,13 +26548,13 @@ + (void)readAttributeBootReasonsWithAttributeCache:(MTRAttributeCacheContainer * completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - [self readAttributeBootReasonsWithClusterStateCache:attributeCacheContainer.realContainer - endpoint:endpoint - queue:queue - completion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - // Cast is safe because subclass does not add any selectors. - completionHandler(static_cast(value), error); - }]; + [self readAttributeBootReasonWithClusterStateCache:attributeCacheContainer.realContainer + endpoint:endpoint + queue:queue + completion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + // Cast is safe because subclass does not add any selectors. + completionHandler(static_cast(value), error); + }]; } - (void)readAttributeActiveHardwareFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 5eae8460dda56d..c3d79ef81d5c97 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -275,14 +275,14 @@ typedef void (*DiagnosticLogsClusterLogsTransferProtocolAttributeCallback)( void *, chip::app::Clusters::DiagnosticLogs::LogsTransferProtocol); typedef void (*NullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*GeneralDiagnosticsClusterBootReasonTypeAttributeCallback)(void *, - chip::app::Clusters::GeneralDiagnostics::BootReasonType); -typedef void (*NullableGeneralDiagnosticsClusterBootReasonTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*GeneralDiagnosticsClusterHardwareFaultTypeAttributeCallback)( - void *, chip::app::Clusters::GeneralDiagnostics::HardwareFaultType); -typedef void (*NullableGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*GeneralDiagnosticsClusterBootReasonEnumAttributeCallback)(void *, + chip::app::Clusters::GeneralDiagnostics::BootReasonEnum); +typedef void (*NullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*GeneralDiagnosticsClusterHardwareFaultAttributeCallback)(void *, + chip::app::Clusters::GeneralDiagnostics::HardwareFault); +typedef void (*NullableGeneralDiagnosticsClusterHardwareFaultAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*GeneralDiagnosticsClusterInterfaceTypeAttributeCallback)(void *, chip::app::Clusters::GeneralDiagnostics::InterfaceType); typedef void (*NullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallback)( @@ -291,10 +291,9 @@ typedef void (*GeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback)( void *, chip::app::Clusters::GeneralDiagnostics::NetworkFaultType); typedef void (*NullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*GeneralDiagnosticsClusterRadioFaultTypeAttributeCallback)(void *, - chip::app::Clusters::GeneralDiagnostics::RadioFaultType); -typedef void (*NullableGeneralDiagnosticsClusterRadioFaultTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*GeneralDiagnosticsClusterRadioFaultAttributeCallback)(void *, chip::app::Clusters::GeneralDiagnostics::RadioFault); +typedef void (*NullableGeneralDiagnosticsClusterRadioFaultAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*ThreadNetworkDiagnosticsClusterConnectionStatusEnumAttributeCallback)( void *, chip::app::Clusters::ThreadNetworkDiagnostics::ConnectionStatusEnum); typedef void (*NullableThreadNetworkDiagnosticsClusterConnectionStatusEnumAttributeCallback)( @@ -721,14 +720,14 @@ typedef void (*DiagnosticLogsAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*GeneralDiagnosticsNetworkInterfacesListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & data); + const chip::app::DataModel::DecodableList & + data); typedef void (*GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback)( - void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*GeneralDiagnosticsActiveRadioFaultsListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); + void * context, const chip::app::DataModel::DecodableList & data); +typedef void (*GeneralDiagnosticsActiveRadioFaultsListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); typedef void (*GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback)( - void * context, const chip::app::DataModel::DecodableList & data); + void * context, const chip::app::DataModel::DecodableList & data); typedef void (*GeneralDiagnosticsGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*GeneralDiagnosticsAcceptedCommandListListAttributeCallback)( @@ -4784,7 +4783,7 @@ class MTRGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & value); + chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType> & value); }; class MTRGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge @@ -4817,7 +4816,9 @@ class MTRGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge MTRActionBlock action) : MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); + static void + OnSuccessFn(void * context, + const chip::app::DataModel::DecodableList & value); }; class MTRGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge @@ -4850,7 +4851,8 @@ class MTRGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge MTRActionBlock action) : MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::DecodableList & value); }; class MTRGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge @@ -4883,7 +4885,9 @@ class MTRGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge MTRActionBlock action) : MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); + static void + OnSuccessFn(void * context, + const chip::app::DataModel::DecodableList & value); }; class MTRGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge @@ -14375,137 +14379,135 @@ class MTRNullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackSubsc MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::BootReasonType value); + static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::BootReasonEnum value); }; -class MTRGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackSubscriptionBridge - : public MTRGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge +class MTRGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackSubscriptionBridge + : public MTRGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge { public: - MTRGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackSubscriptionBridge( + MTRGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge(queue, handler, action), + MTRGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge::OnDone; + using MTRGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRNullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackSubscriptionBridge - : public MTRNullableGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge +class MTRNullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackSubscriptionBridge + : public MTRNullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge { public: - MTRNullableGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackSubscriptionBridge( + MTRNullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge(queue, handler, action), + MTRNullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge::OnDone; + using MTRNullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::HardwareFaultType value); + static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::HardwareFault value); }; -class MTRGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackSubscriptionBridge - : public MTRGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge +class MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge + : public MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge { public: - MTRGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackSubscriptionBridge( + MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge(queue, handler, action), + MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge::OnDone; + using MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::KeepAliveOnCallback; + using MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); }; -class MTRNullableGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackSubscriptionBridge - : public MTRNullableGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge +class MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge + : public MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge { public: - MTRNullableGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackSubscriptionBridge( + MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge(queue, handler, action), + MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge::OnDone; + using MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; @@ -14647,68 +14649,68 @@ class MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubsc MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::RadioFaultType value); + static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::RadioFault value); }; -class MTRGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackSubscriptionBridge - : public MTRGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge +class MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge + : public MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge { public: - MTRGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackSubscriptionBridge( + MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge(queue, handler, action), + MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge::OnDone; + using MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::KeepAliveOnCallback; + using MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackSubscriptionBridge - : public MTRNullableGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge +class MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge + : public MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge { public: - MTRNullableGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackSubscriptionBridge( + MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge(queue, handler, action), + MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge::OnDone; + using MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::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 16a4095d80729a..e7f3cb9bb21ced 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -4052,8 +4052,8 @@ } void MTRGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & value) + const chip::app::DataModel::DecodableList & + value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -4061,8 +4061,8 @@ auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRGeneralDiagnosticsClusterNetworkInterfaceType * newElement_0; - newElement_0 = [MTRGeneralDiagnosticsClusterNetworkInterfaceType new]; + MTRGeneralDiagnosticsClusterNetworkInterface * newElement_0; + newElement_0 = [MTRGeneralDiagnosticsClusterNetworkInterface new]; newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data() length:entry_0.name.size() encoding:NSUTF8StringEncoding]; @@ -4142,7 +4142,7 @@ } void MTRGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::DecodableList & value) + void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -4151,7 +4151,7 @@ while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); NSNumber * newElement_0; - newElement_0 = [NSNumber numberWithUnsignedChar:entry_0]; + newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -4180,7 +4180,7 @@ } void MTRGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::DecodableList & value) + void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -4189,7 +4189,7 @@ while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); NSNumber * newElement_0; - newElement_0 = [NSNumber numberWithUnsignedChar:entry_0]; + newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -4218,7 +4218,7 @@ } void MTRGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::DecodableList & value) + void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -4227,7 +4227,7 @@ while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); NSNumber * newElement_0; - newElement_0 = [NSNumber numberWithUnsignedChar:entry_0]; + newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -15059,15 +15059,15 @@ } } -void MTRGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::GeneralDiagnostics::BootReasonType value) +void MTRGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::GeneralDiagnostics::BootReasonEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -15082,8 +15082,8 @@ } } -void MTRNullableGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -15094,7 +15094,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableGeneralDiagnosticsClusterBootReasonTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -15109,15 +15109,15 @@ } } -void MTRGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::GeneralDiagnostics::HardwareFaultType value) +void MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::GeneralDiagnostics::HardwareFault value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -15132,8 +15132,8 @@ } } -void MTRNullableGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -15144,7 +15144,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableGeneralDiagnosticsClusterHardwareFaultTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -15259,15 +15259,15 @@ } } -void MTRGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::GeneralDiagnostics::RadioFaultType value) +void MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::GeneralDiagnostics::RadioFault value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -15282,8 +15282,8 @@ } } -void MTRNullableGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -15294,7 +15294,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableGeneralDiagnosticsClusterRadioFaultTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index 986d15366af4a7..2a33847365f571 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -1524,7 +1524,7 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeTotalOperationalHoursID") = 0x00000003, MTRClusterGeneralDiagnosticsAttributeBootReasonsID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeBootReasonsID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeBootReasonID") = 0x00000004, MTRClusterGeneralDiagnosticsAttributeActiveHardwareFaultsID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeActiveHardwareFaultsID") @@ -1559,7 +1559,7 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeRebootCountID MTR_NEWLY_AVAILABLE = 0x00000001, MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeUpTimeID MTR_NEWLY_AVAILABLE = 0x00000002, MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeTotalOperationalHoursID MTR_NEWLY_AVAILABLE = 0x00000003, - MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeBootReasonsID MTR_NEWLY_AVAILABLE = 0x00000004, + MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeBootReasonID MTR_NEWLY_AVAILABLE = 0x00000004, MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeActiveHardwareFaultsID MTR_NEWLY_AVAILABLE = 0x00000005, MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeActiveRadioFaultsID MTR_NEWLY_AVAILABLE = 0x00000006, MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeActiveNetworkFaultsID MTR_NEWLY_AVAILABLE = 0x00000007, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index 4c9a458da0907d..c374d5bc9a260e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -1594,8 +1594,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - (NSDictionary *)readAttributeTotalOperationalHoursWithParams:(MTRReadParams * _Nullable)params API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -- (NSDictionary *)readAttributeBootReasonsWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeBootReasonWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; - (NSDictionary *)readAttributeActiveHardwareFaultsWithParams:(MTRReadParams * _Nullable)params API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -7288,6 +7287,9 @@ MTR_NEWLY_DEPRECATED("Please use MTRClusterUnitTesting") completionHandler:(MTRStatusCompletion)completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use testEventTriggerWithParams:expectedValues:expectedValueIntervalMs:completion:"); +- (NSDictionary *)readAttributeBootReasonsWithParams:(MTRReadParams * _Nullable)params + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use readAttributeBootReasonWithParams on MTRClusterGeneralDiagnostics"); @end @interface MTRClusterSoftwareDiagnostics (Deprecated) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index fa256ffa99ce71..404f5c3c808789 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -8005,11 +8005,11 @@ - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTrigger params:params]; } -- (NSDictionary *)readAttributeBootReasonsWithParams:(MTRReadParams * _Nullable)params +- (NSDictionary *)readAttributeBootReasonWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) clusterID:@(MTRClusterIDTypeGeneralDiagnosticsID) - attributeID:@(MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeBootReasonsID) + attributeID:@(MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeBootReasonID) params:params]; } @@ -8105,6 +8105,10 @@ - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTrigger expectedValueInterval:expectedValueIntervalMs completion:completionHandler]; } +- (NSDictionary *)readAttributeBootReasonsWithParams:(MTRReadParams * _Nullable)params +{ + return [self readAttributeBootReasonWithParams:params]; +} @end @implementation MTRClusterSoftwareDiagnostics diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 9ae9a825e66c46..d43c1a846330f7 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -319,18 +319,21 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSNumber * _Nonnull rssi API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end +MTR_NEWLY_AVAILABLE +@interface MTRGeneralDiagnosticsClusterNetworkInterface : NSObject +@property (nonatomic, copy) NSString * _Nonnull name MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull isOperational MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nullable offPremiseServicesReachableIPv4 MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nullable offPremiseServicesReachableIPv6 MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSData * _Nonnull hardwareAddress MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSArray * _Nonnull iPv4Addresses MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSArray * _Nonnull iPv6Addresses MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull type MTR_NEWLY_AVAILABLE; +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRGeneralDiagnosticsClusterNetworkInterfaceType : NSObject -@property (nonatomic, copy) NSString * _Nonnull name API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull isOperational API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) - NSNumber * _Nullable offPremiseServicesReachableIPv4 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) - NSNumber * _Nullable offPremiseServicesReachableIPv6 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSData * _Nonnull hardwareAddress API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSArray * _Nonnull iPv4Addresses API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSArray * _Nonnull iPv6Addresses API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull type API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsClusterNetworkInterface") +@interface MTRGeneralDiagnosticsClusterNetworkInterfaceType : MTRGeneralDiagnosticsClusterNetworkInterface @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 7494b574a38b3b..3234a6b64555ba 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -1164,7 +1164,7 @@ - (NSString *)description @end -@implementation MTRGeneralDiagnosticsClusterNetworkInterfaceType +@implementation MTRGeneralDiagnosticsClusterNetworkInterface - (instancetype)init { if (self = [super init]) { @@ -1190,7 +1190,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRGeneralDiagnosticsClusterNetworkInterfaceType alloc] init]; + auto other = [[MTRGeneralDiagnosticsClusterNetworkInterface alloc] init]; other.name = self.name; other.isOperational = self.isOperational; @@ -1216,6 +1216,9 @@ - (NSString *)description @end +@implementation MTRGeneralDiagnosticsClusterNetworkInterfaceType : MTRGeneralDiagnosticsClusterNetworkInterface +@end + @implementation MTRGeneralDiagnosticsClusterHardwareFaultChangeEvent - (instancetype)init { diff --git a/src/include/platform/DiagnosticDataProvider.h b/src/include/platform/DiagnosticDataProvider.h index f3d576a4fe0e96..21da2d20115a3b 100644 --- a/src/include/platform/DiagnosticDataProvider.h +++ b/src/include/platform/DiagnosticDataProvider.h @@ -43,7 +43,7 @@ constexpr size_t kMaxIPv6AddrSize = 16; constexpr size_t kMaxIPv4AddrCount = 4; constexpr size_t kMaxIPv6AddrCount = 8; -using BootReasonType = app::Clusters::GeneralDiagnostics::BootReasonType; +using BootReasonType = app::Clusters::GeneralDiagnostics::BootReasonEnum; struct ThreadMetrics : public app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::Type { @@ -51,7 +51,7 @@ struct ThreadMetrics : public app::Clusters::SoftwareDiagnostics::Structs::Threa ThreadMetrics * Next; /* Pointer to the next structure. */ }; -struct NetworkInterface : public app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::Type +struct NetworkInterface : public app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::Type { char Name[Inet::InterfaceId::kMaxIfNameLength]; uint8_t MacAddress[kMaxHardwareAddrSize]; diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.cpp b/src/platform/Linux/DiagnosticDataProviderImpl.cpp index b762bb20e10069..bdebdaab8c3274 100644 --- a/src/platform/Linux/DiagnosticDataProviderImpl.cpp +++ b/src/platform/Linux/DiagnosticDataProviderImpl.cpp @@ -398,10 +398,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults & hardwareFaults) { #if CHIP_CONFIG_TEST - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO)); - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_SENSOR)); - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE)); - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_USER_INTERFACE_FAULT)); + 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)); #endif return CHIP_NO_ERROR; @@ -224,8 +224,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults & radioFaults) { #if CHIP_CONFIG_TEST - ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT)); - ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_TYPE_BLE_FAULT)); + ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT)); + ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT)); #endif return CHIP_NO_ERROR; diff --git a/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp b/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp index b8733d456ff31a..17d8a980abe408 100644 --- a/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp +++ b/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp @@ -205,10 +205,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults & hardwareFaults) { #if CHIP_CONFIG_TEST - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO)); - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_SENSOR)); - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE)); - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_USER_INTERFACE_FAULT)); + 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)); #endif return CHIP_NO_ERROR; @@ -217,8 +217,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults & radioFaults) { #if CHIP_CONFIG_TEST - ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT)); - ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_TYPE_BLE_FAULT)); + ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT)); + ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT)); #endif return CHIP_NO_ERROR; diff --git a/src/platform/mt793x/DiagnosticDataProviderImpl.cpp b/src/platform/mt793x/DiagnosticDataProviderImpl.cpp index 0fa3cfc9b49db8..036044ac2b6aea 100644 --- a/src/platform/mt793x/DiagnosticDataProviderImpl.cpp +++ b/src/platform/mt793x/DiagnosticDataProviderImpl.cpp @@ -170,10 +170,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults & hardwareFaults) { #if CHIP_CONFIG_TEST - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO)); - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_SENSOR)); - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE)); - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_USER_INTERFACE_FAULT)); + 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)); #endif return CHIP_NO_ERROR; @@ -182,8 +182,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults & radioFaults) { #if CHIP_CONFIG_TEST - ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT)); - ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_TYPE_BLE_FAULT)); + ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT)); + ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT)); #endif return CHIP_NO_ERROR; diff --git a/src/platform/qpg/DiagnosticDataProviderImpl.cpp b/src/platform/qpg/DiagnosticDataProviderImpl.cpp index 8e1501c5c0486c..aff2056914fc3f 100644 --- a/src/platform/qpg/DiagnosticDataProviderImpl.cpp +++ b/src/platform/qpg/DiagnosticDataProviderImpl.cpp @@ -145,10 +145,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults & hardwareFaults) { #if CHIP_CONFIG_TEST - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO)); - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_SENSOR)); - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE)); - ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_USER_INTERFACE_FAULT)); + 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)); #endif return CHIP_NO_ERROR; @@ -224,8 +224,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults & radioFaults) { #if CHIP_CONFIG_TEST - ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT)); - ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_TYPE_BLE_FAULT)); + ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT)); + ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT)); #endif return CHIP_NO_ERROR; diff --git a/src/platform/webos/DiagnosticDataProviderImpl.cpp b/src/platform/webos/DiagnosticDataProviderImpl.cpp index a65940695619a6..2a597319973c80 100644 --- a/src/platform/webos/DiagnosticDataProviderImpl.cpp +++ b/src/platform/webos/DiagnosticDataProviderImpl.cpp @@ -384,10 +384,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::GeneralDiagnostics::Id, Id, readable, sizeof(temp)); @@ -5496,9 +5496,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::GeneralDiagnostics::BootReasonEnum value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -5509,7 +5509,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::GeneralDiagnostics::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); } -} // namespace BootReasons +} // namespace BootReason namespace TestEventTriggersEnabled { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index e2e6bd7782f824..2303534ce5f682 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -1009,10 +1009,10 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value); } // namespace TotalOperationalHours -namespace BootReasons { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace BootReasons +namespace BootReason { +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::GeneralDiagnostics::BootReasonEnum * value); // BootReasonEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::GeneralDiagnostics::BootReasonEnum value); +} // namespace BootReason namespace TestEventTriggersEnabled { EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean 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 8867b72d629c80..495610c7455834 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 @@ -668,9 +668,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DiagnosticLogs::LogsTra } } -static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::BootReasonType val) +static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::BootReasonEnum val) { - using EnumType = GeneralDiagnostics::BootReasonType; + using EnumType = GeneralDiagnostics::BootReasonEnum; switch (val) { case EnumType::kUnspecified: @@ -685,9 +685,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::Boo return static_cast(7); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::HardwareFaultType val) +static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::HardwareFault val) { - using EnumType = GeneralDiagnostics::HardwareFaultType; + using EnumType = GeneralDiagnostics::HardwareFault; switch (val) { // Need to convert consumers to using the new enum classes, so we @@ -705,17 +705,17 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::Har case EnumType::kNonVolatileMemoryError: case EnumType::kTamperDetected: #else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM - case EMBER_ZCL_HARDWARE_FAULT_TYPE_UNSPECIFIED: - case EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO: - case EMBER_ZCL_HARDWARE_FAULT_TYPE_SENSOR: - case EMBER_ZCL_HARDWARE_FAULT_TYPE_RESETTABLE_OVER_TEMP: - case EMBER_ZCL_HARDWARE_FAULT_TYPE_NON_RESETTABLE_OVER_TEMP: - case EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE: - case EMBER_ZCL_HARDWARE_FAULT_TYPE_VISUAL_DISPLAY_FAULT: - case EMBER_ZCL_HARDWARE_FAULT_TYPE_AUDIO_OUTPUT_FAULT: - case EMBER_ZCL_HARDWARE_FAULT_TYPE_USER_INTERFACE_FAULT: - case EMBER_ZCL_HARDWARE_FAULT_TYPE_NON_VOLATILE_MEMORY_ERROR: - case EMBER_ZCL_HARDWARE_FAULT_TYPE_TAMPER_DETECTED: + 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: #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM return val; default: @@ -770,9 +770,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::Net return static_cast(4); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::RadioFaultType val) +static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::RadioFault val) { - using EnumType = GeneralDiagnostics::RadioFaultType; + using EnumType = GeneralDiagnostics::RadioFault; switch (val) { // Need to convert consumers to using the new enum classes, so we @@ -786,13 +786,13 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::Rad case EnumType::kBLEFault: case EnumType::kEthernetFault: #else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM - case EMBER_ZCL_RADIO_FAULT_TYPE_UNSPECIFIED: - case EMBER_ZCL_RADIO_FAULT_TYPE_WI_FI_FAULT: - case EMBER_ZCL_RADIO_FAULT_TYPE_CELLULAR_FAULT: - case EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT: - case EMBER_ZCL_RADIO_FAULT_TYPE_NFC_FAULT: - case EMBER_ZCL_RADIO_FAULT_TYPE_BLE_FAULT: - case EMBER_ZCL_RADIO_FAULT_TYPE_ETHERNET_FAULT: + 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: #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 8d52ff5644a3c8..1a05d9196134d5 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 @@ -662,8 +662,8 @@ enum class LogsTransferProtocol : uint8_t namespace GeneralDiagnostics { -// Enum for BootReasonType -enum class BootReasonType : uint8_t +// Enum for BootReasonEnum +enum class BootReasonEnum : uint8_t { kUnspecified = 0x00, kPowerOnReboot = 0x01, @@ -678,8 +678,8 @@ enum class BootReasonType : uint8_t // 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 HardwareFaultType -enum class HardwareFaultType : uint8_t +// Enum for HardwareFault +enum class HardwareFault : uint8_t { kUnspecified = 0x00, kRadio = 0x01, @@ -695,8 +695,8 @@ enum class HardwareFaultType : uint8_t kUnknownEnumValue = 11, }; #else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using HardwareFaultType = EmberAfHardwareFaultType; -static HardwareFaultType __attribute__((unused)) kHardwareFaultTypekUnknownEnumValue = static_cast(11); +using HardwareFault = EmberAfHardwareFault; +static HardwareFault __attribute__((unused)) kHardwareFaultkUnknownEnumValue = static_cast(11); #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM // Need to convert consumers to using the new enum classes, so we @@ -737,8 +737,8 @@ static NetworkFaultType __attribute__((unused)) kNetworkFaultTypekUnknownEnumVal // 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 RadioFaultType -enum class RadioFaultType : uint8_t +// Enum for RadioFault +enum class RadioFault : uint8_t { kUnspecified = 0x00, kWiFiFault = 0x01, @@ -750,8 +750,8 @@ enum class RadioFaultType : uint8_t kUnknownEnumValue = 7, }; #else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using RadioFaultType = EmberAfRadioFaultType; -static RadioFaultType __attribute__((unused)) kRadioFaultTypekUnknownEnumValue = static_cast(7); +using RadioFault = EmberAfRadioFault; +static RadioFault __attribute__((unused)) kRadioFaultkUnknownEnumValue = static_cast(7); #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM } // namespace GeneralDiagnostics diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 1ccecd57afd1cf..e2a0f0ed234443 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -6474,7 +6474,7 @@ namespace Events { } // namespace DiagnosticLogs namespace GeneralDiagnostics { namespace Structs { -namespace NetworkInterfaceType { +namespace NetworkInterface { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -6543,7 +6543,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace NetworkInterfaceType +} // namespace NetworkInterface } // namespace Structs namespace Commands { @@ -6607,8 +6607,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::TotalOperationalHours::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, totalOperationalHours)); break; - case Attributes::BootReasons::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, bootReasons)); + case Attributes::BootReason::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, bootReason)); break; case Attributes::ActiveHardwareFaults::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, activeHardwareFaults)); 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 aad029b966fa5e..70c6d6ab26422c 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 @@ -7662,7 +7662,7 @@ struct TypeInfo } // namespace DiagnosticLogs namespace GeneralDiagnostics { namespace Structs { -namespace NetworkInterfaceType { +namespace NetworkInterface { enum class Fields { kName = 0, @@ -7709,7 +7709,7 @@ struct DecodableType static constexpr bool kIsFabricScoped = false; }; -} // namespace NetworkInterfaceType +} // namespace NetworkInterface } // namespace Structs namespace Commands { @@ -7765,11 +7765,11 @@ namespace Attributes { namespace NetworkInterfaces { struct TypeInfo { - using Type = chip::app::DataModel::List; + using Type = chip::app::DataModel::List; using DecodableType = - chip::app::DataModel::DecodableList; + chip::app::DataModel::DecodableList; using DecodableArgType = const chip::app::DataModel::DecodableList< - chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> &; + chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType> &; static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::NetworkInterfaces::Id; } @@ -7812,24 +7812,24 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace TotalOperationalHours -namespace BootReasons { +namespace BootReason { struct TypeInfo { - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; + using Type = chip::app::Clusters::GeneralDiagnostics::BootReasonEnum; + using DecodableType = chip::app::Clusters::GeneralDiagnostics::BootReasonEnum; + using DecodableArgType = chip::app::Clusters::GeneralDiagnostics::BootReasonEnum; static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::BootReasons::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::BootReason::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace BootReasons +} // namespace BootReason namespace ActiveHardwareFaults { struct TypeInfo { - using Type = chip::app::DataModel::List; - using DecodableType = chip::app::DataModel::DecodableList; - using DecodableArgType = const chip::app::DataModel::DecodableList &; + using Type = chip::app::DataModel::List; + using DecodableType = chip::app::DataModel::DecodableList; + using DecodableArgType = const chip::app::DataModel::DecodableList &; static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ActiveHardwareFaults::Id; } @@ -7839,9 +7839,9 @@ struct TypeInfo namespace ActiveRadioFaults { struct TypeInfo { - using Type = chip::app::DataModel::List; - using DecodableType = chip::app::DataModel::DecodableList; - using DecodableArgType = const chip::app::DataModel::DecodableList &; + using Type = chip::app::DataModel::List; + using DecodableType = chip::app::DataModel::DecodableList; + using DecodableArgType = const chip::app::DataModel::DecodableList &; static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ActiveRadioFaults::Id; } @@ -7851,9 +7851,9 @@ struct TypeInfo namespace ActiveNetworkFaults { struct TypeInfo { - using Type = chip::app::DataModel::List; - using DecodableType = chip::app::DataModel::DecodableList; - using DecodableArgType = const chip::app::DataModel::DecodableList &; + using Type = chip::app::DataModel::List; + using DecodableType = chip::app::DataModel::DecodableList; + using DecodableArgType = const chip::app::DataModel::DecodableList &; static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ActiveNetworkFaults::Id; } @@ -7915,7 +7915,8 @@ struct TypeInfo Attributes::RebootCount::TypeInfo::DecodableType rebootCount = static_cast(0); Attributes::UpTime::TypeInfo::DecodableType upTime = static_cast(0); Attributes::TotalOperationalHours::TypeInfo::DecodableType totalOperationalHours = static_cast(0); - Attributes::BootReasons::TypeInfo::DecodableType bootReasons = static_cast(0); + Attributes::BootReason::TypeInfo::DecodableType bootReason = + static_cast(0); Attributes::ActiveHardwareFaults::TypeInfo::DecodableType activeHardwareFaults; Attributes::ActiveRadioFaults::TypeInfo::DecodableType activeRadioFaults; Attributes::ActiveNetworkFaults::TypeInfo::DecodableType activeNetworkFaults; @@ -7946,8 +7947,8 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } static constexpr bool kIsFabricScoped = false; - DataModel::List current; - DataModel::List previous; + DataModel::List current; + DataModel::List previous; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -7959,8 +7960,8 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::HardwareFaultChange::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } - DataModel::DecodableList current; - DataModel::DecodableList previous; + DataModel::DecodableList current; + DataModel::DecodableList previous; CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -7982,8 +7983,8 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } static constexpr bool kIsFabricScoped = false; - DataModel::List current; - DataModel::List previous; + DataModel::List current; + DataModel::List previous; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -7995,8 +7996,8 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::RadioFaultChange::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } - DataModel::DecodableList current; - DataModel::DecodableList previous; + DataModel::DecodableList current; + DataModel::DecodableList previous; CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -8053,7 +8054,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } static constexpr bool kIsFabricScoped = false; - BootReasonType bootReason = static_cast(0); + BootReasonEnum bootReason = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -8065,7 +8066,7 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::BootReason::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } - BootReasonType bootReason = static_cast(0); + BootReasonEnum bootReason = static_cast(0); 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 8e9c12f5c2470f..63b8af9976e1aa 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 @@ enum EmberAfEnhancedColorMode : uint8_t EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3, }; -// Enum for HardwareFaultType -enum EmberAfHardwareFaultType : uint8_t -{ - EMBER_ZCL_HARDWARE_FAULT_TYPE_UNSPECIFIED = 0, - EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO = 1, - EMBER_ZCL_HARDWARE_FAULT_TYPE_SENSOR = 2, - EMBER_ZCL_HARDWARE_FAULT_TYPE_RESETTABLE_OVER_TEMP = 3, - EMBER_ZCL_HARDWARE_FAULT_TYPE_NON_RESETTABLE_OVER_TEMP = 4, - EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE = 5, - EMBER_ZCL_HARDWARE_FAULT_TYPE_VISUAL_DISPLAY_FAULT = 6, - EMBER_ZCL_HARDWARE_FAULT_TYPE_AUDIO_OUTPUT_FAULT = 7, - EMBER_ZCL_HARDWARE_FAULT_TYPE_USER_INTERFACE_FAULT = 8, - EMBER_ZCL_HARDWARE_FAULT_TYPE_NON_VOLATILE_MEMORY_ERROR = 9, - EMBER_ZCL_HARDWARE_FAULT_TYPE_TAMPER_DETECTED = 10, +// Enum for HardwareFault +enum EmberAfHardwareFault : 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, }; // Enum for HueDirection @@ -231,16 +231,16 @@ enum EmberAfPHYRate : uint8_t EMBER_ZCL_PHY_RATE_RATE400_G = 9, }; -// Enum for RadioFaultType -enum EmberAfRadioFaultType : uint8_t +// Enum for RadioFault +enum EmberAfRadioFault : uint8_t { - EMBER_ZCL_RADIO_FAULT_TYPE_UNSPECIFIED = 0, - EMBER_ZCL_RADIO_FAULT_TYPE_WI_FI_FAULT = 1, - EMBER_ZCL_RADIO_FAULT_TYPE_CELLULAR_FAULT = 2, - EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT = 3, - EMBER_ZCL_RADIO_FAULT_TYPE_NFC_FAULT = 4, - EMBER_ZCL_RADIO_FAULT_TYPE_BLE_FAULT = 5, - EMBER_ZCL_RADIO_FAULT_TYPE_ETHERNET_FAULT = 6, + 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, }; // Enum for RoutingRole diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index b0561b5d0b4649..f04936cff351f7 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -1176,9 +1176,9 @@ namespace TotalOperationalHours { static constexpr AttributeId Id = 0x00000003; } // namespace TotalOperationalHours -namespace BootReasons { +namespace BootReason { static constexpr AttributeId Id = 0x00000004; -} // namespace BootReasons +} // namespace BootReason namespace ActiveHardwareFaults { static constexpr AttributeId Id = 0x00000005; diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h index 25318d5df955a7..08819793e87a58 100644 --- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h +++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h @@ -233,7 +233,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h index 2a4588a79a317b..57b0dc19939956 100644 --- a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h @@ -197,7 +197,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/endpoint_config.h index 6ac4b6c00baacb..223810e96920b8 100644 --- a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/endpoint_config.h @@ -206,7 +206,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h index a3be9e1b292b00..d28f6926849480 100644 --- a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h @@ -206,7 +206,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h index ad2497d999d8b7..2f10f727297e98 100644 --- a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h @@ -209,7 +209,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h index a3c18b0f8c1ba1..5f328c9fa2adbd 100644 --- a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h @@ -211,7 +211,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h index 98a23bb9adcecc..12ac01c5d54a13 100644 --- a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h @@ -215,7 +215,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h index 231cbaf71d1dfb..bf79020d3526b1 100644 --- a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h @@ -223,7 +223,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h index 7207b068315268..4dccf6b1888374 100644 --- a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h @@ -206,7 +206,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h index a08057b8119ee6..4b285c6cae070c 100644 --- a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h @@ -212,7 +212,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h index be36b3fbcc9986..3e66df7d354547 100644 --- a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h @@ -206,7 +206,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h index 5da1040bd17fd3..5ab96464bcff83 100644 --- a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h @@ -206,7 +206,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h index 4979f720e979c4..dee4223e2d134c 100644 --- a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h @@ -206,7 +206,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h index c74181bbaa46dc..11b6b3664deb82 100644 --- a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h @@ -209,7 +209,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h index 483b0218b7396e..95f426f622aff1 100644 --- a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h @@ -206,7 +206,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h index 9bb0327807d64e..ba7200df969918 100644 --- a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h @@ -206,7 +206,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h index a4f8b57db09486..24f4736d81e8e3 100644 --- a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h @@ -206,7 +206,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h index 36c0ef11138e79..eddf23b321fdbd 100644 --- a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h @@ -206,7 +206,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h index 44079cb92c90f0..c22f8db1afcb0c 100644 --- a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h @@ -206,7 +206,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h index c4a339cf3e0269..1476bf1368ce2e 100644 --- a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h @@ -226,7 +226,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h index 08d2013599159b..66dade8dfd6b1f 100644 --- a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h @@ -206,7 +206,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 617d112ed44026..b4aebd87faf38d 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -2581,7 +2581,7 @@ class DiagnosticLogsRetrieveLogsRequest : public ClusterCommand | * RebootCount | 0x0001 | | * UpTime | 0x0002 | | * TotalOperationalHours | 0x0003 | -| * BootReasons | 0x0004 | +| * BootReason | 0x0004 | | * ActiveHardwareFaults | 0x0005 | | * ActiveRadioFaults | 0x0006 | | * ActiveNetworkFaults | 0x0007 | @@ -9588,7 +9588,7 @@ void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerComm make_unique(Id, "reboot-count", Attributes::RebootCount::Id, credsIssuerConfig), // make_unique(Id, "up-time", Attributes::UpTime::Id, credsIssuerConfig), // make_unique(Id, "total-operational-hours", Attributes::TotalOperationalHours::Id, credsIssuerConfig), // - make_unique(Id, "boot-reasons", Attributes::BootReasons::Id, credsIssuerConfig), // + make_unique(Id, "boot-reason", Attributes::BootReason::Id, credsIssuerConfig), // make_unique(Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, credsIssuerConfig), // make_unique(Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, credsIssuerConfig), // make_unique(Id, "active-network-faults", Attributes::ActiveNetworkFaults::Id, credsIssuerConfig), // @@ -9605,7 +9605,7 @@ void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerComm make_unique(Id, "reboot-count", Attributes::RebootCount::Id, credsIssuerConfig), // make_unique(Id, "up-time", Attributes::UpTime::Id, credsIssuerConfig), // make_unique(Id, "total-operational-hours", Attributes::TotalOperationalHours::Id, credsIssuerConfig), // - make_unique(Id, "boot-reasons", Attributes::BootReasons::Id, credsIssuerConfig), // + make_unique(Id, "boot-reason", Attributes::BootReason::Id, credsIssuerConfig), // make_unique(Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, credsIssuerConfig), // make_unique(Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, credsIssuerConfig), // make_unique(Id, "active-network-faults", Attributes::ActiveNetworkFaults::Id, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 3924e62ba12553..7b635a6c5897b3 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -1260,27 +1260,27 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::NetworkCommissioning:: ComplexArgumentParser::Finalize(request.connected); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::Type & request, + chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterfaceType.name", "name", value.isMember("name"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterfaceType.isOperational", "isOperational", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterface.name", "name", value.isMember("name"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterface.isOperational", "isOperational", value.isMember("isOperational"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterfaceType.offPremiseServicesReachableIPv4", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterface.offPremiseServicesReachableIPv4", "offPremiseServicesReachableIPv4", value.isMember("offPremiseServicesReachableIPv4"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterfaceType.offPremiseServicesReachableIPv6", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterface.offPremiseServicesReachableIPv6", "offPremiseServicesReachableIPv6", value.isMember("offPremiseServicesReachableIPv6"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterfaceType.hardwareAddress", "hardwareAddress", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterface.hardwareAddress", "hardwareAddress", value.isMember("hardwareAddress"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterfaceType.IPv4Addresses", "IPv4Addresses", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterface.IPv4Addresses", "IPv4Addresses", value.isMember("IPv4Addresses"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterfaceType.IPv6Addresses", "IPv6Addresses", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterface.IPv6Addresses", "IPv6Addresses", value.isMember("IPv6Addresses"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterfaceType.type", "type", value.isMember("type"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NetworkInterface.type", "type", value.isMember("type"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "name"); @@ -1312,7 +1312,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return CHIP_NO_ERROR; } -void ComplexArgumentParser::Finalize(chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::Type & request) { ComplexArgumentParser::Finalize(request.name); ComplexArgumentParser::Finalize(request.isOperational); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index 89ce99d793ff73..ec007119bca492 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -167,10 +167,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::NetworkCommissi Json::Value & value); static void Finalize(chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::Type & request); +static void Finalize(chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::UnitTesting::Structs::NullablesAndOptionalsStruct::Type & request, Json::Value & value); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 9fb3f7025187bc..ea4a2460397b0d 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -1332,7 +1332,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType & value) + const chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -5601,8 +5601,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP switch (path.mAttributeId) { case GeneralDiagnostics::Attributes::NetworkInterfaces::Id: { - chip::app::DataModel::DecodableList< - chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("NetworkInterfaces", 1, value); @@ -5622,23 +5621,23 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TotalOperationalHours", 1, value); } - case GeneralDiagnostics::Attributes::BootReasons::Id: { - uint8_t value; + case GeneralDiagnostics::Attributes::BootReason::Id: { + chip::app::Clusters::GeneralDiagnostics::BootReasonEnum value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("BootReasons", 1, value); + return DataModelLogger::LogValue("BootReason", 1, value); } case GeneralDiagnostics::Attributes::ActiveHardwareFaults::Id: { - chip::app::DataModel::DecodableList value; + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ActiveHardwareFaults", 1, value); } case GeneralDiagnostics::Attributes::ActiveRadioFaults::Id: { - chip::app::DataModel::DecodableList value; + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ActiveRadioFaults", 1, value); } case GeneralDiagnostics::Attributes::ActiveNetworkFaults::Id: { - chip::app::DataModel::DecodableList value; + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ActiveNetworkFaults", 1, value); } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index 9b3a89d3083bc5..0b3923972caaa3 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -94,7 +94,7 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType & value); + const chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::UnitTesting::Structs::NullablesAndOptionalsStruct::DecodableType & value); static CHIP_ERROR diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index ba21aaad6fbec5..f8570828a26f3d 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -21211,7 +21211,7 @@ class Test_TC_DGGEN_2_1Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< - chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> + chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType> value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "list", "list")); @@ -21280,7 +21280,7 @@ class Test_TC_DGGEN_2_1Suite : public TestCommand case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - uint8_t value; + chip::app::Clusters::GeneralDiagnostics::BootReasonEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 6U)); @@ -21421,7 +21421,7 @@ class Test_TC_DGGEN_2_1Suite : public TestCommand LogStep(13, "TH reads BootReason attribute value from DUT."); VerifyOrDo(!ShouldSkip("DGGEN.S.A0004"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GeneralDiagnostics::Id, - GeneralDiagnostics::Attributes::BootReasons::Id, true, chip::NullOptional); + GeneralDiagnostics::Attributes::BootReason::Id, true, chip::NullOptional); } case 14: { LogStep(14, "TH reads ActiveHardwareFaults attribute value from DUT."); diff --git a/zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h b/zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h index f65581cc45b5fd..3f82be7f12fc0d 100644 --- a/zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h +++ b/zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h @@ -227,7 +227,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h index d3f4385626f182..8f1d6b556b7953 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -192,14 +192,14 @@ typedef void (*DiagnosticLogsAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*GeneralDiagnosticsNetworkInterfacesListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & data); + const chip::app::DataModel::DecodableList & + data); typedef void (*GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback)( - void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*GeneralDiagnosticsActiveRadioFaultsListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); + void * context, const chip::app::DataModel::DecodableList & data); +typedef void (*GeneralDiagnosticsActiveRadioFaultsListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); typedef void (*GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback)( - void * context, const chip::app::DataModel::DecodableList & data); + void * context, const chip::app::DataModel::DecodableList & data); typedef void (*GeneralDiagnosticsGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*GeneralDiagnosticsAcceptedCommandListListAttributeCallback)( diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 1e576e960e6289..a0c24d16313634 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -21527,7 +21527,7 @@ class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribut | * RebootCount | 0x0001 | | * UpTime | 0x0002 | | * TotalOperationalHours | 0x0003 | -| * BootReasons | 0x0004 | +| * BootReason | 0x0004 | | * ActiveHardwareFaults | 0x0005 | | * ActiveRadioFaults | 0x0006 | | * ActiveNetworkFaults | 0x0007 | @@ -21874,16 +21874,16 @@ class SubscribeAttributeGeneralDiagnosticsTotalOperationalHours : public Subscri }; /* - * Attribute BootReasons + * Attribute BootReason */ -class ReadGeneralDiagnosticsBootReasons : public ReadAttribute { +class ReadGeneralDiagnosticsBootReason : public ReadAttribute { public: - ReadGeneralDiagnosticsBootReasons() - : ReadAttribute("boot-reasons") + ReadGeneralDiagnosticsBootReason() + : ReadAttribute("boot-reason") { } - ~ReadGeneralDiagnosticsBootReasons() {} + ~ReadGeneralDiagnosticsBootReason() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -21893,10 +21893,10 @@ class ReadGeneralDiagnosticsBootReasons : public ReadAttribute { __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - [cluster readAttributeBootReasonsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"GeneralDiagnostics.BootReasons response %@", [value description]); + [cluster readAttributeBootReasonWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"GeneralDiagnostics.BootReason response %@", [value description]); if (error != nil) { - LogNSError("GeneralDiagnostics BootReasons read Error", error); + LogNSError("GeneralDiagnostics BootReason read Error", error); } SetCommandExitStatus(error); }]; @@ -21904,14 +21904,14 @@ class ReadGeneralDiagnosticsBootReasons : public ReadAttribute { } }; -class SubscribeAttributeGeneralDiagnosticsBootReasons : public SubscribeAttribute { +class SubscribeAttributeGeneralDiagnosticsBootReason : public SubscribeAttribute { public: - SubscribeAttributeGeneralDiagnosticsBootReasons() - : SubscribeAttribute("boot-reasons") + SubscribeAttributeGeneralDiagnosticsBootReason() + : SubscribeAttribute("boot-reason") { } - ~SubscribeAttributeGeneralDiagnosticsBootReasons() {} + ~SubscribeAttributeGeneralDiagnosticsBootReason() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -21930,12 +21930,12 @@ class SubscribeAttributeGeneralDiagnosticsBootReasons : public SubscribeAttribut if (mAutoResubscribe.HasValue()) { params.resubscribeIfLost = mAutoResubscribe.Value(); } - [cluster subscribeAttributeBootReasonsWithParams:params + [cluster subscribeAttributeBootReasonWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"GeneralDiagnostics.BootReasons response %@", [value description]); + NSLog(@"GeneralDiagnostics.BootReason response %@", [value description]); SetCommandExitStatus(error); }]; @@ -98352,8 +98352,8 @@ void registerClusterGeneralDiagnostics(Commands & commands) make_unique(), // make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index d51bece01aa2ef..dae86fd7579d5f 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -25113,13 +25113,13 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster readAttributeBootReasonsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { + [cluster readAttributeBootReasonWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { NSLog(@"TH reads BootReason attribute value from DUT. Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("bootReasons", [value unsignedCharValue], 0U)); - VerifyOrReturn(CheckConstraintMaxValue("bootReasons", [value unsignedCharValue], 6U)); + VerifyOrReturn(CheckConstraintMinValue("bootReason", [value unsignedCharValue], 0U)); + VerifyOrReturn(CheckConstraintMaxValue("bootReason", [value unsignedCharValue], 6U)); NextTest(); }]; diff --git a/zzz_generated/dynamic-bridge-app/zap-generated/endpoint_config.h b/zzz_generated/dynamic-bridge-app/zap-generated/endpoint_config.h index 25318d5df955a7..08819793e87a58 100644 --- a/zzz_generated/dynamic-bridge-app/zap-generated/endpoint_config.h +++ b/zzz_generated/dynamic-bridge-app/zap-generated/endpoint_config.h @@ -233,7 +233,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h index c0e714b566b02c..1a108c8e4734d3 100644 --- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h +++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h @@ -217,7 +217,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h index 56967881e74922..91e5a796d277b1 100644 --- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h @@ -236,7 +236,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h index cf0398be95da64..f7ad83f843c981 100644 --- a/zzz_generated/lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h @@ -274,7 +274,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h b/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h index 3d6a28b26cda1d..99983bc4117cf8 100644 --- a/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h +++ b/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h @@ -213,7 +213,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h index 208817a0893f66..4c74f07c28eb5e 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h +++ b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h @@ -218,7 +218,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h index 5f3291395e4578..df809e1365ddb6 100644 --- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h @@ -269,7 +269,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h index f9fda829d64fc8..d0c0f75f692e84 100644 --- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h @@ -282,7 +282,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h index d83982bbd4361a..c0c0938d533060 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h +++ b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h @@ -223,7 +223,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index 1647ce93393cea..a3aaf57e2abf8c 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -258,7 +258,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index 15ad0f8690c0a4..e5bec90ea68231 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -289,7 +289,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h index 25008cde376fc7..78a3cc674c6ad1 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -242,7 +242,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h index 0edabc57e5c5df..8dafb654407cad 100644 --- a/zzz_generated/window-app/zap-generated/endpoint_config.h +++ b/zzz_generated/window-app/zap-generated/endpoint_config.h @@ -238,7 +238,7 @@ { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ + { 0x00000004, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReason */ \ { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \