Modified wifi network diagnostics cluster name, WiFi to Wi-Fi to matc…

…h the SPEC (project-chip#33746)
joonhaengHeo · Jun 11, 2024 · 23e0f3b · 23e0f3b
1 parent 47097e0
commit 23e0f3b
Show file tree

Hide file tree

Showing 48 changed files with 58 additions and 58 deletions.
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap
@@ -2742,7 +2742,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -4340,7 +4340,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -3002,7 +3002,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -3249,7 +3249,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -2714,7 +2714,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
@@ -2094,7 +2094,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
@@ -2094,7 +2094,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/...ode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap b/...ode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
@@ -2094,7 +2094,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/chef/sample_app_util/test_files/sample_zap_file.zap b/examples/chef/sample_app_util/test_files/sample_zap_file.zap
@@ -3024,7 +3024,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
@@ -3098,7 +3098,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
@@ -2234,7 +2234,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.zap b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.zap
@@ -2884,7 +2884,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/laundry-washer-app/nxp/zap/laundry-washer-app.zap b/examples/laundry-washer-app/nxp/zap/laundry-washer-app.zap
@@ -2240,7 +2240,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap
@@ -3024,7 +3024,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
@@ -1903,7 +1903,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -2979,7 +2979,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
@@ -1877,7 +1877,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
@@ -2217,7 +2217,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
@@ -3654,7 +3654,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.zap b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.zap
@@ -1790,7 +1790,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/network-manager-app/network-manager-common/network-manager-app.zap b/examples/network-manager-app/network-manager-common/network-manager-app.zap
@@ -2033,7 +2033,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
@@ -4056,7 +4056,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
@@ -4072,7 +4072,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
@@ -2002,7 +2002,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/...es/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap b/...es/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
@@ -1962,7 +1962,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
@@ -2248,7 +2248,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
@@ -3156,7 +3156,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
@@ -3174,7 +3174,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
@@ -1745,7 +1745,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap
@@ -2972,7 +2972,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
@@ -3782,7 +3782,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
@@ -4082,7 +4082,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap
@@ -3087,7 +3087,7 @@
  ]
  },
  {
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
  "code": 54,
  "mfgCode": null,
  "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",

diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
@@ -637,7 +637,7 @@
  { ZAP_SIMPLE_DEFAULT(0x000F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
  { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
  \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */  \
+ /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
  { ZAP_EMPTY_DEFAULT(), 0x00000000, 7, ZAP_TYPE(OCTET_STRING), \
  ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BSSID */ \
  { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), \
@@ -1502,7 +1502,7 @@
  /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
  /* EventList (index=12) */ \
  0x00000000, /* SoftwareFault */ \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
+ /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
  /* EventList (index=13) */ \
  0x00000000, /* Disconnection */ \
  0x00000001, /* AssociationFailure */ \
@@ -1662,7 +1662,7 @@
  /* AcceptedCommandList (index=44) */ \
  0x00000000 /* ResetCounts */, \
  chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */\
  /* AcceptedCommandList (index=46) */ \
  0x00000000 /* ResetCounts */, \
  chip::kInvalidCommandId /* end of list */, \
@@ -2197,7 +2197,7 @@
  .eventCount = 0, \
  },\
  { \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
+ /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
  .clusterId = 0x00000036, \
  .attributes = ZAP_ATTRIBUTE_INDEX(173), \
  .attributeCount = 15, \

diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h
@@ -205,7 +205,7 @@
 #define MATTER_DM_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
 #define MATTER_DM_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+// Use this macro to check if the server side of the Wi-Fi Network Diagnostics cluster is included
 #define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
 #define MATTER_DM_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
 #define MATTER_DM_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS

diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
@@ -336,7 +336,7 @@
  { ZAP_SIMPLE_DEFAULT(0x000F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
  { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
  \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */  \
+ /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
  { ZAP_EMPTY_DEFAULT(), 0x00000000, 7, ZAP_TYPE(OCTET_STRING), \
  ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BSSID */ \
  { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), \
@@ -545,7 +545,7 @@
  0x00000001, /* RadioFaultChange */ \
  0x00000002, /* NetworkFaultChange */ \
  0x00000003, /* BootReason */ \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
+ /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
  /* EventList (index=12) */ \
  0x00000000, /* Disconnection */ \
  0x00000001, /* AssociationFailure */ \
@@ -652,7 +652,7 @@
  /* AcceptedCommandList (index=41) */ \
  0x00000000 /* ResetCounts */, \
  chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
+ /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */\
  /* AcceptedCommandList (index=43) */ \
  0x00000000 /* ResetCounts */, \
  chip::kInvalidCommandId /* end of list */, \
@@ -947,7 +947,7 @@
  .eventCount = 0, \
  },\
  { \
- /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
+ /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
  .clusterId = 0x00000036, \
  .attributes = ZAP_ATTRIBUTE_INDEX(154), \
  .attributeCount = 15, \

diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h
@@ -139,7 +139,7 @@
 #define MATTER_DM_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
 #define MATTER_DM_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+// Use this macro to check if the server side of the Wi-Fi Network Diagnostics cluster is included
 #define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
 #define MATTER_DM_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
 #define MATTER_DM_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS