Skip to content

Commit 2183250

Browse files
bzbarsky-applepull[bot]
bzbarsky-apple
authored and
pull[bot]
committed
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.
1 parent e0ea40f commit 2183250

File tree

84 files changed

+585
-472
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+585
-472
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+14-14
Original file line numberDiff line numberDiff line change
@@ -1466,20 +1466,20 @@ server cluster WiFiNetworkDiagnostics = 54 {
14661466
}
14671467

14681468
server cluster EthernetNetworkDiagnostics = 55 {
1469-
enum PHYRateType : ENUM8 {
1470-
k10m = 0;
1471-
k100m = 1;
1472-
k1000m = 2;
1473-
k25g = 3;
1474-
k5g = 4;
1475-
k10g = 5;
1476-
k40g = 6;
1477-
k100g = 7;
1478-
k200g = 8;
1479-
k400g = 9;
1480-
}
1481-
1482-
readonly attribute nullable PHYRateType PHYRate = 0;
1469+
enum PHYRate : ENUM8 {
1470+
kRate10M = 0;
1471+
kRate100M = 1;
1472+
kRate1G = 2;
1473+
kRate25g = 3;
1474+
kRate5G = 4;
1475+
kRate10G = 5;
1476+
kRate40G = 6;
1477+
kRate100G = 7;
1478+
kRate200G = 8;
1479+
kRate400G = 9;
1480+
}
1481+
1482+
readonly attribute nullable PHYRate PHYRate = 0;
14831483
readonly attribute nullable boolean fullDuplex = 1;
14841484
readonly attribute int64u packetRxCount = 2;
14851485
readonly attribute int64u packetTxCount = 3;

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -5121,7 +5121,7 @@
51215121
"code": 0,
51225122
"mfgCode": null,
51235123
"side": "server",
5124-
"type": "PHYRateType",
5124+
"type": "PHYRate",
51255125
"included": 1,
51265126
"storageOption": "External",
51275127
"singleton": 0,

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+14-14
Original file line numberDiff line numberDiff line change
@@ -1317,20 +1317,20 @@ server cluster WiFiNetworkDiagnostics = 54 {
13171317
}
13181318

13191319
server cluster EthernetNetworkDiagnostics = 55 {
1320-
enum PHYRateType : ENUM8 {
1321-
k10m = 0;
1322-
k100m = 1;
1323-
k1000m = 2;
1324-
k25g = 3;
1325-
k5g = 4;
1326-
k10g = 5;
1327-
k40g = 6;
1328-
k100g = 7;
1329-
k200g = 8;
1330-
k400g = 9;
1331-
}
1332-
1333-
readonly attribute nullable PHYRateType PHYRate = 0;
1320+
enum PHYRate : ENUM8 {
1321+
kRate10M = 0;
1322+
kRate100M = 1;
1323+
kRate1G = 2;
1324+
kRate25g = 3;
1325+
kRate5G = 4;
1326+
kRate10G = 5;
1327+
kRate40G = 6;
1328+
kRate100G = 7;
1329+
kRate200G = 8;
1330+
kRate400G = 9;
1331+
}
1332+
1333+
readonly attribute nullable PHYRate PHYRate = 0;
13341334
readonly attribute nullable boolean fullDuplex = 1;
13351335
readonly attribute int64u packetRxCount = 2;
13361336
readonly attribute int64u packetTxCount = 3;

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -5121,7 +5121,7 @@
51215121
"code": 0,
51225122
"mfgCode": null,
51235123
"side": "server",
5124-
"type": "PHYRateType",
5124+
"type": "PHYRate",
51255125
"included": 1,
51265126
"storageOption": "External",
51275127
"singleton": 0,

‎examples/bridge-app/bridge-common/bridge-app.matter

+14-14
Original file line numberDiff line numberDiff line change
@@ -1138,20 +1138,20 @@ server cluster WiFiNetworkDiagnostics = 54 {
11381138
}
11391139

11401140
server cluster EthernetNetworkDiagnostics = 55 {
1141-
enum PHYRateType : ENUM8 {
1142-
k10m = 0;
1143-
k100m = 1;
1144-
k1000m = 2;
1145-
k25g = 3;
1146-
k5g = 4;
1147-
k10g = 5;
1148-
k40g = 6;
1149-
k100g = 7;
1150-
k200g = 8;
1151-
k400g = 9;
1152-
}
1153-
1154-
readonly attribute nullable PHYRateType PHYRate = 0;
1141+
enum PHYRate : ENUM8 {
1142+
kRate10M = 0;
1143+
kRate100M = 1;
1144+
kRate1G = 2;
1145+
kRate25g = 3;
1146+
kRate5G = 4;
1147+
kRate10G = 5;
1148+
kRate40G = 6;
1149+
kRate100G = 7;
1150+
kRate200G = 8;
1151+
kRate400G = 9;
1152+
}
1153+
1154+
readonly attribute nullable PHYRate PHYRate = 0;
11551155
readonly attribute nullable boolean fullDuplex = 1;
11561156
readonly attribute int64u packetRxCount = 2;
11571157
readonly attribute int64u packetTxCount = 3;

‎examples/bridge-app/bridge-common/bridge-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3855,7 +3855,7 @@
38553855
"code": 0,
38563856
"mfgCode": null,
38573857
"side": "server",
3858-
"type": "PHYRateType",
3858+
"type": "PHYRate",
38593859
"included": 1,
38603860
"storageOption": "External",
38613861
"singleton": 0,

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

+14-14
Original file line numberDiff line numberDiff line change
@@ -996,20 +996,20 @@ server cluster WiFiNetworkDiagnostics = 54 {
996996
}
997997

998998
server cluster EthernetNetworkDiagnostics = 55 {
999-
enum PHYRateType : ENUM8 {
1000-
k10m = 0;
1001-
k100m = 1;
1002-
k1000m = 2;
1003-
k25g = 3;
1004-
k5g = 4;
1005-
k10g = 5;
1006-
k40g = 6;
1007-
k100g = 7;
1008-
k200g = 8;
1009-
k400g = 9;
1010-
}
1011-
1012-
readonly attribute nullable PHYRateType PHYRate = 0;
999+
enum PHYRate : ENUM8 {
1000+
kRate10M = 0;
1001+
kRate100M = 1;
1002+
kRate1G = 2;
1003+
kRate25g = 3;
1004+
kRate5G = 4;
1005+
kRate10G = 5;
1006+
kRate40G = 6;
1007+
kRate100G = 7;
1008+
kRate200G = 8;
1009+
kRate400G = 9;
1010+
}
1011+
1012+
readonly attribute nullable PHYRate PHYRate = 0;
10131013
readonly attribute nullable boolean fullDuplex = 1;
10141014
readonly attribute int64u packetRxCount = 2;
10151015
readonly attribute int64u packetTxCount = 3;

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4361,7 +4361,7 @@
43614361
"code": 0,
43624362
"mfgCode": null,
43634363
"side": "server",
4364-
"type": "PHYRateType",
4364+
"type": "PHYRate",
43654365
"included": 1,
43664366
"storageOption": "External",
43674367
"singleton": 0,

‎examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_fan_7N2TobIlOX.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4409,7 +4409,7 @@
44094409
"code": 0,
44104410
"mfgCode": null,
44114411
"side": "server",
4412-
"type": "PHYRateType",
4412+
"type": "PHYRate",
44134413
"included": 1,
44144414
"storageOption": "External",
44154415
"singleton": 0,

‎examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4313,7 +4313,7 @@
43134313
"code": 0,
43144314
"mfgCode": null,
43154315
"side": "server",
4316-
"type": "PHYRateType",
4316+
"type": "PHYRate",
43174317
"included": 1,
43184318
"storageOption": "External",
43194319
"singleton": 0,

‎examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4265,7 +4265,7 @@
42654265
"code": 0,
42664266
"mfgCode": null,
42674267
"side": "server",
4268-
"type": "PHYRateType",
4268+
"type": "PHYRate",
42694269
"included": 1,
42704270
"storageOption": "External",
42714271
"singleton": 0,

‎examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter

+14-14
Original file line numberDiff line numberDiff line change
@@ -984,20 +984,20 @@ server cluster WiFiNetworkDiagnostics = 54 {
984984
}
985985

986986
server cluster EthernetNetworkDiagnostics = 55 {
987-
enum PHYRateType : ENUM8 {
988-
k10m = 0;
989-
k100m = 1;
990-
k1000m = 2;
991-
k25g = 3;
992-
k5g = 4;
993-
k10g = 5;
994-
k40g = 6;
995-
k100g = 7;
996-
k200g = 8;
997-
k400g = 9;
998-
}
999-
1000-
readonly attribute nullable PHYRateType PHYRate = 0;
987+
enum PHYRate : ENUM8 {
988+
kRate10M = 0;
989+
kRate100M = 1;
990+
kRate1G = 2;
991+
kRate25g = 3;
992+
kRate5G = 4;
993+
kRate10G = 5;
994+
kRate40G = 6;
995+
kRate100G = 7;
996+
kRate200G = 8;
997+
kRate400G = 9;
998+
}
999+
1000+
readonly attribute nullable PHYRate PHYRate = 0;
10011001
readonly attribute nullable boolean fullDuplex = 1;
10021002
readonly attribute int64u packetRxCount = 2;
10031003
readonly attribute int64u packetTxCount = 3;

‎examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4361,7 +4361,7 @@
43614361
"code": 0,
43624362
"mfgCode": null,
43634363
"side": "server",
4364-
"type": "PHYRateType",
4364+
"type": "PHYRate",
43654365
"included": 1,
43664366
"storageOption": "External",
43674367
"singleton": 0,

0 commit comments

Comments
 (0)