Skip to content

Commit

Permalink
Align naming in Ethernet Network Diagnostics cluster XML with the spe…
Browse files Browse the repository at this point in the history
…c. (#24474)

* Align naming in Ethernet Network Diagnostics cluster XML with the spec.

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

Fixes #24464

* Auto-update ZAP files from XML.

* Regenerate generated code.

Co-authored-by: Andrei Litvin <[email protected]>
  • Loading branch information
2 people authored and pull[bot] committed Jul 19, 2023
1 parent 14520c1 commit 3642680
Show file tree
Hide file tree
Showing 82 changed files with 220 additions and 215 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1466,7 +1466,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
}

server cluster EthernetNetworkDiagnostics = 55 {
enum PHYRate : ENUM8 {
enum PHYRateEnum : ENUM8 {
kRate10M = 0;
kRate100M = 1;
kRate1G = 2;
Expand All @@ -1479,7 +1479,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
kRate400G = 9;
}

readonly attribute nullable PHYRate PHYRate = 0;
readonly attribute nullable PHYRateEnum PHYRate = 0;
readonly attribute nullable boolean fullDuplex = 1;
readonly attribute int64u packetRxCount = 2;
readonly attribute int64u packetTxCount = 3;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5121,7 +5121,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
}

server cluster EthernetNetworkDiagnostics = 55 {
enum PHYRate : ENUM8 {
enum PHYRateEnum : ENUM8 {
kRate10M = 0;
kRate100M = 1;
kRate1G = 2;
Expand All @@ -1330,7 +1330,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
kRate400G = 9;
}

readonly attribute nullable PHYRate PHYRate = 0;
readonly attribute nullable PHYRateEnum PHYRate = 0;
readonly attribute nullable boolean fullDuplex = 1;
readonly attribute int64u packetRxCount = 2;
readonly attribute int64u packetTxCount = 3;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5121,7 +5121,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
}

server cluster EthernetNetworkDiagnostics = 55 {
enum PHYRate : ENUM8 {
enum PHYRateEnum : ENUM8 {
kRate10M = 0;
kRate100M = 1;
kRate1G = 2;
Expand All @@ -1151,7 +1151,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
kRate400G = 9;
}

readonly attribute nullable PHYRate PHYRate = 0;
readonly attribute nullable PHYRateEnum PHYRate = 0;
readonly attribute nullable boolean fullDuplex = 1;
readonly attribute int64u packetRxCount = 2;
readonly attribute int64u packetTxCount = 3;
Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3855,7 +3855,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
}

server cluster EthernetNetworkDiagnostics = 55 {
enum PHYRate : ENUM8 {
enum PHYRateEnum : ENUM8 {
kRate10M = 0;
kRate100M = 1;
kRate1G = 2;
Expand All @@ -1009,7 +1009,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
kRate400G = 9;
}

readonly attribute nullable PHYRate PHYRate = 0;
readonly attribute nullable PHYRateEnum PHYRate = 0;
readonly attribute nullable boolean fullDuplex = 1;
readonly attribute int64u packetRxCount = 2;
readonly attribute int64u packetTxCount = 3;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4361,7 +4361,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4409,7 +4409,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4313,7 +4313,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4265,7 +4265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
}

server cluster EthernetNetworkDiagnostics = 55 {
enum PHYRate : ENUM8 {
enum PHYRateEnum : ENUM8 {
kRate10M = 0;
kRate100M = 1;
kRate1G = 2;
Expand All @@ -997,7 +997,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
kRate400G = 9;
}

readonly attribute nullable PHYRate PHYRate = 0;
readonly attribute nullable PHYRateEnum PHYRate = 0;
readonly attribute nullable boolean fullDuplex = 1;
readonly attribute int64u packetRxCount = 2;
readonly attribute int64u packetTxCount = 3;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4361,7 +4361,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/dynamic-bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
}

server cluster EthernetNetworkDiagnostics = 55 {
enum PHYRate : ENUM8 {
enum PHYRateEnum : ENUM8 {
kRate10M = 0;
kRate100M = 1;
kRate1G = 2;
Expand All @@ -1151,7 +1151,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
kRate400G = 9;
}

readonly attribute nullable PHYRate PHYRate = 0;
readonly attribute nullable PHYRateEnum PHYRate = 0;
readonly attribute nullable boolean fullDuplex = 1;
readonly attribute int64u packetRxCount = 2;
readonly attribute int64u packetTxCount = 3;
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamic-bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3855,7 +3855,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
}

server cluster EthernetNetworkDiagnostics = 55 {
enum PHYRate : ENUM8 {
enum PHYRateEnum : ENUM8 {
kRate10M = 0;
kRate100M = 1;
kRate1G = 2;
Expand All @@ -1199,7 +1199,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
kRate400G = 9;
}

readonly attribute nullable PHYRate PHYRate = 0;
readonly attribute nullable PHYRateEnum PHYRate = 0;
readonly attribute nullable boolean fullDuplex = 1;
readonly attribute int64u packetRxCount = 2;
readonly attribute int64u packetTxCount = 3;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4343,7 +4343,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/lighting-common/lighting-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
}

server cluster EthernetNetworkDiagnostics = 55 {
enum PHYRate : ENUM8 {
enum PHYRateEnum : ENUM8 {
kRate10M = 0;
kRate100M = 1;
kRate1G = 2;
Expand All @@ -1155,7 +1155,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
kRate400G = 9;
}

readonly attribute nullable PHYRate PHYRate = 0;
readonly attribute nullable PHYRateEnum PHYRate = 0;
readonly attribute nullable boolean fullDuplex = 1;
readonly attribute int64u packetRxCount = 2;
readonly attribute int64u packetTxCount = 3;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/lighting-common/lighting-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4361,7 +4361,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/nxp/zap/lighting-on-off.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4556,7 +4556,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "PHYRate",
"type": "PHYRateEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Loading

0 comments on commit 3642680

Please sign in to comment.