From 13039ae5c6caa7c4945fc0d4b3da3d19d36dda6f Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 6 Jan 2023 18:59:16 -0500 Subject: [PATCH] Align naming in Ethernet Network Diagnostics cluster XML with the spec. (#24296) * Align naming in Ethernet Network Diagnostics cluster XML with the spec. * Auto-update ZAP files with new attribute type. * Regenerate generated files. --- .../all-clusters-app.matter | 28 ++++---- .../all-clusters-common/all-clusters-app.zap | 2 +- .../all-clusters-minimal-app.matter | 28 ++++---- .../all-clusters-minimal-app.zap | 2 +- .../bridge-common/bridge-app.matter | 28 ++++---- .../bridge-app/bridge-common/bridge-app.zap | 2 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 28 ++++---- ...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 | 28 ++++---- .../contact-sensor-app.zap | 2 +- .../bridge-common/bridge-app.matter | 28 ++++---- .../bridge-common/bridge-app.zap | 2 +- .../light-switch-app.matter | 28 ++++---- .../light-switch-common/light-switch-app.zap | 2 +- .../lighting-common/lighting-app.matter | 28 ++++---- .../lighting-common/lighting-app.zap | 2 +- .../lighting-app/nxp/zap/lighting-on-off.zap | 2 +- examples/lock-app/lock-common/lock-app.matter | 28 ++++---- examples/lock-app/lock-common/lock-app.zap | 2 +- .../placeholder/linux/apps/app1/config.matter | 28 ++++---- .../placeholder/linux/apps/app1/config.zap | 2 +- .../placeholder/linux/apps/app2/config.matter | 28 ++++---- .../placeholder/linux/apps/app2/config.zap | 2 +- .../esp32/main/temperature-measurement.matter | 28 ++++---- .../esp32/main/temperature-measurement.zap | 2 +- .../thermostat-common/thermostat.matter | 28 ++++---- .../thermostat-common/thermostat.zap | 2 +- examples/tv-app/tv-common/tv-app.matter | 28 ++++---- examples/tv-app/tv-common/tv-app.zap | 2 +- .../tv-casting-common/tv-casting-app.matter | 28 ++++---- .../tv-casting-common/tv-casting-app.zap | 2 +- examples/window-app/common/window-app.matter | 28 ++++---- examples/window-app/common/window-app.zap | 2 +- .../ethernet-network-diagnostics-server.cpp | 4 +- src/app/common/templates/weak-enum-list.yaml | 2 +- .../ethernet-network-diagnostics-cluster.xml | 24 +++---- .../data_model/controller-clusters.matter | 28 ++++---- .../data_model/controller-clusters.zap | 2 +- .../java/zap-generated/CHIPReadCallbacks.cpp | 2 +- .../java/zap-generated/CHIPReadCallbacks.h | 5 +- .../python/chip/clusters/Objects.py | 30 ++++---- .../CHIP/templates/MTRBaseClusters.zapt | 16 +++++ .../CHIP/templates/availability.yaml | 68 ++++++++++++++++++ .../CHIP/zap-generated/MTRBaseClusters.h | 56 ++++++++++++--- .../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 | 44 ++++++------ .../app-common/zap-generated/cluster-enums.h | 30 ++++---- .../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 +++--- 84 files changed, 585 insertions(+), 472 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 1b1cf5d21d957d..81cf25fc84a2b6 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,20 +1466,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 0b9943b52dcd26..385bbdba5e28a8 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": "PHYRateType", + "type": "PHYRate", "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 2f9b9fe2974a43..03701fc1b20c53 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,20 +1317,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 73ab88c4af843a..47702fc123b3d5 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": "PHYRateType", + "type": "PHYRate", "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 fd11bac0562806..3c1b616b3feac5 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1138,20 +1138,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 a0e07d51d636a0..44d80159434847 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": "PHYRateType", + "type": "PHYRate", "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 f13eaa6810ebe1..504061e0f58d39 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -996,20 +996,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 7d9c91a966953d..6b7df1a03281d5 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": "PHYRateType", + "type": "PHYRate", "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 30876a6f5d7d6a..67432cb95ed0ac 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": "PHYRateType", + "type": "PHYRate", "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 7300d725d57911..971297e1bf39d4 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": "PHYRateType", + "type": "PHYRate", "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 63645911051bde..197a544b63bb0b 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": "PHYRateType", + "type": "PHYRate", "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 43383ea912b116..6fdd82f2a92eba 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": "PHYRateType", + "type": "PHYRate", "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 c7a16d13f57ed4..ed74052d1a9128 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": "PHYRateType", + "type": "PHYRate", "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 bc4042f5ff46b6..62f52151109311 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": "PHYRateType", + "type": "PHYRate", "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 2ec904036f07ca..c8424aee9f1a39 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": "PHYRateType", + "type": "PHYRate", "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 baaaef0506cce8..12bc28d09deeb4 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": "PHYRateType", + "type": "PHYRate", "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 cd8199ba90edaa..db501f62b4e0d4 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": "PHYRateType", + "type": "PHYRate", "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 5bb8164029b32a..cd6ef1952f2dcc 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": "PHYRateType", + "type": "PHYRate", "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 1039a3e8768889..7f0de5650c4329 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": "PHYRateType", + "type": "PHYRate", "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 0ee26065d436d5..ece0ee2a052aa8 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": "PHYRateType", + "type": "PHYRate", "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 6e2fb0d28dd43e..3394f2f770e006 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": "PHYRateType", + "type": "PHYRate", "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 e71dc662cc3417..64777e266df8bc 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": "PHYRateType", + "type": "PHYRate", "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 268700dc6007b8..8525d0e050db84 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": "PHYRateType", + "type": "PHYRate", "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 34bcecd5fd1e8d..1d1de16b31859a 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": "PHYRateType", + "type": "PHYRate", "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 7062ae0e908b2a..366d20b713a8ea 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": "PHYRateType", + "type": "PHYRate", "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 7447417cbf8774..871682eb0ea6a5 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": "PHYRateType", + "type": "PHYRate", "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 bbbb67fc105dc8..6d39ef464cdaa2 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": "PHYRateType", + "type": "PHYRate", "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 dce07818e85510..fac8abe275b249 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,20 +984,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 6190125af204ac..240c199920563a 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": "PHYRateType", + "type": "PHYRate", "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 fd11bac0562806..3c1b616b3feac5 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -1138,20 +1138,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 a0e07d51d636a0..44d80159434847 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": "PHYRateType", + "type": "PHYRate", "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 533ddc510459ea..304a3b013c2cdd 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,20 +1186,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 65df40708c13dc..10301e01d011ba 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": "PHYRateType", + "type": "PHYRate", "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 0744c2442a011b..6941b5c4c7c1c9 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1142,20 +1142,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 5d94b32c9dd469..16de5c96dc21ce 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": "PHYRateType", + "type": "PHYRate", "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 f6fed920720628..92ac1c2930ffdc 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": "PHYRateType", + "type": "PHYRate", "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 ea281eb3f1be27..2fcd9006309e29 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1058,20 +1058,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 b480ac6c8dc2ca..8ac3ca3a0e298a 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": "PHYRateType", + "type": "PHYRate", "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 731e4719127078..735bc9df2e3d7d 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1164,20 +1164,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 38e76b10033723..76b7f6794bfdd4 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": "PHYRateType", + "type": "PHYRate", "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 e6655ba610485f..dfb8f49b950deb 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1141,20 +1141,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 48198e2be34d21..5d2f46b4ebedf2 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": "PHYRateType", + "type": "PHYRate", "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 3f8dc64974728a..44b5f9c7eba810 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -579,20 +579,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 c8de96fad01190..1a2dd5df66f990 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": "PHYRateType", + "type": "PHYRate", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index c27fbb86c90054..78c1f6d91045c2 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1140,20 +1140,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 40a770305947e1..46a2ac12d79943 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": "PHYRateType", + "type": "PHYRate", "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 ea9fc62b1ab12b..dd3ed3a662be02 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1185,20 +1185,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 b1f7772d0cc071..f1a89a06e0b4aa 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": "PHYRateType", + "type": "PHYRate", "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 fec089a37a2280..6eaf640fc0afae 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,20 +1357,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 ed4a8d1990cff6..c5dc34bdaec6af 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": "PHYRateType", + "type": "PHYRate", "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 e163597567a927..e16d40ae2aa4de 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1196,20 +1196,20 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 8e577510944e12..ad313c8454318d 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": "PHYRateType", + "type": "PHYRate", "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 f1d023b2632137..87eee5dd46630e 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; - PHYRateType value = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_10_M; + auto value = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_M; if (DeviceLayer::GetDiagnosticDataProvider().GetEthPHYRate(value) == CHIP_NO_ERROR) { @@ -138,7 +138,7 @@ CHIP_ERROR EthernetDiagosticsAttrAccess::Read(const ConcreteReadAttributePath & switch (aPath.mAttributeId) { - case PHYRate::Id: { + case Attributes::PHYRate::Id: { return ReadPHYRate(aEncoder); } case FullDuplex::Id: { diff --git a/src/app/common/templates/weak-enum-list.yaml b/src/app/common/templates/weak-enum-list.yaml index 24e3fc3b89de4a..1806d0d8639b96 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 -- PHYRateType +- PHYRate - RadioFaultType - 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 36b25108c94e1d..ff3e64b279884b 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,18 +16,18 @@ limitations under the License. --> - + - - - - - - - - - - + + + + + + + + + + General @@ -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 cad9e69558887a..66c8abac48aab6 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1651,20 +1651,20 @@ client cluster WiFiNetworkDiagnostics = 54 { } client cluster EthernetNetworkDiagnostics = 55 { - enum PHYRateType : ENUM8 { - k10m = 0; - k100m = 1; - k1000m = 2; - k25g = 3; - k5g = 4; - k10g = 5; - k40g = 6; - k100g = 7; - k200g = 8; - k400g = 9; - } - - readonly attribute nullable PHYRateType PHYRate = 0; + enum PHYRate : ENUM8 { + kRate10M = 0; + kRate100M = 1; + kRate1G = 2; + kRate25g = 3; + kRate5G = 4; + kRate10G = 5; + kRate40G = 6; + kRate100G = 7; + kRate200G = 8; + kRate400G = 9; + } + + readonly attribute nullable PHYRate 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 31e84b180cd424..4c391a42914818 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": "PHYRateType", + "type": "PHYRate", "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 c603c5e3ecfbde..c545a02d6cbdbe 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -11414,7 +11414,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 9d32dfdfc966e3..762efaab4592ef 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -4731,9 +4731,8 @@ 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 d593a182e73d6c..dc59a90dc3045e 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -9809,7 +9809,7 @@ class EthernetNetworkDiagnostics(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="PHYRate", Tag=0x00000000, Type=typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRateType]), + ClusterObjectFieldDescriptor(Label="PHYRate", Tag=0x00000000, Type=typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRate]), 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]), @@ -9825,7 +9825,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - PHYRate: 'typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRateType]' = None + PHYRate: 'typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRate]' = None fullDuplex: 'typing.Union[None, Nullable, bool]' = None packetRxCount: 'typing.Optional[uint]' = None packetTxCount: 'typing.Optional[uint]' = None @@ -9841,17 +9841,17 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class PHYRateType(IntEnum): - k10m = 0x00 - k100m = 0x01 - k1000m = 0x02 - k25g = 0x03 - k5g = 0x04 - k10g = 0x05 - k40g = 0x06 - k100g = 0x07 - k200g = 0x08 - k400g = 0x09 + class PHYRate(IntEnum): + kRate10M = 0x00 + kRate100M = 0x01 + kRate1G = 0x02 + kRate25g = 0x03 + kRate5G = 0x04 + kRate10G = 0x05 + kRate40G = 0x06 + kRate100G = 0x07 + kRate200G = 0x08 + kRate400G = 0x09 @@ -9884,9 +9884,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRateType]) + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRate]) - value: 'typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRateType]' = None + value: 'typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRate]' = None @dataclass class FullDuplex(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt index f7c229a0fbb14e..c1e7b6a9ad45ad 100644 --- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt @@ -84,21 +84,29 @@ subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptio {{#*inline "enumDef"}} typedef NS_ENUM({{asUnderlyingZclType name}}, {{objCEnumName clusterName enumName}}) { {{#zcl_enum_items}} + {{#unless (wasRemoved ../clusterName enum=../enumName enumValue=(asUpperCamelCase label preserveAcronyms=true))}} {{objCEnumName ../clusterName ../enumName}}{{asUpperCamelCase label preserveAcronyms=true}} {{availability ../clusterName enum=../enumName enumValue=(asUpperCamelCase label preserveAcronyms=true) deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../../name preserveAcronyms=true) ../label) (asUpperCamelCase label preserveAcronyms=true))}} = {{asHex value 2}}, + {{/unless}} {{#*inline "oldNameItemDecl"}} {{#if oldItemName}} + {{#unless (wasRemoved ../clusterName enum=../enumName enumValue=oldItemName)}} {{objCEnumName ../clusterName ../enumName}}{{objCEnumItemLabel oldItemName}} {{availability ../clusterName enum=../enumName enumValue=oldItemName deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../../name preserveAcronyms=true) ../label) (asUpperCamelCase label preserveAcronyms=true))}} = {{asHex value 2}}, + {{/unless}} {{/if}} {{/inline}} {{> oldNameItemDecl oldItemName=(oldName ../clusterName enum=../enumName enumValue=(asUpperCamelCase label preserveAcronyms=true))}} {{/zcl_enum_items}} } {{/inline}} +{{#unless (wasRemoved (asUpperCamelCase ../name preserveAcronyms=true) enum=(asUpperCamelCase label preserveAcronyms=true))}} {{> enumDef name=name clusterName=(asUpperCamelCase ../name preserveAcronyms=true) enumName=(asUpperCamelCase label preserveAcronyms=true)}} {{availability (asUpperCamelCase ../name preserveAcronyms=true) enum=(asUpperCamelCase label preserveAcronyms=true)}}; +{{/unless}} {{! Takes the name of the enum to use as enumName. }} {{#*inline "oldNameDecl"}} +{{#unless (wasRemoved (compatClusterNameRemapping ../name) enum=enumName)}} {{> enumDef name=name clusterName=(compatClusterNameRemapping ../name) enumName=enumName}} {{availability (compatClusterNameRemapping ../name) enum=enumName deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../name preserveAcronyms=true) label))}}; +{{/unless}} {{/inline}} {{! Takes the old name of the enum, if any, as oldEnumName. }} {{#*inline "oldNameCheck"}} @@ -118,21 +126,29 @@ typedef NS_ENUM({{asUnderlyingZclType name}}, {{objCEnumName clusterName enumNam {{#*inline "bitmapDef"}} typedef NS_OPTIONS({{asUnderlyingZclType name}}, {{objCEnumName clusterName bitmapName}}) { {{#zcl_bitmap_items}} + {{#unless (wasRemoved ../clusterName bitmap=../bitmapName bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}} {{objCEnumName ../clusterName ../bitmapName}}{{asUpperCamelCase label preserveAcronyms=true}} {{availability ../clusterName bitmap=../bitmapName bitmapValue=(asUpperCamelCase label preserveAcronyms=true) deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../../name preserveAcronyms=true) ../label) (asUpperCamelCase label preserveAcronyms=true))}} = {{asHex mask}}, + {{/unless}} {{#*inline "oldNameItemDecl"}} {{#if oldItemName}} + {{#unless (wasRemoved ../clusterName bitmap=../bitmapName bitmapValue=oldItemName)}} {{objCEnumName ../clusterName ../bitmapName}}{{objCEnumItemLabel oldItemName}} {{availability ../clusterName bitmap=../bitmapName bitmapValue=oldItemName deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../../name preserveAcronyms=true) ../label) (asUpperCamelCase label preserveAcronyms=true))}} = {{asHex mask}}, + {{/unless}} {{/if}} {{/inline}} {{> oldNameItemDecl oldItemName=(oldName ../clusterName bitmap=../bitmapName bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}} {{/zcl_bitmap_items}} } {{/inline}} +{{#unless (wasRemoved (asUpperCamelCase ../name preserveAcronyms=true) bitmap=(asUpperCamelCase label preserveAcronyms=true))}} {{> bitmapDef name=name clusterName=(asUpperCamelCase ../name preserveAcronyms=true) bitmapName=(asUpperCamelCase label preserveAcronyms=true)}} {{availability (asUpperCamelCase ../name preserveAcronyms=true) bitmap=(asUpperCamelCase label preserveAcronyms=true)}}; +{{/unless}} {{! Takes the name of the bitmap to use as bitmapName. }} {{#*inline "oldNameDecl"}} +{{#unless (wasRemoved (compatClusterNameRemapping ../name) bitmap=bitmapName)}} {{> bitmapDef name=name clusterName=(compatClusterNameRemapping ../name) bitmapName=bitmapName}} {{availability (compatClusterNameRemapping ../name) bitmap=bitmapName deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../name preserveAcronyms=true) label))}}; +{{/unless}} {{/inline}} {{! Takes the old name of the bitmap, if any, as oldBitmapName. }} {{#*inline "oldNameCheck"}} diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 73e5f9c75dd643..79c7d3aa093c36 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -5127,6 +5127,8 @@ - AccessControlEntryAuthModeEnum ThreadNetworkDiagnostics: - ConnectionStatusEnum + EthernetNetworkDiagnostics: + - PHYRate enum values: OTASoftwareUpdateProvider: OTAApplyUpdateAction: @@ -5199,6 +5201,18 @@ - N - Ac - Ax + EthernetNetworkDiagnostics: + PHYRate: + - Rate10M + - Rate100M + - Rate1G + - Rate25G + - Rate5G + - Rate10G + - Rate40G + - Rate100G + - Rate200G + - Rate400G bitmaps: UnitTesting: - Bitmap8MaskMap @@ -5315,6 +5329,8 @@ - AuthMode ThreadNetworkDiagnostics: - ThreadConnectionStatus + EthernetNetworkDiagnostics: + - PHYRateType enum values: GeneralCommissioning: CommissioningError: @@ -5344,6 +5360,33 @@ commands: BasicInformation: - MfgSpecificPing + enum values: + EthernetNetworkDiagnostics: + # Both the enum and the values got renamed, so don't output the + # new values with the old enum name or the old values with the + # new enum name. + PHYRateType: + - Rate10M + - Rate100M + - Rate1G + - Rate25G + - Rate5G + - Rate10G + - Rate40G + - Rate100G + - Rate200G + - Rate400G + PHYRate: + - 10M + - 100M + - 1000M + - 25G + - 5G + - 10G + - 40G + - 100G + - 200G + - 400G renames: clusters: UnitTesting: TestCluster @@ -5422,6 +5465,8 @@ AccessControlEntryAuthModeEnum: AuthMode ThreadNetworkDiagnostics: ConnectionStatusEnum: ThreadConnectionStatus + EthernetNetworkDiagnostics: + PHYRate: PHYRateType enum values: GeneralCommissioning: CommissioningError: @@ -5437,6 +5482,29 @@ N: 80211n Ac: 80211ac Ax: 80211ax + EthernetNetworkDiagnostics: + PHYRate: + Rate10M: 10M + Rate100M: 100M + Rate1G: 1000M + Rate25G: 25G + Rate5G: 5G + Rate10G: 10G + Rate40G: 40G + Rate100G: 100G + Rate200G: 200G + Rate400G: 400G + PHYRateType: + Rate10M: 10M + Rate100M: 100M + Rate1G: 1000M + Rate25G: 25G + Rate5G: 5G + Rate10G: 10G + Rate40G: 40G + Rate100G: 100G + Rate200G: 200G + Rate400G: 400G bitmap values: NetworkCommissioning: WiFiSecurity: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 2a795a455f1ada..167993763813cc 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -17708,18 +17708,52 @@ typedef NS_ENUM(uint8_t, MTRWiFiNetworkDiagnosticsWiFiVersionType) { = 0x05, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_ENUM(uint8_t, MTREthernetNetworkDiagnosticsPHYRate) { + MTREthernetNetworkDiagnosticsPHYRateRate10M MTR_NEWLY_AVAILABLE = 0x00, + MTREthernetNetworkDiagnosticsPHYRateRate100M MTR_NEWLY_AVAILABLE = 0x01, + MTREthernetNetworkDiagnosticsPHYRateRate1G MTR_NEWLY_AVAILABLE = 0x02, + MTREthernetNetworkDiagnosticsPHYRateRate25G MTR_NEWLY_AVAILABLE = 0x03, + MTREthernetNetworkDiagnosticsPHYRateRate5G MTR_NEWLY_AVAILABLE = 0x04, + MTREthernetNetworkDiagnosticsPHYRateRate10G MTR_NEWLY_AVAILABLE = 0x05, + MTREthernetNetworkDiagnosticsPHYRateRate40G MTR_NEWLY_AVAILABLE = 0x06, + MTREthernetNetworkDiagnosticsPHYRateRate100G MTR_NEWLY_AVAILABLE = 0x07, + MTREthernetNetworkDiagnosticsPHYRateRate200G MTR_NEWLY_AVAILABLE = 0x08, + MTREthernetNetworkDiagnosticsPHYRateRate400G MTR_NEWLY_AVAILABLE = 0x09, +} MTR_NEWLY_AVAILABLE; + typedef NS_ENUM(uint8_t, MTREthernetNetworkDiagnosticsPHYRateType) { - MTREthernetNetworkDiagnosticsPHYRateType10M API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTREthernetNetworkDiagnosticsPHYRateType100M API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTREthernetNetworkDiagnosticsPHYRateType1000M API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTREthernetNetworkDiagnosticsPHYRateType25G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTREthernetNetworkDiagnosticsPHYRateType5G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, - MTREthernetNetworkDiagnosticsPHYRateType10G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, - MTREthernetNetworkDiagnosticsPHYRateType40G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06, - MTREthernetNetworkDiagnosticsPHYRateType100G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07, - MTREthernetNetworkDiagnosticsPHYRateType200G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08, - MTREthernetNetworkDiagnosticsPHYRateType400G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x09, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTREthernetNetworkDiagnosticsPHYRateType10M API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTREthernetNetworkDiagnosticsPHYRateRate10M") + = 0x00, + MTREthernetNetworkDiagnosticsPHYRateType100M API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTREthernetNetworkDiagnosticsPHYRateRate100M") + = 0x01, + MTREthernetNetworkDiagnosticsPHYRateType1000M API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTREthernetNetworkDiagnosticsPHYRateRate1G") + = 0x02, + MTREthernetNetworkDiagnosticsPHYRateType25G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTREthernetNetworkDiagnosticsPHYRateRate25G") + = 0x03, + MTREthernetNetworkDiagnosticsPHYRateType5G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTREthernetNetworkDiagnosticsPHYRateRate5G") + = 0x04, + MTREthernetNetworkDiagnosticsPHYRateType10G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTREthernetNetworkDiagnosticsPHYRateRate10G") + = 0x05, + MTREthernetNetworkDiagnosticsPHYRateType40G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTREthernetNetworkDiagnosticsPHYRateRate40G") + = 0x06, + MTREthernetNetworkDiagnosticsPHYRateType100G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTREthernetNetworkDiagnosticsPHYRateRate100G") + = 0x07, + MTREthernetNetworkDiagnosticsPHYRateType200G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTREthernetNetworkDiagnosticsPHYRateRate200G") + = 0x08, + MTREthernetNetworkDiagnosticsPHYRateType400G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTREthernetNetworkDiagnosticsPHYRateRate400G") + = 0x09, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTREthernetNetworkDiagnosticsPHYRate"); typedef NS_ENUM(uint8_t, MTRTimeSynchronizationGranularity) { MTRTimeSynchronizationGranularityNoTimeGranularity API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 6b95fba6b82199..8fef3b8f231927 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 MTRNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(NullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(NullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallback 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 d7225704cd7da2..5eae8460dda56d 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -323,10 +323,10 @@ typedef void (*WiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallback)( void *, chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionType); typedef void (*NullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*EthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallback)( - void *, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateType); -typedef void (*NullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallback)( - 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 (*TimeSynchronizationClusterGranularityEnumAttributeCallback)( void *, chip::app::Clusters::TimeSynchronization::GranularityEnum); typedef void (*NullableTimeSynchronizationClusterGranularityEnumAttributeCallback)( @@ -15211,71 +15211,68 @@ class MTRNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackSu MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTREthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTREthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTREthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateType value); + static void OnSuccessFn(void * context, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate value); }; -class MTREthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackSubscriptionBridge - : public MTREthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge +class MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge + : public MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge { public: - MTREthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackSubscriptionBridge( + MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTREthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge(queue, handler, action), + MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTREthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTREthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge::OnDone; + using MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::KeepAliveOnCallback; + using MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(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 MTRNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackSubscriptionBridge - : public MTRNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge +class MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge + : public MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge { public: - MTRNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackSubscriptionBridge( + MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge(queue, handler, action), + MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge::OnDone; + using MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::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 0b5d84469441f1..16a4095d80729a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -15659,15 +15659,15 @@ } } -void MTREthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateType value) +void MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTREthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -15682,8 +15682,8 @@ } } -void MTRNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -15694,7 +15694,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/include/platform/DiagnosticDataProvider.h b/src/include/platform/DiagnosticDataProvider.h index a1f78a4c84d2e6..f3d576a4fe0e96 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::PHYRateType & pHYRate); + virtual CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & 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::PHYRateType & pHYRate) +inline CHIP_ERROR DiagnosticDataProvider::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) { return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE; } diff --git a/src/platform/Linux/ConnectivityUtils.cpp b/src/platform/Linux/ConnectivityUtils.cpp index 14cfdd47a75f78..eda1daaff1cd27 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::PHYRateType & pHYRate) +CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & 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 = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_10_M; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_M; break; case 100: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_100_M; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_M; break; case 1000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_1000_M; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE1_G; break; case 25000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_2__5_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE2_5_G; break; case 5000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_5_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE5_G; break; case 10000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_10_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_G; break; case 40000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_40_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE40_G; break; case 100000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_100_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_G; break; case 200000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_200_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE200_G; break; case 400000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_400_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_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 035774e15c4c6f..bd47460371a206 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::PHYRateType & pHYRate); + static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & 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 d70b074456677c..b762bb20e10069 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::PHYRateType & pHYRate) +CHIP_ERROR DiagnosticDataProviderImpl::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) { if (ConnectivityMgrImpl().GetEthernetIfName() == nullptr) { diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.h b/src/platform/Linux/DiagnosticDataProviderImpl.h index 19ea033ef5e3f7..bcbcc1748bc44d 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::PHYRateType & pHYRate) override; + CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & 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 24925bb2b63b08..bdfb67533a42f1 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::PHYRateType & pHYRate); + // static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & 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 542ec94c2af06d..9104d20c0bcf4e 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::PHYRateType & pHYRate) +CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & 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 = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_10_M; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_M; break; case 100: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_100_M; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_M; break; case 1000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_1000_M; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE1_G; break; case 25000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_2__5_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE2_5_G; break; case 5000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_5_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE5_G; break; case 10000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_10_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_G; break; case 40000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_40_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE40_G; break; case 100000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_100_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_G; break; case 200000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_200_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE200_G; break; case 400000: - pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_400_G; + pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_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 6b4376c618e7ae..0df7926cacf803 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::PHYRateType & pHYRate); + static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & 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 c6047ec7c6bc1a..a65940695619a6 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::PHYRateType & pHYRate) +CHIP_ERROR DiagnosticDataProviderImpl::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) { if (ConnectivityMgrImpl().GetEthernetIfName() == nullptr) { diff --git a/src/platform/webos/DiagnosticDataProviderImpl.h b/src/platform/webos/DiagnosticDataProviderImpl.h index 184c6d6c779b6b..7baa700910604c 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::PHYRateType & pHYRate) override; + CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & 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 9a8aadb734672e..982e7a5dcd9c0d 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,10 +8723,9 @@ 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 = @@ -8742,9 +8741,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, } return status; } -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateType value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -8757,7 +8756,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); @@ -8765,7 +8764,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 f31666a593f3fe..e2e6bd7782f824 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); // PHYRateType -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateType value); + DataModel::Nullable & value); // PHYRate +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate 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 7349e4face5ac2..8867b72d629c80 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,35 +937,35 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(WiFiNetworkDiagnostics: } } -static auto __attribute__((unused)) EnsureKnownEnumValue(EthernetNetworkDiagnostics::PHYRateType val) +static auto __attribute__((unused)) EnsureKnownEnumValue(EthernetNetworkDiagnostics::PHYRate val) { - using EnumType = EthernetNetworkDiagnostics::PHYRateType; + using EnumType = EthernetNetworkDiagnostics::PHYRate; switch (val) { // 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 - case EnumType::k10m: - case EnumType::k100m: - case EnumType::k1000m: - case EnumType::k25g: - case EnumType::k5g: - case EnumType::k10g: - case EnumType::k40g: - case EnumType::k100g: - case EnumType::k200g: - case EnumType::k400g: + case EnumType::kRate10M: + case EnumType::kRate100M: + case EnumType::kRate1G: + case EnumType::kRate25g: + case EnumType::kRate5G: + case EnumType::kRate10G: + case EnumType::kRate40G: + case EnumType::kRate100G: + case EnumType::kRate200G: + case EnumType::kRate400G: #else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM - case EMBER_ZCL_PHY_RATE_TYPE_10_M: - case EMBER_ZCL_PHY_RATE_TYPE_100_M: - case EMBER_ZCL_PHY_RATE_TYPE_1000_M: - case EMBER_ZCL_PHY_RATE_TYPE_2__5_G: - case EMBER_ZCL_PHY_RATE_TYPE_5_G: - case EMBER_ZCL_PHY_RATE_TYPE_10_G: - case EMBER_ZCL_PHY_RATE_TYPE_40_G: - case EMBER_ZCL_PHY_RATE_TYPE_100_G: - case EMBER_ZCL_PHY_RATE_TYPE_200_G: - case EMBER_ZCL_PHY_RATE_TYPE_400_G: + 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: #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 e74add6e0f5dd4..8d52ff5644a3c8 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 @@ -878,24 +878,24 @@ 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 PHYRateType -enum class PHYRateType : uint8_t -{ - k10m = 0x00, - k100m = 0x01, - k1000m = 0x02, - k25g = 0x03, - k5g = 0x04, - k10g = 0x05, - k40g = 0x06, - k100g = 0x07, - k200g = 0x08, - k400g = 0x09, +// Enum for PHYRate +enum class PHYRate : uint8_t +{ + kRate10M = 0x00, + kRate100M = 0x01, + kRate1G = 0x02, + kRate25g = 0x03, + kRate5G = 0x04, + kRate10G = 0x05, + kRate40G = 0x06, + kRate100G = 0x07, + kRate200G = 0x08, + kRate400G = 0x09, kUnknownEnumValue = 10, }; #else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using PHYRateType = EmberAfPHYRateType; -static PHYRateType __attribute__((unused)) kPHYRateTypekUnknownEnumValue = static_cast(10); +using PHYRate = EmberAfPHYRate; +static PHYRate __attribute__((unused)) kPHYRatekUnknownEnumValue = 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 6193c02cc999a3..aad029b966fa5e 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 @@ -9857,9 +9857,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 1cf6abadc709bd..8e9c12f5c2470f 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 PHYRateType -enum EmberAfPHYRateType : uint8_t -{ - EMBER_ZCL_PHY_RATE_TYPE_10_M = 0, - EMBER_ZCL_PHY_RATE_TYPE_100_M = 1, - EMBER_ZCL_PHY_RATE_TYPE_1000_M = 2, - EMBER_ZCL_PHY_RATE_TYPE_2__5_G = 3, - EMBER_ZCL_PHY_RATE_TYPE_5_G = 4, - EMBER_ZCL_PHY_RATE_TYPE_10_G = 5, - EMBER_ZCL_PHY_RATE_TYPE_40_G = 6, - EMBER_ZCL_PHY_RATE_TYPE_100_G = 7, - EMBER_ZCL_PHY_RATE_TYPE_200_G = 8, - EMBER_ZCL_PHY_RATE_TYPE_400_G = 9, +// 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 RadioFaultType 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 bca49c76875991..ae348017a890a6 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -6180,7 +6180,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 326ffd667d5218..ba21aaad6fbec5 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -19409,7 +19409,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)); @@ -19716,7 +19716,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)); @@ -19726,7 +19726,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)); @@ -19736,7 +19736,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)); @@ -19746,7 +19746,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)); @@ -19756,7 +19756,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)); @@ -19766,7 +19766,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)); @@ -19776,7 +19776,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)); @@ -19786,7 +19786,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)); @@ -19796,7 +19796,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)); @@ -19806,7 +19806,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));