From 08d8fd8eea39069a98902719c99aebbb4b3d375e Mon Sep 17 00:00:00 2001
From: jmartinez-silabs <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Fri, 28 Jan 2022 11:30:15 -0500
Subject: [PATCH] Fix ThreadNetworkDiagnostics read network-name response
(#14426)
* Thread NetworkName attribute is a char_string, assigne cluster code to the feature map
* Regen
* Rebase & regen to fix conflicts
---
.../all-clusters-app.matter | 2 +-
.../bridge-common/bridge-app.matter | 2 +-
.../door-lock-common/door-lock-app.matter | 2 +-
.../light-switch-app.matter | 2 +-
.../lighting-common/lighting-app.matter | 2 +-
examples/lock-app/lock-common/lock-app.matter | 2 +-
examples/pump-app/pump-common/pump-app.matter | 2 +-
.../pump-controller-app.matter | 2 +-
.../thermostat-common/thermostat.matter | 2 +-
examples/tv-app/tv-common/tv-app.matter | 2 +-
.../tv-casting-common/tv-casting-app.matter | 2 +-
examples/window-app/common/window-app.matter | 2 +-
.../thread-network-diagnostics-cluster.xml | 3 ++-
.../data_model/controller-clusters.matter | 2 +-
.../java/zap-generated/CHIPClusters-JNI.cpp | 6 ++---
.../chip/devicecontroller/ChipClusters.java | 8 +++----
.../devicecontroller/ClusterReadMapping.java | 4 ++--
.../python/chip/clusters/CHIPClusters.py | 2 +-
.../python/chip/clusters/Objects.py | 8 +++----
.../CHIPAttributeTLVValueDecoder.mm | 4 ++--
.../CHIP/zap-generated/CHIPClustersObjc.h | 4 ++--
.../CHIP/zap-generated/CHIPClustersObjc.mm | 23 +++++++++----------
.../CHIP/zap-generated/CHIPTestClustersObjc.h | 2 +-
.../zap-generated/CHIPTestClustersObjc.mm | 4 ++--
.../Framework/CHIPTests/CHIPClustersTests.m | 2 +-
...nericThreadStackManagerImpl_OpenThread.cpp | 2 +-
third_party/efr32_sdk/repo | 2 +-
third_party/zap/repo | 2 +-
.../zap-generated/endpoint_config.h | 2 +-
.../zap-generated/attributes/Accessors.cpp | 6 ++---
.../zap-generated/attributes/Accessors.h | 4 ++--
.../zap-generated/cluster-objects.h | 15 +++++++++---
.../zap-generated/endpoint_config.h | 2 +-
.../cluster/logging/DataModelLogger.cpp | 2 +-
.../zap-generated/endpoint_config.h | 2 +-
.../zap-generated/endpoint_config.h | 2 +-
.../zap-generated/endpoint_config.h | 2 +-
.../lock-app/zap-generated/endpoint_config.h | 2 +-
.../pump-app/zap-generated/endpoint_config.h | 2 +-
.../zap-generated/endpoint_config.h | 2 +-
.../zap-generated/endpoint_config.h | 2 +-
.../tv-app/zap-generated/endpoint_config.h | 2 +-
.../zap-generated/endpoint_config.h | 2 +-
.../zap-generated/endpoint_config.h | 2 +-
44 files changed, 81 insertions(+), 72 deletions(-)
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index c000a61397c105..70b5f7558f2664 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -2936,7 +2936,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index 74468abeb82263..dffc5780109e9b 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -778,7 +778,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/examples/door-lock-app/door-lock-common/door-lock-app.matter b/examples/door-lock-app/door-lock-common/door-lock-app.matter
index 4d591615f1ad81..a57dbd434cb9be 100644
--- a/examples/door-lock-app/door-lock-common/door-lock-app.matter
+++ b/examples/door-lock-app/door-lock-common/door-lock-app.matter
@@ -1044,7 +1044,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index 4bbe4d6b6b253f..a0499c426e025b 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -1201,7 +1201,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index a936603de8d1a2..a83a5a1e6bf023 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -1307,7 +1307,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 170cbf2a12ed7e..87f751214cd68b 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -740,7 +740,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index 0c34c1570c6126..f455ea708729a1 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -837,7 +837,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index 8691295541f029..cbfe014612caa0 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -825,7 +825,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 87622ccd8e6163..203835314dbd04 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -1045,7 +1045,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 51b903a95ad2bf..34e04d242344ee 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -1659,7 +1659,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index cceeba7a179571..31cb28be3a0d64 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -2305,7 +2305,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index b7fe2bc89d95b5..e896b12e750709 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -722,7 +722,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml
index 5df26dcedee7e3..f631864182cc5f 100644
--- a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml
@@ -93,7 +93,7 @@ limitations under the License.
The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems
channel
RoutingRole
- NetworkName
+ NetworkName
PanId
ExtendedPanId
MeshLocalPrefix
@@ -168,6 +168,7 @@ limitations under the License.
+
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index a5418707c58cb4..63888369577736 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -3212,7 +3212,7 @@ client cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
- readonly attribute octet_string<16> networkName = 2;
+ readonly attribute char_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string<17> meshLocalPrefix = 5;
diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
index a304888e223ede..e6aa4d967e48bb 100644
--- a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
@@ -29523,8 +29523,8 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, subscribeNetworkNameAttribute)
(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
{
chip::DeviceLayer::StackLock lock;
- std::unique_ptr onSuccess(
- Platform::New(callback, true), chip::Platform::Delete);
+ std::unique_ptr onSuccess(
+ Platform::New(callback, true), chip::Platform::Delete);
VerifyOrReturn(onSuccess.get() != nullptr,
chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
@@ -29548,7 +29548,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, subscribeNetworkNameAttribute)
err = cppCluster->SubscribeAttribute(onSuccess->mContext, successFn->mCall, failureFn->mCall,
static_cast(minInterval), static_cast(maxInterval),
- CHIPOctetStringAttributeCallback::OnSubscriptionEstablished);
+ CHIPCharStringAttributeCallback::OnSubscriptionEstablished);
VerifyOrReturn(err == CHIP_NO_ERROR,
chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
env, callback, "Error subscribing to attribute", err));
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 1285ba45bde897..1221e030a49b92 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -16107,12 +16107,12 @@ public void subscribeRoutingRoleAttribute(
subscribeRoutingRoleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readNetworkNameAttribute(OctetStringAttributeCallback callback) {
+ public void readNetworkNameAttribute(CharStringAttributeCallback callback) {
readNetworkNameAttribute(chipClusterPtr, callback);
}
public void subscribeNetworkNameAttribute(
- OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+ CharStringAttributeCallback callback, int minInterval, int maxInterval) {
subscribeNetworkNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
@@ -16704,11 +16704,11 @@ private native void subscribeRoutingRoleAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readNetworkNameAttribute(
- long chipClusterPtr, OctetStringAttributeCallback callback);
+ long chipClusterPtr, CharStringAttributeCallback callback);
private native void subscribeNetworkNameAttribute(
long chipClusterPtr,
- OctetStringAttributeCallback callback,
+ CharStringAttributeCallback callback,
int minInterval,
int maxInterval);
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
index 3b835d42a6965f..7a6fce9528fe69 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
@@ -6897,9 +6897,9 @@ public Map> getReadAttributeMap() {
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
- .readNetworkNameAttribute((ChipClusters.OctetStringAttributeCallback) callback);
+ .readNetworkNameAttribute((ChipClusters.CharStringAttributeCallback) callback);
},
- () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
+ () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
readThreadNetworkDiagnosticsNetworkNameCommandParams);
readThreadNetworkDiagnosticsInteractionInfo.put(
"readNetworkNameAttribute",
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index 22b70972090017..1a5862e25362a7 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -5024,7 +5024,7 @@ class ChipClusters:
0x00000002: {
"attributeName": "NetworkName",
"attributeId": 0x00000002,
- "type": "bytes",
+ "type": "str",
"reportable": True,
},
0x00000003: {
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 50ba8eb04c1f32..a2d82704f303bc 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -9651,7 +9651,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
Fields = [
ClusterObjectFieldDescriptor(Label="channel", Tag=0x00000000, Type=uint),
ClusterObjectFieldDescriptor(Label="routingRole", Tag=0x00000001, Type=uint),
- ClusterObjectFieldDescriptor(Label="networkName", Tag=0x00000002, Type=bytes),
+ ClusterObjectFieldDescriptor(Label="networkName", Tag=0x00000002, Type=str),
ClusterObjectFieldDescriptor(Label="panId", Tag=0x00000003, Type=uint),
ClusterObjectFieldDescriptor(Label="extendedPanId", Tag=0x00000004, Type=uint),
ClusterObjectFieldDescriptor(Label="meshLocalPrefix", Tag=0x00000005, Type=bytes),
@@ -9719,7 +9719,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
channel: 'uint' = None
routingRole: 'uint' = None
- networkName: 'bytes' = None
+ networkName: 'str' = None
panId: 'uint' = None
extendedPanId: 'uint' = None
meshLocalPrefix: 'bytes' = None
@@ -9980,9 +9980,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=bytes)
+ return ClusterObjectFieldDescriptor(Type=str)
- value: 'bytes' = b""
+ value: 'str' = ""
@dataclass
class PanId(ClusterAttributeDescriptor):
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
index becc6b93adf5ea..a5ba2318c55f20 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
@@ -8106,8 +8106,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
if (*aError != CHIP_NO_ERROR) {
return nil;
}
- NSData * _Nonnull value;
- value = [NSData dataWithBytes:cppValue.data() length:cppValue.size()];
+ NSString * _Nonnull value;
+ value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
return value;
}
case Attributes::PanId::Id: {
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
index ce34654191f4b7..c6cf36794f9c3e 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
@@ -4990,11 +4990,11 @@ NS_ASSUME_NONNULL_BEGIN
reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
- (void)readAttributeNetworkNameWithCompletionHandler:(void (^)(
- NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+ NSString * _Nullable value, NSError * _Nullable error))completionHandler;
- (void)subscribeAttributeNetworkNameWithMinInterval:(uint16_t)minInterval
maxInterval:(uint16_t)maxInterval
subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
- reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
+ reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
- (void)readAttributePanIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
- (void)subscribeAttributePanIdWithMinInterval:(uint16_t)minInterval
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
index 612dca5c2b8a9a..6efb84794292ce 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
@@ -22060,30 +22060,29 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
}
- (void)readAttributeNetworkNameWithCompletionHandler:(void (^)(
- NSData * _Nullable value, NSError * _Nullable error))completionHandler
+ NSString * _Nullable value, NSError * _Nullable error))completionHandler
{
- new CHIPOctetStringAttributeCallbackBridge(
- self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
- using TypeInfo = ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
- auto failureFn = Callback::FromCancelable(failure);
- return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
- });
+ new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ using TypeInfo = ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo;
+ auto successFn = Callback::FromCancelable(success);
+ auto failureFn = Callback::FromCancelable(failure);
+ return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
+ });
}
- (void)subscribeAttributeNetworkNameWithMinInterval:(uint16_t)minInterval
maxInterval:(uint16_t)maxInterval
subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
- reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
+ reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
{
- new CHIPOctetStringAttributeCallbackSubscriptionBridge(
+ new CHIPCharStringAttributeCallbackSubscriptionBridge(
self.callbackQueue, reportHandler,
^(Cancelable * success, Cancelable * failure) {
using TypeInfo = ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
+ auto successFn = Callback::FromCancelable(success);
auto failureFn = Callback::FromCancelable(failure);
return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall,
- minInterval, maxInterval, CHIPOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished);
+ minInterval, maxInterval, CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished);
},
subscriptionEstablishedHandler);
}
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h
index b9b06a5b451f05..276db9c6925a3c 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h
@@ -935,7 +935,7 @@ NS_ASSUME_NONNULL_BEGIN
- (void)writeAttributeChannelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
- (void)writeAttributeRoutingRoleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNetworkNameWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNetworkNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
- (void)writeAttributePanIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
- (void)writeAttributeExtendedPanIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
- (void)writeAttributeMeshLocalPrefixWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm
index 9259ea4ab393ad..a36a98bf31664f 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm
@@ -9350,7 +9350,7 @@ new CHIPDefaultSuccessCallbackBridge(
});
}
-- (void)writeAttributeNetworkNameWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNetworkNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
{
new CHIPDefaultSuccessCallbackBridge(
self.callbackQueue,
@@ -9361,7 +9361,7 @@ new CHIPDefaultSuccessCallbackBridge(
ListFreer listFreer;
using TypeInfo = ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo;
TypeInfo::Type cppValue;
- cppValue = [self asByteSpan:value];
+ cppValue = [self asCharSpan:value];
auto successFn = Callback::FromCancelable(success);
auto failureFn = Callback::FromCancelable(failure);
return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
index 57b5f649a4c476..7b8b1f6884dd10 100644
--- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
+++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
@@ -52806,7 +52806,7 @@ - (void)testSendClusterThreadNetworkDiagnosticsReadAttributeNetworkNameWithCompl
XCTestExpectation * expectation =
[self expectationWithDescription:@"ThreadNetworkDiagnosticsReadAttributeNetworkNameWithCompletionHandler"];
- [cluster readAttributeNetworkNameWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable err) {
+ [cluster readAttributeNetworkNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
NSLog(@"ThreadNetworkDiagnostics NetworkName Error: %@", err);
XCTAssertEqual(err.code, 0);
[expectation fulfill];
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
index 92ed527b3840bd..b47e471f882473 100644
--- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
+++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
@@ -881,7 +881,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread::_WriteThreadNetw
case ThreadNetworkDiagnostics::Attributes::NetworkName::Id: {
const char * networkName = otThreadGetNetworkName(mOTInst);
- err = encoder.Encode(Span(networkName, strlen(networkName)));
+ err = encoder.Encode(CharSpan::fromCharString(networkName));
}
break;
diff --git a/third_party/efr32_sdk/repo b/third_party/efr32_sdk/repo
index 744316bcf0525f..d505a886028bcc 160000
--- a/third_party/efr32_sdk/repo
+++ b/third_party/efr32_sdk/repo
@@ -1 +1 @@
-Subproject commit 744316bcf0525fd6e07ea86969dd907c2cb10e5f
+Subproject commit d505a886028bccd9592fc53f613228af48ae5532
diff --git a/third_party/zap/repo b/third_party/zap/repo
index 5ee050719bf25f..f56f889d97b78a 160000
--- a/third_party/zap/repo
+++ b/third_party/zap/repo
@@ -1 +1 @@
-Subproject commit 5ee050719bf25f7c02c63e394bb5747f845edfab
+Subproject commit f56f889d97b78a9f720b1447b5432e8a0cea8227
diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
index c16421ca91b558..e855973e90760c 100644
--- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
@@ -1646,7 +1646,7 @@
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(OCTET_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(590) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(590) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
{ 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(592) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
index bead094ae661fb..83acffd2e80b8a 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
@@ -8717,7 +8717,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
namespace NetworkName {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
{
uint8_t zclString[16 + 1];
EmberAfStatus status =
@@ -8734,7 +8734,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
value.reduce_size(length);
return status;
}
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
{
static_assert(16 < NumericAttributeTraits::kNullValue, "value.size() might be too big");
VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
@@ -8742,7 +8742,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
emberAfCopyInt8u(zclString, 0, static_cast(value.size()));
memcpy(&zclString[1], value.data(), value.size());
return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, zclString,
- ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
+ ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
}
} // namespace NetworkName
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
index c2cd222d213c7e..25d5bda66e6407 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
@@ -1588,8 +1588,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
} // namespace RoutingRole
namespace NetworkName {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
} // namespace NetworkName
namespace PanId {
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index 26488b271389b4..28c99ae95fff53 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -11922,6 +11922,15 @@ enum class ThreadConnectionStatus : uint8_t
kNotConnected = 0x01,
};
+// Bitmap for ThreadNetworkDiagnosticsFeature
+enum class ThreadNetworkDiagnosticsFeature : uint32_t
+{
+ kPacketCounts = 0x1,
+ kErrorCounts = 0x2,
+ kMLECounts = 0x4,
+ kMACCounts = 0x8,
+};
+
namespace Structs {
namespace NeighborTable {
enum class Fields
@@ -12143,9 +12152,9 @@ struct TypeInfo
namespace NetworkName {
struct TypeInfo
{
- using Type = chip::ByteSpan;
- using DecodableType = chip::ByteSpan;
- using DecodableArgType = chip::ByteSpan;
+ using Type = chip::CharSpan;
+ using DecodableType = chip::CharSpan;
+ using DecodableArgType = chip::CharSpan;
static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
static constexpr AttributeId GetAttributeId() { return Attributes::NetworkName::Id; }
diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
index 2525d20cf293b8..27c49264342f46 100644
--- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
@@ -742,7 +742,7 @@
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(OCTET_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(336) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(336) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
{ 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(338) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index d44ecdb72bf642..b099c826ee2a0e 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -6671,7 +6671,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
return DataModelLogger::LogValue("RoutingRole", 1, value);
}
case ThreadNetworkDiagnostics::Attributes::NetworkName::Id: {
- chip::ByteSpan value;
+ chip::CharSpan value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("NetworkName", 1, value);
}
diff --git a/zzz_generated/door-lock-app/zap-generated/endpoint_config.h b/zzz_generated/door-lock-app/zap-generated/endpoint_config.h
index d74a529646abcc..9882b232ce9e78 100644
--- a/zzz_generated/door-lock-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/door-lock-app/zap-generated/endpoint_config.h
@@ -748,7 +748,7 @@
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(OCTET_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(344) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(344) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
{ 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(346) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \
diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
index d7ea993dc8c187..6d1087aad77029 100644
--- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
@@ -621,7 +621,7 @@
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(OCTET_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(64) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(64) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
{ 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(66) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \
diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h
index f7d76b7ac8ba7c..ee66e7dc819795 100644
--- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h
@@ -717,7 +717,7 @@
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(OCTET_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(332) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(332) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
{ 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(334) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \
diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h
index d97310618dcec7..2a6c7112072ab2 100644
--- a/zzz_generated/lock-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h
@@ -730,7 +730,7 @@
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(OCTET_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(344) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(344) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
{ 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(346) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \
diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h
index 73fac6ebbc764e..09a87db54673e6 100644
--- a/zzz_generated/pump-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h
@@ -614,7 +614,7 @@
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(OCTET_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(336) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(336) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
{ 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(338) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \
diff --git a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
index 4f4fb50d778686..a44c3f42c6f2fe 100644
--- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
@@ -689,7 +689,7 @@
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(OCTET_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(336) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(336) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
{ 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(338) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \
diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h
index e43b1e33b0f15f..1d0cfa22b09d68 100644
--- a/zzz_generated/thermostat/zap-generated/endpoint_config.h
+++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h
@@ -790,7 +790,7 @@
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(OCTET_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(336) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(336) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
{ 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(338) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \
diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h
index 99b34b9f89798a..210f7c8031a062 100644
--- a/zzz_generated/tv-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h
@@ -1154,7 +1154,7 @@
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(OCTET_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(340) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(340) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
{ 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(342) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \
diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
index 88f00d77217865..aee47a1b7998be 100644
--- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
@@ -997,7 +997,7 @@
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(OCTET_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(336) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(336) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
{ 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(338) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \
diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h
index 0c43cf17839b8c..79a27b7cba3fc4 100644
--- a/zzz_generated/window-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/window-app/zap-generated/endpoint_config.h
@@ -737,7 +737,7 @@
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(OCTET_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(352) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(352) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
{ 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(354) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \