Skip to content

Commit 23e0f3b

Browse files
DejinChenDejinChen
authored
Modified wifi network diagnostics cluster name, WiFi to Wi-Fi to match the SPEC (#33746)
1 parent 47097e0 commit 23e0f3b

File tree

48 files changed

+58
-58
lines changed

Some content is hidden

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

48 files changed

+58
-58
lines changed

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2742,7 +2742,7 @@
27422742
]
27432743
},
27442744
{
2745-
"name": "WiFi Network Diagnostics",
2745+
"name": "Wi-Fi Network Diagnostics",
27462746
"code": 54,
27472747
"mfgCode": null,
27482748
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4340,7 +4340,7 @@
43404340
]
43414341
},
43424342
{
4343-
"name": "WiFi Network Diagnostics",
4343+
"name": "Wi-Fi Network Diagnostics",
43444344
"code": 54,
43454345
"mfgCode": null,
43464346
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3002,7 +3002,7 @@
30023002
]
30033003
},
30043004
{
3005-
"name": "WiFi Network Diagnostics",
3005+
"name": "Wi-Fi Network Diagnostics",
30063006
"code": 54,
30073007
"mfgCode": null,
30083008
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3249,7 +3249,7 @@
32493249
]
32503250
},
32513251
{
3252-
"name": "WiFi Network Diagnostics",
3252+
"name": "Wi-Fi Network Diagnostics",
32533253
"code": 54,
32543254
"mfgCode": null,
32553255
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2714,7 +2714,7 @@
27142714
]
27152715
},
27162716
{
2717-
"name": "WiFi Network Diagnostics",
2717+
"name": "Wi-Fi Network Diagnostics",
27182718
"code": 54,
27192719
"mfgCode": null,
27202720
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/chef/devices/rootnode_dishwasher_cc105034fe.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2094,7 +2094,7 @@
20942094
]
20952095
},
20962096
{
2097-
"name": "WiFi Network Diagnostics",
2097+
"name": "Wi-Fi Network Diagnostics",
20982098
"code": 54,
20992099
"mfgCode": null,
21002100
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2094,7 +2094,7 @@
20942094
]
20952095
},
20962096
{
2097-
"name": "WiFi Network Diagnostics",
2097+
"name": "Wi-Fi Network Diagnostics",
20982098
"code": 54,
20992099
"mfgCode": null,
21002100
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2094,7 +2094,7 @@
20942094
]
20952095
},
20962096
{
2097-
"name": "WiFi Network Diagnostics",
2097+
"name": "Wi-Fi Network Diagnostics",
20982098
"code": 54,
20992099
"mfgCode": null,
21002100
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/chef/sample_app_util/test_files/sample_zap_file.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3024,7 +3024,7 @@
30243024
]
30253025
},
30263026
{
3027-
"name": "WiFi Network Diagnostics",
3027+
"name": "Wi-Fi Network Diagnostics",
30283028
"code": 54,
30293029
"mfgCode": null,
30303030
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3098,7 +3098,7 @@
30983098
]
30993099
},
31003100
{
3101-
"name": "WiFi Network Diagnostics",
3101+
"name": "Wi-Fi Network Diagnostics",
31023102
"code": 54,
31033103
"mfgCode": null,
31043104
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2234,7 +2234,7 @@
22342234
]
22352235
},
22362236
{
2237-
"name": "WiFi Network Diagnostics",
2237+
"name": "Wi-Fi Network Diagnostics",
22382238
"code": 54,
22392239
"mfgCode": null,
22402240
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2884,7 +2884,7 @@
28842884
]
28852885
},
28862886
{
2887-
"name": "WiFi Network Diagnostics",
2887+
"name": "Wi-Fi Network Diagnostics",
28882888
"code": 54,
28892889
"mfgCode": null,
28902890
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/laundry-washer-app/nxp/zap/laundry-washer-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2240,7 +2240,7 @@
22402240
]
22412241
},
22422242
{
2243-
"name": "WiFi Network Diagnostics",
2243+
"name": "Wi-Fi Network Diagnostics",
22442244
"code": 54,
22452245
"mfgCode": null,
22462246
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/light-switch-app/light-switch-common/light-switch-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3024,7 +3024,7 @@
30243024
]
30253025
},
30263026
{
3027-
"name": "WiFi Network Diagnostics",
3027+
"name": "Wi-Fi Network Diagnostics",
30283028
"code": 54,
30293029
"mfgCode": null,
30303030
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1903,7 +1903,7 @@
19031903
]
19041904
},
19051905
{
1906-
"name": "WiFi Network Diagnostics",
1906+
"name": "Wi-Fi Network Diagnostics",
19071907
"code": 54,
19081908
"mfgCode": null,
19091909
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2979,7 +2979,7 @@
29792979
]
29802980
},
29812981
{
2982-
"name": "WiFi Network Diagnostics",
2982+
"name": "Wi-Fi Network Diagnostics",
29832983
"code": 54,
29842984
"mfgCode": null,
29852985
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/lighting-app/silabs/data_model/lighting-wifi-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1877,7 +1877,7 @@
18771877
]
18781878
},
18791879
{
1880-
"name": "WiFi Network Diagnostics",
1880+
"name": "Wi-Fi Network Diagnostics",
18811881
"code": 54,
18821882
"mfgCode": null,
18831883
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2217,7 +2217,7 @@
22172217
]
22182218
},
22192219
{
2220-
"name": "WiFi Network Diagnostics",
2220+
"name": "Wi-Fi Network Diagnostics",
22212221
"code": 54,
22222222
"mfgCode": null,
22232223
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3654,7 +3654,7 @@
36543654
]
36553655
},
36563656
{
3657-
"name": "WiFi Network Diagnostics",
3657+
"name": "Wi-Fi Network Diagnostics",
36583658
"code": 54,
36593659
"mfgCode": null,
36603660
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1790,7 +1790,7 @@
17901790
]
17911791
},
17921792
{
1793-
"name": "WiFi Network Diagnostics",
1793+
"name": "Wi-Fi Network Diagnostics",
17941794
"code": 54,
17951795
"mfgCode": null,
17961796
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/network-manager-app/network-manager-common/network-manager-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2033,7 +2033,7 @@
20332033
]
20342034
},
20352035
{
2036-
"name": "WiFi Network Diagnostics",
2036+
"name": "Wi-Fi Network Diagnostics",
20372037
"code": 54,
20382038
"mfgCode": null,
20392039
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/placeholder/linux/apps/app1/config.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4056,7 +4056,7 @@
40564056
]
40574057
},
40584058
{
4059-
"name": "WiFi Network Diagnostics",
4059+
"name": "Wi-Fi Network Diagnostics",
40604060
"code": 54,
40614061
"mfgCode": null,
40624062
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/placeholder/linux/apps/app2/config.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4072,7 +4072,7 @@
40724072
]
40734073
},
40744074
{
4075-
"name": "WiFi Network Diagnostics",
4075+
"name": "Wi-Fi Network Diagnostics",
40764076
"code": 54,
40774077
"mfgCode": null,
40784078
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2002,7 +2002,7 @@
20022002
]
20032003
},
20042004
{
2005-
"name": "WiFi Network Diagnostics",
2005+
"name": "Wi-Fi Network Diagnostics",
20062006
"code": 54,
20072007
"mfgCode": null,
20082008
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1962,7 +1962,7 @@
19621962
]
19631963
},
19641964
{
1965-
"name": "WiFi Network Diagnostics",
1965+
"name": "Wi-Fi Network Diagnostics",
19661966
"code": 54,
19671967
"mfgCode": null,
19681968
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/thermostat/nxp/zap/thermostat_matter_wifi.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2248,7 +2248,7 @@
22482248
]
22492249
},
22502250
{
2251-
"name": "WiFi Network Diagnostics",
2251+
"name": "Wi-Fi Network Diagnostics",
22522252
"code": 54,
22532253
"mfgCode": null,
22542254
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/thermostat/thermostat-common/thermostat.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3156,7 +3156,7 @@
31563156
]
31573157
},
31583158
{
3159-
"name": "WiFi Network Diagnostics",
3159+
"name": "Wi-Fi Network Diagnostics",
31603160
"code": 54,
31613161
"mfgCode": null,
31623162
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3174,7 +3174,7 @@
31743174
]
31753175
},
31763176
{
3177-
"name": "WiFi Network Diagnostics",
3177+
"name": "Wi-Fi Network Diagnostics",
31783178
"code": 54,
31793179
"mfgCode": null,
31803180
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/tv-casting-app/tv-casting-common/tv-casting-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1745,7 +1745,7 @@
17451745
]
17461746
},
17471747
{
1748-
"name": "WiFi Network Diagnostics",
1748+
"name": "Wi-Fi Network Diagnostics",
17491749
"code": 54,
17501750
"mfgCode": null,
17511751
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎examples/virtual-device-app/virtual-device-common/virtual-device-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2972,7 +2972,7 @@
29722972
]
29732973
},
29742974
{
2975-
"name": "WiFi Network Diagnostics",
2975+
"name": "Wi-Fi Network Diagnostics",
29762976
"code": 54,
29772977
"mfgCode": null,
29782978
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3782,7 +3782,7 @@
37823782
]
37833783
},
37843784
{
3785-
"name": "WiFi Network Diagnostics",
3785+
"name": "Wi-Fi Network Diagnostics",
37863786
"code": 54,
37873787
"mfgCode": null,
37883788
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎scripts/tools/zap/tests/inputs/all-clusters-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4082,7 +4082,7 @@
40824082
]
40834083
},
40844084
{
4085-
"name": "WiFi Network Diagnostics",
4085+
"name": "Wi-Fi Network Diagnostics",
40864086
"code": 54,
40874087
"mfgCode": null,
40884088
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎scripts/tools/zap/tests/inputs/lighting-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3087,7 +3087,7 @@
30873087
]
30883088
},
30893089
{
3090-
"name": "WiFi Network Diagnostics",
3090+
"name": "Wi-Fi Network Diagnostics",
30913091
"code": 54,
30923092
"mfgCode": null,
30933093
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

‎scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@
637637
{ ZAP_SIMPLE_DEFAULT(0x000F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
638638
{ ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
639639
\
640-
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
640+
/* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
641641
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 7, ZAP_TYPE(OCTET_STRING), \
642642
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BSSID */ \
643643
{ ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), \
@@ -1502,7 +1502,7 @@
15021502
/* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
15031503
/* EventList (index=12) */ \
15041504
0x00000000, /* SoftwareFault */ \
1505-
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
1505+
/* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
15061506
/* EventList (index=13) */ \
15071507
0x00000000, /* Disconnection */ \
15081508
0x00000001, /* AssociationFailure */ \
@@ -1662,7 +1662,7 @@
16621662
/* AcceptedCommandList (index=44) */ \
16631663
0x00000000 /* ResetCounts */, \
16641664
chip::kInvalidCommandId /* end of list */, \
1665-
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
1665+
/* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */\
16661666
/* AcceptedCommandList (index=46) */ \
16671667
0x00000000 /* ResetCounts */, \
16681668
chip::kInvalidCommandId /* end of list */, \
@@ -2197,7 +2197,7 @@
21972197
.eventCount = 0, \
21982198
},\
21992199
{ \
2200-
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
2200+
/* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
22012201
.clusterId = 0x00000036, \
22022202
.attributes = ZAP_ATTRIBUTE_INDEX(173), \
22032203
.attributeCount = 15, \

‎scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
#define MATTER_DM_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
206206
#define MATTER_DM_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
207207

208-
// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
208+
// Use this macro to check if the server side of the Wi-Fi Network Diagnostics cluster is included
209209
#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
210210
#define MATTER_DM_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
211211
#define MATTER_DM_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS

‎scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@
336336
{ ZAP_SIMPLE_DEFAULT(0x000F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
337337
{ ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
338338
\
339-
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
339+
/* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
340340
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 7, ZAP_TYPE(OCTET_STRING), \
341341
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BSSID */ \
342342
{ ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), \
@@ -545,7 +545,7 @@
545545
0x00000001, /* RadioFaultChange */ \
546546
0x00000002, /* NetworkFaultChange */ \
547547
0x00000003, /* BootReason */ \
548-
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
548+
/* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
549549
/* EventList (index=12) */ \
550550
0x00000000, /* Disconnection */ \
551551
0x00000001, /* AssociationFailure */ \
@@ -652,7 +652,7 @@
652652
/* AcceptedCommandList (index=41) */ \
653653
0x00000000 /* ResetCounts */, \
654654
chip::kInvalidCommandId /* end of list */, \
655-
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
655+
/* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */\
656656
/* AcceptedCommandList (index=43) */ \
657657
0x00000000 /* ResetCounts */, \
658658
chip::kInvalidCommandId /* end of list */, \
@@ -947,7 +947,7 @@
947947
.eventCount = 0, \
948948
},\
949949
{ \
950-
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
950+
/* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
951951
.clusterId = 0x00000036, \
952952
.attributes = ZAP_ATTRIBUTE_INDEX(154), \
953953
.attributeCount = 15, \

‎scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
#define MATTER_DM_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
140140
#define MATTER_DM_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
141141

142-
// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
142+
// Use this macro to check if the server side of the Wi-Fi Network Diagnostics cluster is included
143143
#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
144144
#define MATTER_DM_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
145145
#define MATTER_DM_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS

0 commit comments

Comments
 (0)