Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified wifi network diagnostics cluster name, WiFi to Wi-Fi #33746

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2742,7 +2742,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4340,7 +4340,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3002,7 +3002,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
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 @@ -3249,7 +3249,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2714,7 +2714,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2094,7 +2094,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2094,7 +2094,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2094,7 +2094,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3024,7 +3024,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3098,7 +3098,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2234,7 +2234,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2884,7 +2884,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2240,7 +2240,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3024,7 +3024,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1903,7 +1903,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/lighting-common/lighting-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2979,7 +2979,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1877,7 +1877,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
2 changes: 1 addition & 1 deletion examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2217,7 +2217,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/lock-common/lock-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3654,7 +3654,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1790,7 +1790,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2033,7 +2033,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app1/config.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4056,7 +4056,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app2/config.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4072,7 +4072,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2002,7 +2002,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1962,7 +1962,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
2 changes: 1 addition & 1 deletion examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2248,7 +2248,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
2 changes: 1 addition & 1 deletion examples/thermostat/thermostat-common/thermostat.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3156,7 +3156,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-app/tv-common/tv-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3174,7 +3174,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1745,7 +1745,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2972,7 +2972,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
2 changes: 1 addition & 1 deletion examples/window-app/common/window-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3782,7 +3782,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
2 changes: 1 addition & 1 deletion scripts/tools/zap/tests/inputs/all-clusters-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4082,7 +4082,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
2 changes: 1 addition & 1 deletion scripts/tools/zap/tests/inputs/lighting-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3087,7 +3087,7 @@
]
},
{
"name": "WiFi Network Diagnostics",
"name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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), \
Expand Down Expand Up @@ -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 */ \
Expand Down Expand Up @@ -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 */, \
Expand Down Expand Up @@ -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, \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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), \
Expand Down Expand Up @@ -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 */ \
Expand Down Expand Up @@ -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 */, \
Expand Down Expand Up @@ -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, \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading