From 3642680027e3348da2e73a4a004799a04be8657d Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 18 Jan 2023 17:31:50 -0500 Subject: [PATCH] Align naming in Ethernet Network Diagnostics cluster XML with the spec. (#24474) * Align naming in Ethernet Network Diagnostics cluster XML with the spec. The spec changed in https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6161 Fixes https://github.com/project-chip/connectedhomeip/issues/24464 * Auto-update ZAP files from XML. * Regenerate generated code. Co-authored-by: Andrei Litvin --- .../all-clusters-app.matter | 4 +- .../all-clusters-common/all-clusters-app.zap | 2 +- .../all-clusters-minimal-app.matter | 4 +- .../all-clusters-minimal-app.zap | 2 +- .../bridge-common/bridge-app.matter | 4 +- .../bridge-app/bridge-common/bridge-app.zap | 2 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 4 +- ...noip_rootnode_dimmablelight_bCwGYSDpoe.zap | 2 +- ...tnode_colortemperaturelight_hbUnzYVeyn.zap | 2 +- .../rootnode_contactsensor_lFAGG1bfRO.zap | 2 +- .../rootnode_dimmablelight_bCwGYSDpoe.zap | 2 +- .../devices/rootnode_doorlock_aNKYAreMXE.zap | 2 +- ...rootnode_extendedcolorlight_8lcaaYJVAa.zap | 2 +- .../chef/devices/rootnode_fan_7N2TobIlOX.zap | 2 +- .../rootnode_flowsensor_1zVxHedlaV.zap | 2 +- ...rootnode_heatingcoolingunit_ncdGai1E5a.zap | 2 +- .../rootnode_humiditysensor_Xyj4gda6Hb.zap | 2 +- .../rootnode_lightsensor_lZQycTFcJK.zap | 2 +- .../rootnode_occupancysensor_iHyVgifZuo.zap | 2 +- .../rootnode_onofflight_bbs1b7IaOV.zap | 2 +- .../rootnode_onofflightswitch_FsPlMr090Q.zap | 2 +- .../rootnode_onoffpluginunit_Wtf8ss5EBY.zap | 2 +- .../rootnode_pressuresensor_s0qC9wLH4k.zap | 2 +- .../devices/rootnode_speaker_RpzeXdimqA.zap | 2 +- .../rootnode_temperaturesensor_Qy1zkNW7c3.zap | 2 +- .../rootnode_thermostat_bm3fb8dhYi.zap | 2 +- .../rootnode_windowcovering_RLCxaGi9Yx.zap | 2 +- .../contact-sensor-app.matter | 4 +- .../contact-sensor-app.zap | 2 +- .../bridge-common/bridge-app.matter | 4 +- .../bridge-common/bridge-app.zap | 2 +- .../light-switch-app.matter | 4 +- .../light-switch-common/light-switch-app.zap | 2 +- .../lighting-common/lighting-app.matter | 4 +- .../lighting-common/lighting-app.zap | 2 +- .../lighting-app/nxp/zap/lighting-on-off.zap | 2 +- examples/lock-app/lock-common/lock-app.matter | 4 +- examples/lock-app/lock-common/lock-app.zap | 2 +- .../placeholder/linux/apps/app1/config.matter | 4 +- .../placeholder/linux/apps/app1/config.zap | 2 +- .../placeholder/linux/apps/app2/config.matter | 4 +- .../placeholder/linux/apps/app2/config.zap | 2 +- .../esp32/main/temperature-measurement.matter | 4 +- .../esp32/main/temperature-measurement.zap | 2 +- .../thermostat-common/thermostat.matter | 4 +- .../thermostat-common/thermostat.zap | 2 +- examples/tv-app/tv-common/tv-app.matter | 4 +- examples/tv-app/tv-common/tv-app.zap | 2 +- .../tv-casting-common/tv-casting-app.matter | 4 +- .../tv-casting-common/tv-casting-app.zap | 2 +- examples/window-app/common/window-app.matter | 4 +- examples/window-app/common/window-app.zap | 2 +- .../ethernet-network-diagnostics-server.cpp | 2 +- src/app/common/templates/weak-enum-list.yaml | 2 +- .../ethernet-network-diagnostics-cluster.xml | 4 +- .../data_model/controller-clusters.matter | 4 +- .../data_model/controller-clusters.zap | 2 +- .../java/zap-generated/CHIPReadCallbacks.cpp | 2 +- .../java/zap-generated/CHIPReadCallbacks.h | 5 +- .../python/chip/clusters/Objects.py | 10 +-- .../CHIP/templates/availability.yaml | 10 +-- .../CHIP/zap-generated/MTRBaseClusters.mm | 8 +-- .../CHIP/zap-generated/MTRCallbackBridge.h | 69 ++++++++++--------- .../CHIP/zap-generated/MTRCallbackBridge.mm | 12 ++-- src/include/platform/DiagnosticDataProvider.h | 4 +- src/platform/Linux/ConnectivityUtils.cpp | 22 +++--- src/platform/Linux/ConnectivityUtils.h | 2 +- .../Linux/DiagnosticDataProviderImpl.cpp | 2 +- .../Linux/DiagnosticDataProviderImpl.h | 2 +- src/platform/nxp/mw320/ConnectivityUtils.h | 2 +- src/platform/webos/ConnectivityUtils.cpp | 22 +++--- src/platform/webos/ConnectivityUtils.h | 2 +- .../webos/DiagnosticDataProviderImpl.cpp | 2 +- .../webos/DiagnosticDataProviderImpl.h | 2 +- .../zap-generated/attributes/Accessors.cpp | 13 ++-- .../zap-generated/attributes/Accessors.h | 6 +- .../zap-generated/cluster-enums-check.h | 24 +++---- .../app-common/zap-generated/cluster-enums.h | 8 +-- .../zap-generated/cluster-objects.h | 6 +- .../app-common/zap-generated/enums.h | 26 +++---- .../cluster/logging/DataModelLogger.cpp | 2 +- .../chip-tool/zap-generated/test/Commands.h | 22 +++--- 82 files changed, 220 insertions(+), 215 deletions(-) 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 b2cd9511209687..26ef094c0d7b84 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 @@ -1466,7 +1466,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1479,7 +1479,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; 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 6d5c7e8e55679b..8c1eacfd85e048 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 @@ -5121,7 +5121,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, 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 5546326758f3da..e645546562046d 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 @@ -1317,7 +1317,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1330,7 +1330,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; 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 f1966cfbe7b475..fed5c819c95ecb 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 @@ -5121,7 +5121,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "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 5d5c889277e1ff..923b7929e97c78 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1138,7 +1138,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1151,7 +1151,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index 28c59bdbd6369e..44436d9cec3bb1 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -3855,7 +3855,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "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 1b36a25668237a..2d811db4990ee6 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -996,7 +996,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1009,7 +1009,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index ae48c3f3208850..3be1f650872bf7 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index f63cd021a54e1b..f0f6bbd16478d9 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -4361,7 +4361,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index b6d56032c51f1f..7050ceee78f222 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index 95bffc4c6a8f6e..d7a25a383c47cf 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 4d611c986f6d19..9f065c2c6e4ce8 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index 6caf3ec8138b6b..7a59d1ee65a920 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index 18f92fc60a8cdd..04e16096fc3e0c 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -4409,7 +4409,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index d644fe72e57caf..353ec8d49187f0 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 389dfb13326814..fa8d959973abbe 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index b0ea2523a99ffc..719453021ec0c5 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index 82b2db2b128214..40c284a542950e 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index bc858df7aea404..0e78cb4ea11bbf 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index a9873893183c6e..054cec8921d7cb 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index 1d3dba4a4e6f43..6c41d7cf399b6d 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 030fdd2b4d723a..21a07b0ab4c377 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index e940d9becfa527..4e6d4295e04cbf 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index 8c17b74ebf9486..2e6d208f3ae502 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index 731d43c63bd333..6f351c86943bde 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index 68ba1f5e73a9db..1f95d0f30093d9 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -4313,7 +4313,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index 7beb18da0550d7..1481f7887acfbc 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -4265,7 +4265,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "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 75b9d21d0cc5b0..89f8587c26f2d1 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 @@ -984,7 +984,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -997,7 +997,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; 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 5ccf0e70ef7eb3..cd9511da1bcea4 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 @@ -4361,7 +4361,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "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 5d5c889277e1ff..923b7929e97c78 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -1138,7 +1138,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1151,7 +1151,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap index 28c59bdbd6369e..44436d9cec3bb1 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap @@ -3855,7 +3855,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "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 c021fa8d36b790..b93957645d798a 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 @@ -1186,7 +1186,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1199,7 +1199,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; 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 27d8862196715b..f20217188b6e35 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 @@ -4343,7 +4343,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "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 2269e907057c48..1b93e78f28bcdc 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1142,7 +1142,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1155,7 +1155,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 4b5e6e47a31804..2243bafe025659 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -4361,7 +4361,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index a119c01d8b0f11..4e6583afa3d7ab 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -4556,7 +4556,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "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 1ccc584e38085a..62f0a5bf4edea4 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1058,7 +1058,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1071,7 +1071,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 549de105754d23..a5701dca56208c 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -4289,7 +4289,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "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 1edc8484a8dd6b..36d8a5bebaa6b0 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1164,7 +1164,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1177,7 +1177,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index e8a4d5706d34e5..3c4241e1174bbe 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -2785,7 +2785,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "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 cdf7e4da214b93..0c53527d0f5164 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1141,7 +1141,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1154,7 +1154,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 101cddf5f3ed59..0313ea00cb93f3 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -2985,7 +2985,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "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 b5add914dd72da..13fb74571a8e7d 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -579,7 +579,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -592,7 +592,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap index 6ce5457550e0bf..c88ca4581a57b6 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap @@ -2345,7 +2345,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 978cdba96d9f53..d8557b71f47f4d 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1140,7 +1140,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1153,7 +1153,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index bd0646ff98e5b0..0ed802607047d6 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -4329,7 +4329,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "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 c673b4da718947..68dab6d6ff3d4a 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1185,7 +1185,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1198,7 +1198,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 96d083b9f4281a..32ac0ccddd9b07 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -4139,7 +4139,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "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 1e5f03c0b9f8b8..4146ebb2c13668 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 @@ -1357,7 +1357,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1370,7 +1370,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; 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 3ab34dcfdfcd3b..3f02dbe3232670 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 @@ -4089,7 +4089,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "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 847f0bce021fa5..0cb5222e9579a9 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1196,7 +1196,7 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1209,7 +1209,7 @@ server cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index 8767798b25b2d8..f82d64a7b86bbf 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -5051,7 +5051,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp b/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp index 87eee5dd46630e..c978a56704397e 100644 --- a/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp +++ b/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp @@ -74,7 +74,7 @@ CHIP_ERROR EthernetDiagosticsAttrAccess::ReadIfSupported(CHIP_ERROR (DiagnosticD CHIP_ERROR EthernetDiagosticsAttrAccess::ReadPHYRate(AttributeValueEncoder & aEncoder) { Attributes::PHYRate::TypeInfo::Type pHYRate; - auto value = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_M; + auto value = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_M; if (DeviceLayer::GetDiagnosticDataProvider().GetEthPHYRate(value) == CHIP_NO_ERROR) { diff --git a/src/app/common/templates/weak-enum-list.yaml b/src/app/common/templates/weak-enum-list.yaml index aa4bee14441513..d720d51161fdd8 100644 --- a/src/app/common/templates/weak-enum-list.yaml +++ b/src/app/common/templates/weak-enum-list.yaml @@ -25,7 +25,7 @@ - OnOffDelayedAllOffEffectVariant - OnOffDyingLightEffectVariant - OnOffEffectIdentifier -- PHYRate +- PHYRateEnum - RadioFault - RoutingRole - SaturationMoveMode diff --git a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml index ff3e64b279884b..5958f7cdb4ccd3 100644 --- a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + @@ -35,7 +35,7 @@ limitations under the License. 0x0037 ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER The Ethernet Network Diagnostics Cluster provides 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. - PHYRate + PHYRate FullDuplex PacketRxCount PacketTxCount diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 42146d4d5b434f..01db4c376ae587 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1651,7 +1651,7 @@ client cluster WiFiNetworkDiagnostics = 54 { } client cluster EthernetNetworkDiagnostics = 55 { - enum PHYRate : ENUM8 { + enum PHYRateEnum : ENUM8 { kRate10M = 0; kRate100M = 1; kRate1G = 2; @@ -1664,7 +1664,7 @@ client cluster EthernetNetworkDiagnostics = 55 { kRate400G = 9; } - readonly attribute nullable PHYRate PHYRate = 0; + readonly attribute nullable PHYRateEnum PHYRate = 0; readonly attribute nullable boolean fullDuplex = 1; readonly attribute int64u packetRxCount = 2; readonly attribute int64u packetTxCount = 3; diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 0a53bb511f3699..f32c1c8935881f 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -7217,7 +7217,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "PHYRate", + "type": "PHYRateEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 9a5ba6344a369a..e46c90c7116afc 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -11413,7 +11413,7 @@ CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::~CHIPEthernetNetworkDiag } void CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::CallbackFn( - void * context, const chip::app::DataModel::Nullable & value) + void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index a82af3a768ddcc..dbaa442c04721b 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -4736,8 +4736,9 @@ class CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback } } - static void CallbackFn(void * context, - const chip::app::DataModel::Nullable & value); + static void + CallbackFn(void * context, + const chip::app::DataModel::Nullable & value); static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index a9fc531e5ca8c9..99e8a57d065274 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -9813,7 +9813,7 @@ class EthernetNetworkDiagnostics(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="PHYRate", Tag=0x00000000, Type=typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRate]), + ClusterObjectFieldDescriptor(Label="PHYRate", Tag=0x00000000, Type=typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRateEnum]), ClusterObjectFieldDescriptor(Label="fullDuplex", Tag=0x00000001, Type=typing.Union[None, Nullable, bool]), ClusterObjectFieldDescriptor(Label="packetRxCount", Tag=0x00000002, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="packetTxCount", Tag=0x00000003, Type=typing.Optional[uint]), @@ -9829,7 +9829,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - PHYRate: 'typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRate]' = None + PHYRate: 'typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRateEnum]' = None fullDuplex: 'typing.Union[None, Nullable, bool]' = None packetRxCount: 'typing.Optional[uint]' = None packetTxCount: 'typing.Optional[uint]' = None @@ -9845,7 +9845,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class PHYRate(IntEnum): + class PHYRateEnum(IntEnum): kRate10M = 0x00 kRate100M = 0x01 kRate1G = 0x02 @@ -9888,9 +9888,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRate]) + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRateEnum]) - value: 'typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRate]' = None + value: 'typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRateEnum]' = None @dataclass class FullDuplex(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index ed46d85c5c2d52..cd894aa84592b2 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -5209,7 +5209,7 @@ ThreadNetworkDiagnostics: - ConnectionStatusEnum EthernetNetworkDiagnostics: - - PHYRate + - PHYRateEnum GeneralDiagnostics: - HardwareFault - RadioFault @@ -5290,7 +5290,7 @@ - Ac - Ax EthernetNetworkDiagnostics: - PHYRate: + PHYRateEnum: - Rate10M - Rate100M - Rate1G @@ -5544,7 +5544,7 @@ - Rate100G - Rate200G - Rate400G - PHYRate: + PHYRateEnum: - 10M - 100M - 1000M @@ -5664,7 +5664,7 @@ ThreadNetworkDiagnostics: ConnectionStatusEnum: ThreadConnectionStatus EthernetNetworkDiagnostics: - PHYRate: PHYRateType + PHYRateEnum: PHYRateType GeneralDiagnostics: HardwareFault: HardwareFaultType RadioFault: RadioFaultType @@ -5687,7 +5687,7 @@ Ac: 80211ac Ax: 80211ax EthernetNetworkDiagnostics: - PHYRate: + PHYRateEnum: Rate10M: 10M Rate100M: 100M Rate1G: 1000M diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index c522a5f33241d5..03d3aa0ea49e55 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -35614,7 +35614,7 @@ - (void)readAttributePHYRateWithCompletion:(void (^)(NSNumber * _Nullable value, { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -35624,7 +35624,7 @@ - (void)subscribeAttributePHYRateWithParams:(MTRSubscribeParams * _Nonnull)param reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -35634,9 +35634,9 @@ + (void)readAttributePHYRateWithClusterStateCache:(MTRClusterStateCacheContainer queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(NullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(NullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 2f6a522b9d349a..07d3901a76550b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -322,10 +322,10 @@ typedef void (*WiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallback)( void *, chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionType); typedef void (*NullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*EthernetNetworkDiagnosticsClusterPHYRateAttributeCallback)(void *, - chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate); -typedef void (*NullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*EthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallback)( + void *, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum); +typedef void (*NullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*TimeSynchronizationClusterGranularityEnumAttributeCallback)( void *, chip::app::Clusters::TimeSynchronization::GranularityEnum); typedef void (*NullableTimeSynchronizationClusterGranularityEnumAttributeCallback)( @@ -15222,68 +15222,71 @@ class MTRNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackSu MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge - : public MTRCallbackBridge +class MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate value); + static void OnSuccessFn(void * context, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum value); }; -class MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge - : public MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge +class MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge + : public MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge { public: - MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge( + MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(queue, handler, action), + MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::KeepAliveOnCallback; - using MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::OnDone; + using MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(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 MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge - : public MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge +class MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge + : public MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge { public: - MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge( + MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(queue, handler, action), + MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::OnDone; + using MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge::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 88a5ec1b9b30e6..3bc9987924e74e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -15660,15 +15660,15 @@ } } -void MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate value) +void MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -15683,8 +15683,8 @@ } } -void MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -15695,7 +15695,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/include/platform/DiagnosticDataProvider.h b/src/include/platform/DiagnosticDataProvider.h index 21da2d20115a3b..0165c55c0bc2bb 100644 --- a/src/include/platform/DiagnosticDataProvider.h +++ b/src/include/platform/DiagnosticDataProvider.h @@ -142,7 +142,7 @@ class DiagnosticDataProvider /** * Ethernet network diagnostics methods */ - virtual CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate); + virtual CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate); virtual CHIP_ERROR GetEthFullDuplex(bool & fullDuplex); virtual CHIP_ERROR GetEthCarrierDetect(bool & carrierDetect); virtual CHIP_ERROR GetEthTimeSinceReset(uint64_t & timeSinceReset); @@ -278,7 +278,7 @@ inline CHIP_ERROR DiagnosticDataProvider::GetNetworkInterfaces(NetworkInterface inline void DiagnosticDataProvider::ReleaseNetworkInterfaces(NetworkInterface * netifp) {} -inline CHIP_ERROR DiagnosticDataProvider::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) +inline CHIP_ERROR DiagnosticDataProvider::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate) { return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE; } diff --git a/src/platform/Linux/ConnectivityUtils.cpp b/src/platform/Linux/ConnectivityUtils.cpp index eda1daaff1cd27..7b9ffdd73d3701 100644 --- a/src/platform/Linux/ConnectivityUtils.cpp +++ b/src/platform/Linux/ConnectivityUtils.cpp @@ -628,7 +628,7 @@ CHIP_ERROR ConnectivityUtils::GetEthInterfaceName(char * ifname, size_t bufSize) return err; } -CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) +CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -658,34 +658,34 @@ CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters:: switch (speed) { case 10: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_M; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_M; break; case 100: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_M; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_M; break; case 1000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE1_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE1_G; break; case 25000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE2_5_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G; break; case 5000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE5_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE5_G; break; case 10000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_G; break; case 40000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE40_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE40_G; break; case 100000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_G; break; case 200000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE200_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE200_G; break; case 400000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE400_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE400_G; break; default: ChipLogError(DeviceLayer, "Undefined speed! (%d)\n", speed); diff --git a/src/platform/Linux/ConnectivityUtils.h b/src/platform/Linux/ConnectivityUtils.h index bd47460371a206..53792971809b09 100644 --- a/src/platform/Linux/ConnectivityUtils.h +++ b/src/platform/Linux/ConnectivityUtils.h @@ -53,7 +53,7 @@ class ConnectivityUtils static CHIP_ERROR GetWiFiBeaconLostCount(const char * ifname, uint32_t & beaconLostCount); static CHIP_ERROR GetWiFiCurrentMaxRate(const char * ifname, uint64_t & currentMaxRate); static CHIP_ERROR GetEthInterfaceName(char * ifname, size_t bufSize); - static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate); + static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate); static CHIP_ERROR GetEthFullDuplex(const char * ifname, bool & fullDuplex); private: diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.cpp b/src/platform/Linux/DiagnosticDataProviderImpl.cpp index bdebdaab8c3274..af1a0b8a0387e9 100644 --- a/src/platform/Linux/DiagnosticDataProviderImpl.cpp +++ b/src/platform/Linux/DiagnosticDataProviderImpl.cpp @@ -512,7 +512,7 @@ void DiagnosticDataProviderImpl::ReleaseNetworkInterfaces(NetworkInterface * net } } -CHIP_ERROR DiagnosticDataProviderImpl::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) +CHIP_ERROR DiagnosticDataProviderImpl::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate) { if (ConnectivityMgrImpl().GetEthernetIfName() == nullptr) { diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.h b/src/platform/Linux/DiagnosticDataProviderImpl.h index bcbcc1748bc44d..5d09747c90225d 100644 --- a/src/platform/Linux/DiagnosticDataProviderImpl.h +++ b/src/platform/Linux/DiagnosticDataProviderImpl.h @@ -59,7 +59,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider CHIP_ERROR GetNetworkInterfaces(NetworkInterface ** netifpp) override; void ReleaseNetworkInterfaces(NetworkInterface * netifp) override; - CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) override; + CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate) override; CHIP_ERROR GetEthFullDuplex(bool & fullDuplex) override; CHIP_ERROR GetEthTimeSinceReset(uint64_t & timeSinceReset) override; CHIP_ERROR GetEthPacketRxCount(uint64_t & packetRxCount) override; diff --git a/src/platform/nxp/mw320/ConnectivityUtils.h b/src/platform/nxp/mw320/ConnectivityUtils.h index bdfb67533a42f1..6e05a9e12d86cc 100644 --- a/src/platform/nxp/mw320/ConnectivityUtils.h +++ b/src/platform/nxp/mw320/ConnectivityUtils.h @@ -54,7 +54,7 @@ class ConnectivityUtils static CHIP_ERROR GetWiFiBeaconLostCount(const char * ifname, uint32_t & beaconLostCount); static CHIP_ERROR GetWiFiCurrentMaxRate(const char * ifname, uint64_t & currentMaxRate); static CHIP_ERROR GetEthInterfaceName(char * ifname, size_t bufSize); - // static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate); + // static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate); // static CHIP_ERROR GetEthFullDuplex(const char * ifname, bool & fullDuplex); private: diff --git a/src/platform/webos/ConnectivityUtils.cpp b/src/platform/webos/ConnectivityUtils.cpp index 9104d20c0bcf4e..73ebe93b3ccc0d 100644 --- a/src/platform/webos/ConnectivityUtils.cpp +++ b/src/platform/webos/ConnectivityUtils.cpp @@ -536,7 +536,7 @@ CHIP_ERROR ConnectivityUtils::GetEthInterfaceName(char * ifname, size_t bufSize) return err; } -CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) +CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -566,34 +566,34 @@ CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters:: switch (speed) { case 10: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_M; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_M; break; case 100: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_M; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_M; break; case 1000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE1_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE1_G; break; case 25000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE2_5_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G; break; case 5000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE5_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE5_G; break; case 10000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_G; break; case 40000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE40_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE40_G; break; case 100000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_G; break; case 200000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE200_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE200_G; break; case 400000: - pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE400_G; + pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE400_G; break; default: ChipLogError(DeviceLayer, "Undefined speed! (%d)\n", speed); diff --git a/src/platform/webos/ConnectivityUtils.h b/src/platform/webos/ConnectivityUtils.h index 0df7926cacf803..28c4b01d9580fa 100644 --- a/src/platform/webos/ConnectivityUtils.h +++ b/src/platform/webos/ConnectivityUtils.h @@ -50,7 +50,7 @@ class ConnectivityUtils static CHIP_ERROR GetWiFiBeaconLostCount(const char * ifname, uint32_t & beaconLostCount); static CHIP_ERROR GetWiFiCurrentMaxRate(const char * ifname, uint64_t & currentMaxRate); static CHIP_ERROR GetEthInterfaceName(char * ifname, size_t bufSize); - static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate); + static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate); static CHIP_ERROR GetEthFullDuplex(const char * ifname, bool & fullDuplex); private: diff --git a/src/platform/webos/DiagnosticDataProviderImpl.cpp b/src/platform/webos/DiagnosticDataProviderImpl.cpp index 2a597319973c80..fa357ac29f4d8a 100644 --- a/src/platform/webos/DiagnosticDataProviderImpl.cpp +++ b/src/platform/webos/DiagnosticDataProviderImpl.cpp @@ -481,7 +481,7 @@ void DiagnosticDataProviderImpl::ReleaseNetworkInterfaces(NetworkInterface * net } } -CHIP_ERROR DiagnosticDataProviderImpl::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) +CHIP_ERROR DiagnosticDataProviderImpl::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate) { if (ConnectivityMgrImpl().GetEthernetIfName() == nullptr) { diff --git a/src/platform/webos/DiagnosticDataProviderImpl.h b/src/platform/webos/DiagnosticDataProviderImpl.h index 7baa700910604c..a16a6673404e5b 100644 --- a/src/platform/webos/DiagnosticDataProviderImpl.h +++ b/src/platform/webos/DiagnosticDataProviderImpl.h @@ -57,7 +57,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider CHIP_ERROR GetNetworkInterfaces(NetworkInterface ** netifpp) override; void ReleaseNetworkInterfaces(NetworkInterface * netifp) override; - CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) override; + CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate) override; CHIP_ERROR GetEthFullDuplex(bool & fullDuplex) override; CHIP_ERROR GetEthTimeSinceReset(uint64_t & timeSinceReset) override; CHIP_ERROR GetEthPacketRxCount(uint64_t & packetRxCount) override; diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index 83948299abd3b1..a858d1fb086271 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -8723,9 +8723,10 @@ namespace Attributes { namespace PHYRate { -EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) +EmberAfStatus Get(chip::EndpointId endpoint, + DataModel::Nullable & value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = @@ -8741,9 +8742,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -8756,7 +8757,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EthernetNetwor EmberAfStatus SetNull(chip::EndpointId endpoint) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); @@ -8764,7 +8765,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) } EmberAfStatus Set(chip::EndpointId endpoint, - const chip::app::DataModel::Nullable & value) + const chip::app::DataModel::Nullable & value) { if (value.IsNull()) { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 68d57f9b60d78e..52f778ba68551e 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 @@ -1517,11 +1517,11 @@ namespace Attributes { namespace PHYRate { EmberAfStatus Get(chip::EndpointId endpoint, - DataModel::Nullable & value); // PHYRate -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate value); + DataModel::Nullable & value); // PHYRateEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum value); EmberAfStatus SetNull(chip::EndpointId endpoint); EmberAfStatus Set(chip::EndpointId endpoint, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); } // namespace PHYRate namespace FullDuplex { 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 39d93c9339f60f..211443a6f114c6 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 @@ -937,9 +937,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(WiFiNetworkDiagnostics: } } -static auto __attribute__((unused)) EnsureKnownEnumValue(EthernetNetworkDiagnostics::PHYRate val) +static auto __attribute__((unused)) EnsureKnownEnumValue(EthernetNetworkDiagnostics::PHYRateEnum val) { - using EnumType = EthernetNetworkDiagnostics::PHYRate; + using EnumType = EthernetNetworkDiagnostics::PHYRateEnum; switch (val) { // Need to convert consumers to using the new enum classes, so we @@ -956,16 +956,16 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(EthernetNetworkDiagnost case EnumType::kRate200G: case EnumType::kRate400G: #else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM - case EMBER_ZCL_PHY_RATE_RATE10_M: - case EMBER_ZCL_PHY_RATE_RATE100_M: - case EMBER_ZCL_PHY_RATE_RATE1_G: - case EMBER_ZCL_PHY_RATE_RATE2_5_G: - case EMBER_ZCL_PHY_RATE_RATE5_G: - case EMBER_ZCL_PHY_RATE_RATE10_G: - case EMBER_ZCL_PHY_RATE_RATE40_G: - case EMBER_ZCL_PHY_RATE_RATE100_G: - case EMBER_ZCL_PHY_RATE_RATE200_G: - case EMBER_ZCL_PHY_RATE_RATE400_G: + case EMBER_ZCL_PHY_RATE_ENUM_RATE10_M: + case EMBER_ZCL_PHY_RATE_ENUM_RATE100_M: + case EMBER_ZCL_PHY_RATE_ENUM_RATE1_G: + case EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G: + case EMBER_ZCL_PHY_RATE_ENUM_RATE5_G: + case EMBER_ZCL_PHY_RATE_ENUM_RATE10_G: + case EMBER_ZCL_PHY_RATE_ENUM_RATE40_G: + case EMBER_ZCL_PHY_RATE_ENUM_RATE100_G: + case EMBER_ZCL_PHY_RATE_ENUM_RATE200_G: + case EMBER_ZCL_PHY_RATE_ENUM_RATE400_G: #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 ce05711413631b..b03629533322dd 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 @@ -870,8 +870,8 @@ namespace EthernetNetworkDiagnostics { // 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 PHYRate -enum class PHYRate : uint8_t +// Enum for PHYRateEnum +enum class PHYRateEnum : uint8_t { kRate10M = 0x00, kRate100M = 0x01, @@ -886,8 +886,8 @@ enum class PHYRate : uint8_t kUnknownEnumValue = 10, }; #else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using PHYRate = EmberAfPHYRate; -static PHYRate __attribute__((unused)) kPHYRatekUnknownEnumValue = static_cast(10); +using PHYRateEnum = EmberAfPHYRateEnum; +static PHYRateEnum __attribute__((unused)) kPHYRateEnumkUnknownEnumValue = static_cast(10); #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM } // namespace EthernetNetworkDiagnostics 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 54616044a5437b..963f08345e82e3 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 @@ -9858,9 +9858,9 @@ namespace Attributes { namespace PHYRate { struct TypeInfo { - using Type = chip::app::DataModel::Nullable; - using DecodableType = chip::app::DataModel::Nullable; - using DecodableArgType = const chip::app::DataModel::Nullable &; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::EthernetNetworkDiagnostics::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::PHYRate::Id; } 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 595cfa9e6aa1ed..55e14edff1108d 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -216,19 +216,19 @@ enum EmberAfOnOffEffectIdentifier : uint8_t EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT = 1, }; -// Enum for PHYRate -enum EmberAfPHYRate : uint8_t -{ - EMBER_ZCL_PHY_RATE_RATE10_M = 0, - EMBER_ZCL_PHY_RATE_RATE100_M = 1, - EMBER_ZCL_PHY_RATE_RATE1_G = 2, - EMBER_ZCL_PHY_RATE_RATE2_5_G = 3, - EMBER_ZCL_PHY_RATE_RATE5_G = 4, - EMBER_ZCL_PHY_RATE_RATE10_G = 5, - EMBER_ZCL_PHY_RATE_RATE40_G = 6, - EMBER_ZCL_PHY_RATE_RATE100_G = 7, - EMBER_ZCL_PHY_RATE_RATE200_G = 8, - EMBER_ZCL_PHY_RATE_RATE400_G = 9, +// Enum for PHYRateEnum +enum EmberAfPHYRateEnum : uint8_t +{ + EMBER_ZCL_PHY_RATE_ENUM_RATE10_M = 0, + EMBER_ZCL_PHY_RATE_ENUM_RATE100_M = 1, + EMBER_ZCL_PHY_RATE_ENUM_RATE1_G = 2, + EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G = 3, + EMBER_ZCL_PHY_RATE_ENUM_RATE5_G = 4, + EMBER_ZCL_PHY_RATE_ENUM_RATE10_G = 5, + EMBER_ZCL_PHY_RATE_ENUM_RATE40_G = 6, + EMBER_ZCL_PHY_RATE_ENUM_RATE100_G = 7, + EMBER_ZCL_PHY_RATE_ENUM_RATE200_G = 8, + EMBER_ZCL_PHY_RATE_ENUM_RATE400_G = 9, }; // Enum for RadioFault 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 f77ad32d213845..e277b165bcc221 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -6179,7 +6179,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP switch (path.mAttributeId) { case EthernetNetworkDiagnostics::Attributes::PHYRate::Id: { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("PHYRate", 1, value); } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 30592b6a430fb4..5d0afb4a7d50c8 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -19974,7 +19974,7 @@ class Test_TC_DGETH_2_1Suite : public TestCommand case 1: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -20295,7 +20295,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand case 1: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -20305,7 +20305,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -20315,7 +20315,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand case 3: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -20325,7 +20325,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand case 4: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -20335,7 +20335,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand case 5: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -20345,7 +20345,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -20355,7 +20355,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -20365,7 +20365,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand case 8: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -20375,7 +20375,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand case 9: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -20385,7 +20385,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));