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. (project-chip#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 @cletnick
bzbarsky-apple authored and cletnick committed Jan 10, 2023
1 parent 4958669 commit 756b697
Show file tree
Hide file tree
Showing 84 changed files with 585 additions and 472 deletions.
28 changes: 14 additions & 14 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
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
2 changes: 1 addition & 1 deletion examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
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/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
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
2 changes: 1 addition & 1 deletion examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
View file
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
View file
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
View file
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
View file
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
2 changes: 1 addition & 1 deletion examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
View file
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_colortemperaturelight_hbUnzYVeyn.zap
View file
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
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
View file
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_dimmablelight_bCwGYSDpoe.zap
View file
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
View file
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_extendedcolorlight_8lcaaYJVAa.zap
View file
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
View file
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
View file
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_heatingcoolingunit_ncdGai1E5a.zap
View file
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_humiditysensor_Xyj4gda6Hb.zap
View file
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
View file
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_occupancysensor_iHyVgifZuo.zap
View file
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
View file
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_onofflightswitch_FsPlMr090Q.zap
View file
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_onoffpluginunit_Wtf8ss5EBY.zap
View file
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_pressuresensor_s0qC9wLH4k.zap
View file
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
View file
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_temperaturesensor_Qy1zkNW7c3.zap
View file
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
View file
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
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
View file
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
28 changes: 14 additions & 14 deletions examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
View file
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
2 changes: 1 addition & 1 deletion examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
View file
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 756b697

Please sign in to comment.