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. (#24296)

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

* Auto-update ZAP files with new attribute type.

* Regenerate generated files.
  • Loading branch information
bzbarsky-apple authored Jan 6, 2023
1 parent faf8511 commit 13039ae
Show file tree
Hide file tree
Showing 84 changed files with 585 additions and 472 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
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": "PHYRateType",
"type": "PHYRate",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
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": "PHYRateType",
"type": "PHYRate",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
28 changes: 14 additions & 14 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -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;
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": "PHYRateType",
"type": "PHYRate",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
28 changes: 14 additions & 14 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
Original file line number Diff line number Diff line change
Expand Up @@ -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;
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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"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": "PHYRateType",
"type": "PHYRate",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
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": "PHYRateType",
"type": "PHYRate",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
Loading

0 comments on commit 13039ae

Please sign in to comment.