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 95463adea376c6..11c4e495718f01 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 @@ -3519,7 +3519,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -3577,9 +3577,9 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int64u activeTimestamp = 56; readonly attribute nullable int64u pendingTimestamp = 57; readonly attribute nullable int32u delay = 58; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 8b50555214aad3..83fa1f5d8c2ef4 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -3003,7 +3003,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -3015,9 +3015,9 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int8u dataVersion = 11; readonly attribute nullable int8u stableDataVersion = 12; readonly attribute nullable int8u leaderRouterId = 13; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 041db3c7c46286..4402192adefc26 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -973,7 +973,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -1031,9 +1031,9 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int64u activeTimestamp = 56; readonly attribute nullable int64u pendingTimestamp = 57; readonly attribute nullable int32u delay = 58; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; 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 8082a44647cc33..170beeaf46ec19 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 @@ -1514,7 +1514,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -1572,9 +1572,9 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int64u activeTimestamp = 56; readonly attribute nullable int64u pendingTimestamp = 57; readonly attribute nullable int32u delay = 58; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index c212dcf67fa130..53e51f84ac62b8 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1496,7 +1496,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -1554,9 +1554,9 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int64u activeTimestamp = 56; readonly attribute nullable int64u pendingTimestamp = 57; readonly attribute nullable int32u delay = 58; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index a39a5a6ac5978d..af96f81c9fdb5c 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1682,7 +1682,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -1740,9 +1740,9 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int64u activeTimestamp = 56; readonly attribute nullable int64u pendingTimestamp = 57; readonly attribute nullable int32u delay = 58; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index f203161dd5a108..30d1241a40ad31 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -1450,7 +1450,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -1508,9 +1508,9 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int64u activeTimestamp = 56; readonly attribute nullable int64u pendingTimestamp = 57; readonly attribute nullable int32u delay = 58; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; 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 0d80b2b801307a..6281f274554eb0 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 @@ -1175,7 +1175,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -1233,9 +1233,9 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int64u activeTimestamp = 56; readonly attribute nullable int64u pendingTimestamp = 57; readonly attribute nullable int32u delay = 58; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 15a6b894cda749..3d189411d2bd14 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1191,7 +1191,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -1249,9 +1249,9 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int64u activeTimestamp = 56; readonly attribute nullable int64u pendingTimestamp = 57; readonly attribute nullable int32u delay = 58; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 6017867c0eda05..717cdd5e2ee0a8 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1846,7 +1846,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -1904,9 +1904,9 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int64u activeTimestamp = 56; readonly attribute nullable int64u pendingTimestamp = 57; readonly attribute nullable int32u delay = 58; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; 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 2fed687145634a..2ff8dc59c21b15 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 @@ -2022,7 +2022,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -2080,9 +2080,9 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int64u activeTimestamp = 56; readonly attribute nullable int64u pendingTimestamp = 57; readonly attribute nullable int32u delay = 58; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 47b66212a8f925..123051a1ae703c 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1223,7 +1223,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -1281,9 +1281,9 @@ server cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int64u activeTimestamp = 56; readonly attribute nullable int64u pendingTimestamp = 57; readonly attribute nullable int32u delay = 58; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; 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 95833305af3372..3a7aa3b468b930 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 @@ -92,7 +92,7 @@ limitations under the License. THREAD_NETWORK_DIAGNOSTICS_CLUSTER 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 + RoutingRole NetworkName PanId ExtendedPanId @@ -153,11 +153,9 @@ limitations under the License. ActiveTimestamp PendingTimestamp delay - - SecurityPolicy + SecurityPolicy ChannelMask - - OperationalDatasetComponents + OperationalDatasetComponents ActiveNetworkFaultsList Reception of this command SHALL reset the OverrunCount attributes to 0 diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 7b866eecab46ef..b9eee28a2f0984 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -4012,7 +4012,7 @@ client cluster ThreadNetworkDiagnostics = 53 { } readonly attribute nullable int16u channel = 0; - readonly attribute nullable enum8 routingRole = 1; + readonly attribute nullable RoutingRole routingRole = 1; readonly attribute nullable char_string<16> networkName = 2; readonly attribute nullable int16u panId = 3; readonly attribute nullable int64u extendedPanId = 4; @@ -4070,9 +4070,9 @@ client cluster ThreadNetworkDiagnostics = 53 { readonly attribute nullable int64u activeTimestamp = 56; readonly attribute nullable int64u pendingTimestamp = 57; readonly attribute nullable int32u delay = 58; - readonly attribute nullable SecurityPolicy securityPolicy[] = 59; + readonly attribute nullable SecurityPolicy securityPolicy = 59; readonly attribute nullable octet_string<4> channelMask = 60; - readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents[] = 61; + readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61; readonly attribute NetworkFault activeNetworkFaultsList[] = 62; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index e829408062fb92..2bc28e290647b7 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -16152,7 +16152,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR std::string valueClassName = "java/lang/Integer"; std::string valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), - cppValue.Value(), value); + static_cast(cppValue.Value()), value); } return value; } @@ -17321,47 +17321,36 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } else { - chip::JniReferences::GetInstance().CreateArrayList(value); + jobject value_rotationTime; + std::string value_rotationTimeClassName = "java/lang/Integer"; + std::string value_rotationTimeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(value_rotationTimeClassName.c_str(), + value_rotationTimeCtorSignature.c_str(), + cppValue.Value().rotationTime, value_rotationTime); + jobject value_flags; + std::string value_flagsClassName = "java/lang/Integer"; + std::string value_flagsCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + value_flagsClassName.c_str(), value_flagsCtorSignature.c_str(), cppValue.Value().flags, value_flags); - auto iter_value_1 = cppValue.Value().begin(); - while (iter_value_1.Next()) + jclass securityPolicyStructClass; + err = chip::JniReferences::GetInstance().GetClassRef( + env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy", + securityPolicyStructClass); + if (err != CHIP_NO_ERROR) { - auto & entry_1 = iter_value_1.GetValue(); - jobject newElement_1; - jobject newElement_1_rotationTime; - std::string newElement_1_rotationTimeClassName = "java/lang/Integer"; - std::string newElement_1_rotationTimeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_rotationTimeClassName.c_str(), - newElement_1_rotationTimeCtorSignature.c_str(), - entry_1.rotationTime, newElement_1_rotationTime); - jobject newElement_1_flags; - std::string newElement_1_flagsClassName = "java/lang/Integer"; - std::string newElement_1_flagsCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_flagsClassName.c_str(), - newElement_1_flagsCtorSignature.c_str(), - entry_1.flags, newElement_1_flags); - - jclass securityPolicyStructClass; - err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy", - securityPolicyStructClass); - if (err != CHIP_NO_ERROR) - { - ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy"); - return nullptr; - } - jmethodID securityPolicyStructCtor = - env->GetMethodID(securityPolicyStructClass, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); - if (securityPolicyStructCtor == nullptr) - { - ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy constructor"); - return nullptr; - } - - newElement_1 = env->NewObject(securityPolicyStructClass, securityPolicyStructCtor, newElement_1_rotationTime, - newElement_1_flags); - chip::JniReferences::GetInstance().AddToList(value, newElement_1); + ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy"); + return nullptr; } + jmethodID securityPolicyStructCtor = + env->GetMethodID(securityPolicyStructClass, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); + if (securityPolicyStructCtor == nullptr) + { + ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy constructor"); + return nullptr; + } + + value = env->NewObject(securityPolicyStructClass, securityPolicyStructCtor, value_rotationTime, value_flags); } return value; } @@ -17402,121 +17391,106 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } else { - chip::JniReferences::GetInstance().CreateArrayList(value); + jobject value_activeTimestampPresent; + std::string value_activeTimestampPresentClassName = "java/lang/Boolean"; + std::string value_activeTimestampPresentCtorSignature = "(Z)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + value_activeTimestampPresentClassName.c_str(), value_activeTimestampPresentCtorSignature.c_str(), + cppValue.Value().activeTimestampPresent, value_activeTimestampPresent); + jobject value_pendingTimestampPresent; + std::string value_pendingTimestampPresentClassName = "java/lang/Boolean"; + std::string value_pendingTimestampPresentCtorSignature = "(Z)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + value_pendingTimestampPresentClassName.c_str(), value_pendingTimestampPresentCtorSignature.c_str(), + cppValue.Value().pendingTimestampPresent, value_pendingTimestampPresent); + jobject value_masterKeyPresent; + std::string value_masterKeyPresentClassName = "java/lang/Boolean"; + std::string value_masterKeyPresentCtorSignature = "(Z)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + value_masterKeyPresentClassName.c_str(), value_masterKeyPresentCtorSignature.c_str(), + cppValue.Value().masterKeyPresent, value_masterKeyPresent); + jobject value_networkNamePresent; + std::string value_networkNamePresentClassName = "java/lang/Boolean"; + std::string value_networkNamePresentCtorSignature = "(Z)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + value_networkNamePresentClassName.c_str(), value_networkNamePresentCtorSignature.c_str(), + cppValue.Value().networkNamePresent, value_networkNamePresent); + jobject value_extendedPanIdPresent; + std::string value_extendedPanIdPresentClassName = "java/lang/Boolean"; + std::string value_extendedPanIdPresentCtorSignature = "(Z)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + value_extendedPanIdPresentClassName.c_str(), value_extendedPanIdPresentCtorSignature.c_str(), + cppValue.Value().extendedPanIdPresent, value_extendedPanIdPresent); + jobject value_meshLocalPrefixPresent; + std::string value_meshLocalPrefixPresentClassName = "java/lang/Boolean"; + std::string value_meshLocalPrefixPresentCtorSignature = "(Z)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + value_meshLocalPrefixPresentClassName.c_str(), value_meshLocalPrefixPresentCtorSignature.c_str(), + cppValue.Value().meshLocalPrefixPresent, value_meshLocalPrefixPresent); + jobject value_delayPresent; + std::string value_delayPresentClassName = "java/lang/Boolean"; + std::string value_delayPresentCtorSignature = "(Z)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(value_delayPresentClassName.c_str(), + value_delayPresentCtorSignature.c_str(), + cppValue.Value().delayPresent, value_delayPresent); + jobject value_panIdPresent; + std::string value_panIdPresentClassName = "java/lang/Boolean"; + std::string value_panIdPresentCtorSignature = "(Z)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(value_panIdPresentClassName.c_str(), + value_panIdPresentCtorSignature.c_str(), + cppValue.Value().panIdPresent, value_panIdPresent); + jobject value_channelPresent; + std::string value_channelPresentClassName = "java/lang/Boolean"; + std::string value_channelPresentCtorSignature = "(Z)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(value_channelPresentClassName.c_str(), + value_channelPresentCtorSignature.c_str(), + cppValue.Value().channelPresent, value_channelPresent); + jobject value_pskcPresent; + std::string value_pskcPresentClassName = "java/lang/Boolean"; + std::string value_pskcPresentCtorSignature = "(Z)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(value_pskcPresentClassName.c_str(), + value_pskcPresentCtorSignature.c_str(), + cppValue.Value().pskcPresent, value_pskcPresent); + jobject value_securityPolicyPresent; + std::string value_securityPolicyPresentClassName = "java/lang/Boolean"; + std::string value_securityPolicyPresentCtorSignature = "(Z)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + value_securityPolicyPresentClassName.c_str(), value_securityPolicyPresentCtorSignature.c_str(), + cppValue.Value().securityPolicyPresent, value_securityPolicyPresent); + jobject value_channelMaskPresent; + std::string value_channelMaskPresentClassName = "java/lang/Boolean"; + std::string value_channelMaskPresentCtorSignature = "(Z)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + value_channelMaskPresentClassName.c_str(), value_channelMaskPresentCtorSignature.c_str(), + cppValue.Value().channelMaskPresent, value_channelMaskPresent); - auto iter_value_1 = cppValue.Value().begin(); - while (iter_value_1.Next()) + jclass operationalDatasetComponentsStructClass; + err = chip::JniReferences::GetInstance().GetClassRef( + env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents", + operationalDatasetComponentsStructClass); + if (err != CHIP_NO_ERROR) { - auto & entry_1 = iter_value_1.GetValue(); - jobject newElement_1; - jobject newElement_1_activeTimestampPresent; - std::string newElement_1_activeTimestampPresentClassName = "java/lang/Boolean"; - std::string newElement_1_activeTimestampPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_activeTimestampPresentClassName.c_str(), - newElement_1_activeTimestampPresentCtorSignature.c_str(), entry_1.activeTimestampPresent, - newElement_1_activeTimestampPresent); - jobject newElement_1_pendingTimestampPresent; - std::string newElement_1_pendingTimestampPresentClassName = "java/lang/Boolean"; - std::string newElement_1_pendingTimestampPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_pendingTimestampPresentClassName.c_str(), - newElement_1_pendingTimestampPresentCtorSignature.c_str(), entry_1.pendingTimestampPresent, - newElement_1_pendingTimestampPresent); - jobject newElement_1_masterKeyPresent; - std::string newElement_1_masterKeyPresentClassName = "java/lang/Boolean"; - std::string newElement_1_masterKeyPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_masterKeyPresentClassName.c_str(), newElement_1_masterKeyPresentCtorSignature.c_str(), - entry_1.masterKeyPresent, newElement_1_masterKeyPresent); - jobject newElement_1_networkNamePresent; - std::string newElement_1_networkNamePresentClassName = "java/lang/Boolean"; - std::string newElement_1_networkNamePresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_networkNamePresentClassName.c_str(), newElement_1_networkNamePresentCtorSignature.c_str(), - entry_1.networkNamePresent, newElement_1_networkNamePresent); - jobject newElement_1_extendedPanIdPresent; - std::string newElement_1_extendedPanIdPresentClassName = "java/lang/Boolean"; - std::string newElement_1_extendedPanIdPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_extendedPanIdPresentClassName.c_str(), newElement_1_extendedPanIdPresentCtorSignature.c_str(), - entry_1.extendedPanIdPresent, newElement_1_extendedPanIdPresent); - jobject newElement_1_meshLocalPrefixPresent; - std::string newElement_1_meshLocalPrefixPresentClassName = "java/lang/Boolean"; - std::string newElement_1_meshLocalPrefixPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_meshLocalPrefixPresentClassName.c_str(), - newElement_1_meshLocalPrefixPresentCtorSignature.c_str(), entry_1.meshLocalPrefixPresent, - newElement_1_meshLocalPrefixPresent); - jobject newElement_1_delayPresent; - std::string newElement_1_delayPresentClassName = "java/lang/Boolean"; - std::string newElement_1_delayPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_delayPresentClassName.c_str(), - newElement_1_delayPresentCtorSignature.c_str(), - entry_1.delayPresent, newElement_1_delayPresent); - jobject newElement_1_panIdPresent; - std::string newElement_1_panIdPresentClassName = "java/lang/Boolean"; - std::string newElement_1_panIdPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_panIdPresentClassName.c_str(), - newElement_1_panIdPresentCtorSignature.c_str(), - entry_1.panIdPresent, newElement_1_panIdPresent); - jobject newElement_1_channelPresent; - std::string newElement_1_channelPresentClassName = "java/lang/Boolean"; - std::string newElement_1_channelPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_channelPresentClassName.c_str(), - newElement_1_channelPresentCtorSignature.c_str(), - entry_1.channelPresent, newElement_1_channelPresent); - jobject newElement_1_pskcPresent; - std::string newElement_1_pskcPresentClassName = "java/lang/Boolean"; - std::string newElement_1_pskcPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_pskcPresentClassName.c_str(), - newElement_1_pskcPresentCtorSignature.c_str(), - entry_1.pskcPresent, newElement_1_pskcPresent); - jobject newElement_1_securityPolicyPresent; - std::string newElement_1_securityPolicyPresentClassName = "java/lang/Boolean"; - std::string newElement_1_securityPolicyPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_securityPolicyPresentClassName.c_str(), - newElement_1_securityPolicyPresentCtorSignature.c_str(), entry_1.securityPolicyPresent, - newElement_1_securityPolicyPresent); - jobject newElement_1_channelMaskPresent; - std::string newElement_1_channelMaskPresentClassName = "java/lang/Boolean"; - std::string newElement_1_channelMaskPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_channelMaskPresentClassName.c_str(), newElement_1_channelMaskPresentCtorSignature.c_str(), - entry_1.channelMaskPresent, newElement_1_channelMaskPresent); - - jclass operationalDatasetComponentsStructClass; - err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents", - operationalDatasetComponentsStructClass); - if (err != CHIP_NO_ERROR) - { - ChipLogError( - Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents"); - return nullptr; - } - jmethodID operationalDatasetComponentsStructCtor = - env->GetMethodID(operationalDatasetComponentsStructClass, "", - "(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/" - "Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/" - "Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V"); - if (operationalDatasetComponentsStructCtor == nullptr) - { - ChipLogError( - Zcl, - "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents constructor"); - return nullptr; - } - - newElement_1 = env->NewObject( - operationalDatasetComponentsStructClass, operationalDatasetComponentsStructCtor, - newElement_1_activeTimestampPresent, newElement_1_pendingTimestampPresent, newElement_1_masterKeyPresent, - newElement_1_networkNamePresent, newElement_1_extendedPanIdPresent, newElement_1_meshLocalPrefixPresent, - newElement_1_delayPresent, newElement_1_panIdPresent, newElement_1_channelPresent, newElement_1_pskcPresent, - newElement_1_securityPolicyPresent, newElement_1_channelMaskPresent); - chip::JniReferences::GetInstance().AddToList(value, newElement_1); + ChipLogError(Zcl, + "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents"); + return nullptr; + } + jmethodID operationalDatasetComponentsStructCtor = + env->GetMethodID(operationalDatasetComponentsStructClass, "", + "(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/" + "Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/" + "lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V"); + if (operationalDatasetComponentsStructCtor == nullptr) + { + ChipLogError( + Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents constructor"); + return nullptr; } + + value = env->NewObject(operationalDatasetComponentsStructClass, operationalDatasetComponentsStructCtor, + value_activeTimestampPresent, value_pendingTimestampPresent, value_masterKeyPresent, + value_networkNamePresent, value_extendedPanIdPresent, value_meshLocalPrefixPresent, + value_delayPresent, value_panIdPresent, value_channelPresent, value_pskcPresent, + value_securityPolicyPresent, value_channelMaskPresent); } return value; } diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h index b897201166c6ff..2198662bfd149c 100644 --- a/src/controller/java/zap-generated/CHIPCallbackTypes.h +++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h @@ -1767,12 +1767,11 @@ typedef void (*CHIPThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallb typedef void (*CHIPThreadNetworkDiagnosticsClusterDelayAttributeCallbackType)( void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo::DecodableArgType); typedef void (*CHIPThreadNetworkDiagnosticsClusterSecurityPolicyAttributeCallbackType)( - void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo::DecodableType &); + void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo::DecodableArgType); typedef void (*CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType)( void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo::DecodableArgType); typedef void (*CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponentsAttributeCallbackType)( - void *, - const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo::DecodableType &); + void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo::DecodableArgType); typedef void (*CHIPThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallbackType)( void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::TypeInfo::DecodableType &); typedef void (*CHIPThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType)( diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 35a915459cd205..69ac0e6ee30555 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -23841,8 +23841,8 @@ CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::~CHIPThreadNetworkDiag env->DeleteGlobalRef(javaCallbackRef); } -void CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) +void CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CallbackFn( + void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -23872,7 +23872,7 @@ void CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CallbackFn(void * std::string javaValueClassName = "java/lang/Integer"; std::string javaValueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), - value.Value(), javaValue); + static_cast(value.Value()), javaValue); } env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); @@ -25015,112 +25015,6 @@ void CHIPThreadNetworkDiagnosticsDelayAttributeCallback::CallbackFn(void * conte env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback::CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback::~CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback() -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -} - -void CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback::CallbackFn( - void * context, - const chip::app::DataModel::Nullable> & list) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); - - // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. - javaCallbackRef = cppCallback.get()->javaCallbackRef; - VerifyOrReturn(javaCallbackRef != nullptr, - ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); - - jmethodID javaMethod; - err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); - - jobject arrayListObj; - if (list.IsNull()) - { - arrayListObj = nullptr; - } - else - { - chip::JniReferences::GetInstance().CreateArrayList(arrayListObj); - - auto iter_arrayListObj_1 = list.Value().begin(); - while (iter_arrayListObj_1.Next()) - { - auto & entry_1 = iter_arrayListObj_1.GetValue(); - jobject newElement_1; - jobject newElement_1_rotationTime; - std::string newElement_1_rotationTimeClassName = "java/lang/Integer"; - std::string newElement_1_rotationTimeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_rotationTimeClassName.c_str(), - newElement_1_rotationTimeCtorSignature.c_str(), - entry_1.rotationTime, newElement_1_rotationTime); - jobject newElement_1_flags; - std::string newElement_1_flagsClassName = "java/lang/Integer"; - std::string newElement_1_flagsCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_flagsClassName.c_str(), newElement_1_flagsCtorSignature.c_str(), entry_1.flags, newElement_1_flags); - - jclass securityPolicyStructClass; - err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy", securityPolicyStructClass); - if (err != CHIP_NO_ERROR) - { - ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy"); - return; - } - jmethodID securityPolicyStructCtor = - env->GetMethodID(securityPolicyStructClass, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); - if (securityPolicyStructCtor == nullptr) - { - ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy constructor"); - return; - } - - newElement_1 = - env->NewObject(securityPolicyStructClass, securityPolicyStructCtor, newElement_1_rotationTime, newElement_1_flags); - chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_1); - } - } - - env->ExceptionClear(); - env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); -} - CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback( jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), @@ -25188,184 +25082,6 @@ void CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback:: - CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, - this), - keepAlive(keepAlive) -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback:: - ~CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback() -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -} - -void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback::CallbackFn( - void * context, - const chip::app::DataModel::Nullable> & list) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); - - // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. - javaCallbackRef = cppCallback.get()->javaCallbackRef; - VerifyOrReturn(javaCallbackRef != nullptr, - ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); - - jmethodID javaMethod; - err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); - - jobject arrayListObj; - if (list.IsNull()) - { - arrayListObj = nullptr; - } - else - { - chip::JniReferences::GetInstance().CreateArrayList(arrayListObj); - - auto iter_arrayListObj_1 = list.Value().begin(); - while (iter_arrayListObj_1.Next()) - { - auto & entry_1 = iter_arrayListObj_1.GetValue(); - jobject newElement_1; - jobject newElement_1_activeTimestampPresent; - std::string newElement_1_activeTimestampPresentClassName = "java/lang/Boolean"; - std::string newElement_1_activeTimestampPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_activeTimestampPresentClassName.c_str(), newElement_1_activeTimestampPresentCtorSignature.c_str(), - entry_1.activeTimestampPresent, newElement_1_activeTimestampPresent); - jobject newElement_1_pendingTimestampPresent; - std::string newElement_1_pendingTimestampPresentClassName = "java/lang/Boolean"; - std::string newElement_1_pendingTimestampPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_pendingTimestampPresentClassName.c_str(), newElement_1_pendingTimestampPresentCtorSignature.c_str(), - entry_1.pendingTimestampPresent, newElement_1_pendingTimestampPresent); - jobject newElement_1_masterKeyPresent; - std::string newElement_1_masterKeyPresentClassName = "java/lang/Boolean"; - std::string newElement_1_masterKeyPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_masterKeyPresentClassName.c_str(), - newElement_1_masterKeyPresentCtorSignature.c_str(), - entry_1.masterKeyPresent, newElement_1_masterKeyPresent); - jobject newElement_1_networkNamePresent; - std::string newElement_1_networkNamePresentClassName = "java/lang/Boolean"; - std::string newElement_1_networkNamePresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_networkNamePresentClassName.c_str(), - newElement_1_networkNamePresentCtorSignature.c_str(), - entry_1.networkNamePresent, newElement_1_networkNamePresent); - jobject newElement_1_extendedPanIdPresent; - std::string newElement_1_extendedPanIdPresentClassName = "java/lang/Boolean"; - std::string newElement_1_extendedPanIdPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_extendedPanIdPresentClassName.c_str(), newElement_1_extendedPanIdPresentCtorSignature.c_str(), - entry_1.extendedPanIdPresent, newElement_1_extendedPanIdPresent); - jobject newElement_1_meshLocalPrefixPresent; - std::string newElement_1_meshLocalPrefixPresentClassName = "java/lang/Boolean"; - std::string newElement_1_meshLocalPrefixPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_meshLocalPrefixPresentClassName.c_str(), newElement_1_meshLocalPrefixPresentCtorSignature.c_str(), - entry_1.meshLocalPrefixPresent, newElement_1_meshLocalPrefixPresent); - jobject newElement_1_delayPresent; - std::string newElement_1_delayPresentClassName = "java/lang/Boolean"; - std::string newElement_1_delayPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_delayPresentClassName.c_str(), - newElement_1_delayPresentCtorSignature.c_str(), - entry_1.delayPresent, newElement_1_delayPresent); - jobject newElement_1_panIdPresent; - std::string newElement_1_panIdPresentClassName = "java/lang/Boolean"; - std::string newElement_1_panIdPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_panIdPresentClassName.c_str(), - newElement_1_panIdPresentCtorSignature.c_str(), - entry_1.panIdPresent, newElement_1_panIdPresent); - jobject newElement_1_channelPresent; - std::string newElement_1_channelPresentClassName = "java/lang/Boolean"; - std::string newElement_1_channelPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_channelPresentClassName.c_str(), - newElement_1_channelPresentCtorSignature.c_str(), - entry_1.channelPresent, newElement_1_channelPresent); - jobject newElement_1_pskcPresent; - std::string newElement_1_pskcPresentClassName = "java/lang/Boolean"; - std::string newElement_1_pskcPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_pskcPresentClassName.c_str(), - newElement_1_pskcPresentCtorSignature.c_str(), - entry_1.pskcPresent, newElement_1_pskcPresent); - jobject newElement_1_securityPolicyPresent; - std::string newElement_1_securityPolicyPresentClassName = "java/lang/Boolean"; - std::string newElement_1_securityPolicyPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_1_securityPolicyPresentClassName.c_str(), newElement_1_securityPolicyPresentCtorSignature.c_str(), - entry_1.securityPolicyPresent, newElement_1_securityPolicyPresent); - jobject newElement_1_channelMaskPresent; - std::string newElement_1_channelMaskPresentClassName = "java/lang/Boolean"; - std::string newElement_1_channelMaskPresentCtorSignature = "(Z)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_channelMaskPresentClassName.c_str(), - newElement_1_channelMaskPresentCtorSignature.c_str(), - entry_1.channelMaskPresent, newElement_1_channelMaskPresent); - - jclass operationalDatasetComponentsStructClass; - err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents", - operationalDatasetComponentsStructClass); - if (err != CHIP_NO_ERROR) - { - ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents"); - return; - } - jmethodID operationalDatasetComponentsStructCtor = - env->GetMethodID(operationalDatasetComponentsStructClass, "", - "(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/" - "Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/" - "Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V"); - if (operationalDatasetComponentsStructCtor == nullptr) - { - ChipLogError(Zcl, - "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents constructor"); - return; - } - - newElement_1 = env->NewObject( - operationalDatasetComponentsStructClass, operationalDatasetComponentsStructCtor, - newElement_1_activeTimestampPresent, newElement_1_pendingTimestampPresent, newElement_1_masterKeyPresent, - newElement_1_networkNamePresent, newElement_1_extendedPanIdPresent, newElement_1_meshLocalPrefixPresent, - newElement_1_delayPresent, newElement_1_panIdPresent, newElement_1_channelPresent, newElement_1_pskcPresent, - newElement_1_securityPolicyPresent, newElement_1_channelMaskPresent); - chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_1); - } - } - - env->ExceptionClear(); - env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); -} - CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback:: CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback(jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index 3bb525d8341de2..0a7f9506355e47 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -9799,7 +9799,9 @@ class CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback } } - static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); + static void + CallbackFn(void * context, + const chip::app::DataModel::Nullable & value); static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( @@ -10236,38 +10238,6 @@ class CHIPThreadNetworkDiagnosticsDelayAttributeCallback bool keepAlive; }; -class CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback - : public chip::Callback::Callback -{ -public: - CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback(jobject javaCallback, bool keepAlive = false); - - ~CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback(); - - static void maybeDestroy(CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback * callback) - { - if (!callback->keepAlive) - { - callback->Cancel(); - chip::Platform::Delete(callback); - } - } - - static void CallbackFn(void * context, - const chip::app::DataModel::Nullable> & list); - static void OnSubscriptionEstablished(void * context) - { - CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); - }; - -private: - jobject javaCallbackRef; - bool keepAlive; -}; - class CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback : public chip::Callback::Callback { @@ -10298,40 +10268,6 @@ class CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback bool keepAlive; }; -class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback - : public chip::Callback::Callback -{ -public: - CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback(jobject javaCallback, bool keepAlive = false); - - ~CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback(); - - static void maybeDestroy(CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback * callback) - { - if (!callback->keepAlive) - { - callback->Cancel(); - chip::Platform::Delete(callback); - } - } - - static void - CallbackFn(void * context, - const chip::app::DataModel::Nullable> & list); - static void OnSubscriptionEstablished(void * context) - { - CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context) - ->javaCallbackRef); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); - }; - -private: - jobject javaCallbackRef; - bool keepAlive; -}; - class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback : public chip::Callback::Callback { diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 85f94060f6838a..88cff4a5909ec4 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -21693,15 +21693,6 @@ public interface DelayAttributeCallback { default void onSubscriptionEstablished() {} } - public interface SecurityPolicyAttributeCallback { - void onSuccess( - @Nullable List valueList); - - void onError(Exception ex); - - default void onSubscriptionEstablished() {} - } - public interface ChannelMaskAttributeCallback { void onSuccess(@Nullable byte[] value); @@ -21710,17 +21701,6 @@ public interface ChannelMaskAttributeCallback { default void onSubscriptionEstablished() {} } - public interface OperationalDatasetComponentsAttributeCallback { - void onSuccess( - @Nullable - List - valueList); - - void onError(Exception ex); - - default void onSubscriptionEstablished() {} - } - public interface ActiveNetworkFaultsListAttributeCallback { void onSuccess(List valueList); @@ -22289,15 +22269,6 @@ public void subscribeDelayAttribute( subscribeDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - public void readSecurityPolicyAttribute(SecurityPolicyAttributeCallback callback) { - readSecurityPolicyAttribute(chipClusterPtr, callback); - } - - public void subscribeSecurityPolicyAttribute( - SecurityPolicyAttributeCallback callback, int minInterval, int maxInterval) { - subscribeSecurityPolicyAttribute(chipClusterPtr, callback, minInterval, maxInterval); - } - public void readChannelMaskAttribute(ChannelMaskAttributeCallback callback) { readChannelMaskAttribute(chipClusterPtr, callback); } @@ -22307,17 +22278,6 @@ public void subscribeChannelMaskAttribute( subscribeChannelMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - public void readOperationalDatasetComponentsAttribute( - OperationalDatasetComponentsAttributeCallback callback) { - readOperationalDatasetComponentsAttribute(chipClusterPtr, callback); - } - - public void subscribeOperationalDatasetComponentsAttribute( - OperationalDatasetComponentsAttributeCallback callback, int minInterval, int maxInterval) { - subscribeOperationalDatasetComponentsAttribute( - chipClusterPtr, callback, minInterval, maxInterval); - } - public void readActiveNetworkFaultsListAttribute( ActiveNetworkFaultsListAttributeCallback callback) { readActiveNetworkFaultsListAttribute(chipClusterPtr, callback); @@ -22761,15 +22721,6 @@ private native void subscribePendingTimestampAttribute( private native void subscribeDelayAttribute( long chipClusterPtr, DelayAttributeCallback callback, int minInterval, int maxInterval); - private native void readSecurityPolicyAttribute( - long chipClusterPtr, SecurityPolicyAttributeCallback callback); - - private native void subscribeSecurityPolicyAttribute( - long chipClusterPtr, - SecurityPolicyAttributeCallback callback, - int minInterval, - int maxInterval); - private native void readChannelMaskAttribute( long chipClusterPtr, ChannelMaskAttributeCallback callback); @@ -22779,15 +22730,6 @@ private native void subscribeChannelMaskAttribute( int minInterval, int maxInterval); - private native void readOperationalDatasetComponentsAttribute( - long chipClusterPtr, OperationalDatasetComponentsAttributeCallback callback); - - private native void subscribeOperationalDatasetComponentsAttribute( - long chipClusterPtr, - OperationalDatasetComponentsAttributeCallback callback, - int minInterval, - int maxInterval); - private native void readActiveNetworkFaultsListAttribute( long chipClusterPtr, ActiveNetworkFaultsListAttributeCallback callback); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 6f8877bcb055d5..5e0e1dd936e447 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -6576,65 +6576,6 @@ public void onError(Exception ex) { } } - public static class DelegatedThreadNetworkDiagnosticsClusterSecurityPolicyAttributeCallback - implements ChipClusters.ThreadNetworkDiagnosticsCluster.SecurityPolicyAttributeCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess( - @Nullable List valueList) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo commandResponseInfo = - new CommandResponseInfo( - "valueList", "List"); - responseValues.put(commandResponseInfo, valueList); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception ex) { - callback.onFailure(ex); - } - } - - public static - class DelegatedThreadNetworkDiagnosticsClusterOperationalDatasetComponentsAttributeCallback - implements ChipClusters.ThreadNetworkDiagnosticsCluster - .OperationalDatasetComponentsAttributeCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess( - @Nullable - List - valueList) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo commandResponseInfo = - new CommandResponseInfo( - "valueList", - "List"); - responseValues.put(commandResponseInfo, valueList); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception ex) { - callback.onFailure(ex); - } - } - public static class DelegatedThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java index e73a8b192f4905..1f3ea30bd5669e 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java @@ -11055,23 +11055,6 @@ public Map> getReadAttributeMap() { readThreadNetworkDiagnosticsDelayCommandParams); readThreadNetworkDiagnosticsInteractionInfo.put( "readDelayAttribute", readThreadNetworkDiagnosticsDelayAttributeInteractionInfo); - Map readThreadNetworkDiagnosticsSecurityPolicyCommandParams = - new LinkedHashMap(); - InteractionInfo readThreadNetworkDiagnosticsSecurityPolicyAttributeInteractionInfo = - new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster) - .readSecurityPolicyAttribute( - (ChipClusters.ThreadNetworkDiagnosticsCluster.SecurityPolicyAttributeCallback) - callback); - }, - () -> - new ClusterInfoMapping - .DelegatedThreadNetworkDiagnosticsClusterSecurityPolicyAttributeCallback(), - readThreadNetworkDiagnosticsSecurityPolicyCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( - "readSecurityPolicyAttribute", - readThreadNetworkDiagnosticsSecurityPolicyAttributeInteractionInfo); Map readThreadNetworkDiagnosticsChannelMaskCommandParams = new LinkedHashMap(); InteractionInfo readThreadNetworkDiagnosticsChannelMaskAttributeInteractionInfo = @@ -11087,26 +11070,6 @@ public Map> getReadAttributeMap() { readThreadNetworkDiagnosticsInteractionInfo.put( "readChannelMaskAttribute", readThreadNetworkDiagnosticsChannelMaskAttributeInteractionInfo); - Map - readThreadNetworkDiagnosticsOperationalDatasetComponentsCommandParams = - new LinkedHashMap(); - InteractionInfo - readThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeInteractionInfo = - new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster) - .readOperationalDatasetComponentsAttribute( - (ChipClusters.ThreadNetworkDiagnosticsCluster - .OperationalDatasetComponentsAttributeCallback) - callback); - }, - () -> - new ClusterInfoMapping - .DelegatedThreadNetworkDiagnosticsClusterOperationalDatasetComponentsAttributeCallback(), - readThreadNetworkDiagnosticsOperationalDatasetComponentsCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( - "readOperationalDatasetComponentsAttribute", - readThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeInteractionInfo); Map readThreadNetworkDiagnosticsActiveNetworkFaultsListCommandParams = new LinkedHashMap(); diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index d19399bb790d6a..acd28493af0148 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -10928,7 +10928,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="channel", Tag=0x00000000, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="routingRole", Tag=0x00000001, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="routingRole", Tag=0x00000001, Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRole]), ClusterObjectFieldDescriptor(Label="networkName", Tag=0x00000002, Type=typing.Union[Nullable, str]), ClusterObjectFieldDescriptor(Label="panId", Tag=0x00000003, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="extendedPanId", Tag=0x00000004, Type=typing.Union[Nullable, uint]), @@ -10986,9 +10986,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="activeTimestamp", Tag=0x00000038, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="pendingTimestamp", Tag=0x00000039, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="delay", Tag=0x0000003A, Type=typing.Union[None, Nullable, uint]), - ClusterObjectFieldDescriptor(Label="securityPolicy", Tag=0x0000003B, Type=typing.Union[Nullable, typing.List[ThreadNetworkDiagnostics.Structs.SecurityPolicy]]), + ClusterObjectFieldDescriptor(Label="securityPolicy", Tag=0x0000003B, Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy]), ClusterObjectFieldDescriptor(Label="channelMask", Tag=0x0000003C, Type=typing.Union[Nullable, bytes]), - ClusterObjectFieldDescriptor(Label="operationalDatasetComponents", Tag=0x0000003D, Type=typing.Union[Nullable, typing.List[ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]]), + ClusterObjectFieldDescriptor(Label="operationalDatasetComponents", Tag=0x0000003D, Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]), ClusterObjectFieldDescriptor(Label="activeNetworkFaultsList", Tag=0x0000003E, Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), @@ -10998,7 +10998,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ]) channel: 'typing.Union[Nullable, uint]' = None - routingRole: 'typing.Union[Nullable, uint]' = None + routingRole: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRole]' = None networkName: 'typing.Union[Nullable, str]' = None panId: 'typing.Union[Nullable, uint]' = None extendedPanId: 'typing.Union[Nullable, uint]' = None @@ -11056,9 +11056,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: activeTimestamp: 'typing.Union[None, Nullable, uint]' = None pendingTimestamp: 'typing.Union[None, Nullable, uint]' = None delay: 'typing.Union[None, Nullable, uint]' = None - securityPolicy: 'typing.Union[Nullable, typing.List[ThreadNetworkDiagnostics.Structs.SecurityPolicy]]' = None + securityPolicy: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy]' = None channelMask: 'typing.Union[Nullable, bytes]' = None - operationalDatasetComponents: 'typing.Union[Nullable, typing.List[ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]]' = None + operationalDatasetComponents: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]' = None activeNetworkFaultsList: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None @@ -11246,9 +11246,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint]) + return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRole]) - value: 'typing.Union[Nullable, uint]' = NullValue + value: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRole]' = NullValue @dataclass class NetworkName(ClusterAttributeDescriptor): @@ -12174,9 +12174,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, typing.List[ThreadNetworkDiagnostics.Structs.SecurityPolicy]]) + return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy]) - value: 'typing.Union[Nullable, typing.List[ThreadNetworkDiagnostics.Structs.SecurityPolicy]]' = NullValue + value: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy]' = NullValue @dataclass class ChannelMask(ClusterAttributeDescriptor): @@ -12206,9 +12206,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, typing.List[ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]]) + return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]) - value: 'typing.Union[Nullable, typing.List[ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]]' = NullValue + value: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]' = NullValue @dataclass class ActiveNetworkFaultsList(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm index 3959bb810d7425..5c83256a9f656a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm @@ -15161,7 +15161,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader if (cppValue.IsNull()) { value = nil; } else { - value = [NSNumber numberWithUnsignedChar:cppValue.Value()]; + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())]; } return value; } @@ -15911,28 +15911,13 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader if (*aError != CHIP_NO_ERROR) { return nil; } - NSArray * _Nullable value; + CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value; if (cppValue.IsNull()) { value = nil; } else { - { // Scope for our temporary variables - auto * array_1 = [NSMutableArray new]; - auto iter_1 = cppValue.Value().begin(); - while (iter_1.Next()) { - auto & entry_1 = iter_1.GetValue(); - CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * newElement_1; - newElement_1 = [CHIPThreadNetworkDiagnosticsClusterSecurityPolicy new]; - newElement_1.rotationTime = [NSNumber numberWithUnsignedShort:entry_1.rotationTime]; - newElement_1.flags = [NSNumber numberWithUnsignedShort:entry_1.flags]; - [array_1 addObject:newElement_1]; - } - CHIP_ERROR err = iter_1.GetStatus(); - if (err != CHIP_NO_ERROR) { - *aError = err; - return nil; - } - value = array_1; - } + value = [CHIPThreadNetworkDiagnosticsClusterSecurityPolicy new]; + value.rotationTime = [NSNumber numberWithUnsignedShort:cppValue.Value().rotationTime]; + value.flags = [NSNumber numberWithUnsignedShort:cppValue.Value().flags]; } return value; } @@ -15958,38 +15943,23 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader if (*aError != CHIP_NO_ERROR) { return nil; } - NSArray * _Nullable value; + CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value; if (cppValue.IsNull()) { value = nil; } else { - { // Scope for our temporary variables - auto * array_1 = [NSMutableArray new]; - auto iter_1 = cppValue.Value().begin(); - while (iter_1.Next()) { - auto & entry_1 = iter_1.GetValue(); - CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * newElement_1; - newElement_1 = [CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents new]; - newElement_1.activeTimestampPresent = [NSNumber numberWithBool:entry_1.activeTimestampPresent]; - newElement_1.pendingTimestampPresent = [NSNumber numberWithBool:entry_1.pendingTimestampPresent]; - newElement_1.masterKeyPresent = [NSNumber numberWithBool:entry_1.masterKeyPresent]; - newElement_1.networkNamePresent = [NSNumber numberWithBool:entry_1.networkNamePresent]; - newElement_1.extendedPanIdPresent = [NSNumber numberWithBool:entry_1.extendedPanIdPresent]; - newElement_1.meshLocalPrefixPresent = [NSNumber numberWithBool:entry_1.meshLocalPrefixPresent]; - newElement_1.delayPresent = [NSNumber numberWithBool:entry_1.delayPresent]; - newElement_1.panIdPresent = [NSNumber numberWithBool:entry_1.panIdPresent]; - newElement_1.channelPresent = [NSNumber numberWithBool:entry_1.channelPresent]; - newElement_1.pskcPresent = [NSNumber numberWithBool:entry_1.pskcPresent]; - newElement_1.securityPolicyPresent = [NSNumber numberWithBool:entry_1.securityPolicyPresent]; - newElement_1.channelMaskPresent = [NSNumber numberWithBool:entry_1.channelMaskPresent]; - [array_1 addObject:newElement_1]; - } - CHIP_ERROR err = iter_1.GetStatus(); - if (err != CHIP_NO_ERROR) { - *aError = err; - return nil; - } - value = array_1; - } + value = [CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents new]; + value.activeTimestampPresent = [NSNumber numberWithBool:cppValue.Value().activeTimestampPresent]; + value.pendingTimestampPresent = [NSNumber numberWithBool:cppValue.Value().pendingTimestampPresent]; + value.masterKeyPresent = [NSNumber numberWithBool:cppValue.Value().masterKeyPresent]; + value.networkNamePresent = [NSNumber numberWithBool:cppValue.Value().networkNamePresent]; + value.extendedPanIdPresent = [NSNumber numberWithBool:cppValue.Value().extendedPanIdPresent]; + value.meshLocalPrefixPresent = [NSNumber numberWithBool:cppValue.Value().meshLocalPrefixPresent]; + value.delayPresent = [NSNumber numberWithBool:cppValue.Value().delayPresent]; + value.panIdPresent = [NSNumber numberWithBool:cppValue.Value().panIdPresent]; + value.channelPresent = [NSNumber numberWithBool:cppValue.Value().channelPresent]; + value.pskcPresent = [NSNumber numberWithBool:cppValue.Value().pskcPresent]; + value.securityPolicyPresent = [NSNumber numberWithBool:cppValue.Value().securityPolicyPresent]; + value.channelMaskPresent = [NSNumber numberWithBool:cppValue.Value().channelMaskPresent]; } return value; } diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm index 2e31d08f6d27c7..556fae9870fe8b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -10514,39 +10514,24 @@ } } -void CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::Nullable> & value) +void CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & + value) { - NSArray * _Nullable objCValue; + CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable objCValue; if (value.IsNull()) { objCValue = nil; } else { - { // Scope for our temporary variables - auto * array_1 = [NSMutableArray new]; - auto iter_1 = value.Value().begin(); - while (iter_1.Next()) { - auto & entry_1 = iter_1.GetValue(); - CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * newElement_1; - newElement_1 = [CHIPThreadNetworkDiagnosticsClusterSecurityPolicy new]; - newElement_1.rotationTime = [NSNumber numberWithUnsignedShort:entry_1.rotationTime]; - newElement_1.flags = [NSNumber numberWithUnsignedShort:entry_1.flags]; - [array_1 addObject:newElement_1]; - } - CHIP_ERROR err = iter_1.GetStatus(); - if (err != CHIP_NO_ERROR) { - OnFailureFn(context, err); - return; - } - objCValue = array_1; - } + objCValue = [CHIPThreadNetworkDiagnosticsClusterSecurityPolicy new]; + objCValue.rotationTime = [NSNumber numberWithUnsignedShort:value.Value().rotationTime]; + objCValue.flags = [NSNumber numberWithUnsignedShort:value.Value().flags]; } DispatchSuccess(context, objCValue); }; -void CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -10560,51 +10545,36 @@ } } -void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::Nullable> & value) +void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::Nullable< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & value) { - NSArray * _Nullable objCValue; + CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable objCValue; if (value.IsNull()) { objCValue = nil; } else { - { // Scope for our temporary variables - auto * array_1 = [NSMutableArray new]; - auto iter_1 = value.Value().begin(); - while (iter_1.Next()) { - auto & entry_1 = iter_1.GetValue(); - CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * newElement_1; - newElement_1 = [CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents new]; - newElement_1.activeTimestampPresent = [NSNumber numberWithBool:entry_1.activeTimestampPresent]; - newElement_1.pendingTimestampPresent = [NSNumber numberWithBool:entry_1.pendingTimestampPresent]; - newElement_1.masterKeyPresent = [NSNumber numberWithBool:entry_1.masterKeyPresent]; - newElement_1.networkNamePresent = [NSNumber numberWithBool:entry_1.networkNamePresent]; - newElement_1.extendedPanIdPresent = [NSNumber numberWithBool:entry_1.extendedPanIdPresent]; - newElement_1.meshLocalPrefixPresent = [NSNumber numberWithBool:entry_1.meshLocalPrefixPresent]; - newElement_1.delayPresent = [NSNumber numberWithBool:entry_1.delayPresent]; - newElement_1.panIdPresent = [NSNumber numberWithBool:entry_1.panIdPresent]; - newElement_1.channelPresent = [NSNumber numberWithBool:entry_1.channelPresent]; - newElement_1.pskcPresent = [NSNumber numberWithBool:entry_1.pskcPresent]; - newElement_1.securityPolicyPresent = [NSNumber numberWithBool:entry_1.securityPolicyPresent]; - newElement_1.channelMaskPresent = [NSNumber numberWithBool:entry_1.channelMaskPresent]; - [array_1 addObject:newElement_1]; - } - CHIP_ERROR err = iter_1.GetStatus(); - if (err != CHIP_NO_ERROR) { - OnFailureFn(context, err); - return; - } - objCValue = array_1; - } + objCValue = [CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents new]; + objCValue.activeTimestampPresent = [NSNumber numberWithBool:value.Value().activeTimestampPresent]; + objCValue.pendingTimestampPresent = [NSNumber numberWithBool:value.Value().pendingTimestampPresent]; + objCValue.masterKeyPresent = [NSNumber numberWithBool:value.Value().masterKeyPresent]; + objCValue.networkNamePresent = [NSNumber numberWithBool:value.Value().networkNamePresent]; + objCValue.extendedPanIdPresent = [NSNumber numberWithBool:value.Value().extendedPanIdPresent]; + objCValue.meshLocalPrefixPresent = [NSNumber numberWithBool:value.Value().meshLocalPrefixPresent]; + objCValue.delayPresent = [NSNumber numberWithBool:value.Value().delayPresent]; + objCValue.panIdPresent = [NSNumber numberWithBool:value.Value().panIdPresent]; + objCValue.channelPresent = [NSNumber numberWithBool:value.Value().channelPresent]; + objCValue.pskcPresent = [NSNumber numberWithBool:value.Value().pskcPresent]; + objCValue.securityPolicyPresent = [NSNumber numberWithBool:value.Value().securityPolicyPresent]; + objCValue.channelMaskPresent = [NSNumber numberWithBool:value.Value().channelMaskPresent]; } DispatchSuccess(context, objCValue); }; -void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( +void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( void * context) { auto * self - = static_cast(context); + = static_cast(context); if (!self->mQueue) { return; } diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h index e5b4149e3d63a5..dea4bce64e665d 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h @@ -1121,14 +1121,13 @@ typedef void (*ThreadNetworkDiagnosticsRouteTableListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback)( - void * context, - const chip::app::DataModel::Nullable> & data); -typedef void (*ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback)( - void * context, - const chip::app::DataModel::Nullable> & data); +typedef void (*ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback)( + void *, + const chip::app::DataModel::Nullable &); +typedef void (*ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback)( + void *, + const chip::app::DataModel::Nullable< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> &); typedef void (*ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback)( @@ -8865,28 +8864,28 @@ class CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptio SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable> & value); + const chip::app::DataModel::Nullable< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & value); }; -class CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionBridge - : public CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge +class CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge + : public CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge { public: - CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionBridge( + CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge(queue, handler, action, true), + CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -8896,31 +8895,31 @@ class CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptio SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, - OnSuccessFn, keepAlive){}; + CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + CHIPActionBlock action, + bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, + OnSuccessFn, keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable> & value); + const chip::app::DataModel::Nullable< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & value); }; -class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackSubscriptionBridge - : public CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge +class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge + : public CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge { public: - CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackSubscriptionBridge( + CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge(queue, handler, action, true), + CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h index d50d0de52ae203..e4de2f823bca18 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h @@ -19878,8 +19878,8 @@ NS_ASSUME_NONNULL_BEGIN queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributeSecurityPolicyWithCompletionHandler:(void (^)(NSArray * _Nullable value, - NSError * _Nullable error))completionHandler; +- (void)readAttributeSecurityPolicyWithCompletionHandler: + (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error))completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. @@ -19889,12 +19889,13 @@ NS_ASSUME_NONNULL_BEGIN params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler: - (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler; + (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, + NSError * _Nullable error))reportHandler; + (void)readAttributeSecurityPolicyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue - completionHandler: - (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler; + completionHandler:(void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, + NSError * _Nullable error))completionHandler; - (void)readAttributeChannelMaskWithCompletionHandler:(void (^)( NSData * _Nullable value, NSError * _Nullable error))completionHandler; @@ -19912,24 +19913,31 @@ NS_ASSUME_NONNULL_BEGIN queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler:(void (^)(NSArray * _Nullable value, - NSError * _Nullable error))completionHandler; +- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler: + (void (^)(CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, + NSError * _Nullable error))completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. */ -- (void)subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval - maxInterval:(NSNumber * _Nonnull)maxInterval - params:(CHIPSubscribeParams * _Nullable)params - subscriptionEstablished: - (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler - reportHandler:(void (^)(NSArray * _Nullable value, - NSError * _Nullable error))reportHandler; -+ (void)readAttributeOperationalDatasetComponentsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer - endpoint:(NSNumber *)endpoint - queue:(dispatch_queue_t)queue - completionHandler:(void (^)(NSArray * _Nullable value, - NSError * _Nullable error))completionHandler; +- (void) + subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished: + (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)( + CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, + NSError * _Nullable error))reportHandler; ++ (void) + readAttributeOperationalDatasetComponentsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)( + CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, + NSError * _Nullable error))completionHandler; - (void)readAttributeActiveNetworkFaultsListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm index 1855f3d6fe0daa..7d2dd1208472f2 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -73718,10 +73718,10 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel - (void)readAttributeRoutingRoleWithCompletionHandler:(void (^)( NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPNullableInt8uAttributeCallbackBridge( + new CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo; - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); @@ -73733,7 +73733,7 @@ - (void)subscribeAttributeRoutingRoleWithMinInterval:(NSNumber * _Nonnull)minInt subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new CHIPNullableInt8uAttributeCallbackSubscriptionBridge( + new CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { @@ -73741,11 +73741,12 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge( return CHIP_ERROR_INVALID_ARGUMENT; } using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::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 unsignedShortValue], [maxInterval unsignedShortValue], - CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge:: + OnSubscriptionEstablished, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); }, @@ -73758,23 +73759,25 @@ + (void)readAttributeRoutingRoleWithAttributeCache:(CHIPAttributeCacheContainer completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - if (attributeCacheContainer.cppAttributeCache) { - chip::app::ConcreteAttributePath path; - using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo; - path.mEndpointId = static_cast([endpoint unsignedShortValue]); - path.mClusterId = TypeInfo::GetClusterId(); - path.mAttributeId = TypeInfo::GetAttributeId(); - TypeInfo::DecodableType value; - CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); - auto successFn = Callback::FromCancelable(success); - if (err == CHIP_NO_ERROR) { - successFn->mCall(successFn->mContext, value); + new CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge( + queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + if (attributeCacheContainer.cppAttributeCache) { + chip::app::ConcreteAttributePath path; + using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo; + path.mEndpointId = static_cast([endpoint unsignedShortValue]); + path.mClusterId = TypeInfo::GetClusterId(); + path.mAttributeId = TypeInfo::GetAttributeId(); + TypeInfo::DecodableType value; + CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); + auto successFn + = Callback::FromCancelable(success); + if (err == CHIP_NO_ERROR) { + successFn->mCall(successFn->mContext, value); + } + return err; } - return err; - } - return CHIP_ERROR_NOT_FOUND; - }); + return CHIP_ERROR_NOT_FOUND; + }); } - (void)readAttributeNetworkNameWithCompletionHandler:(void (^)( @@ -77320,13 +77323,13 @@ new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancel }); } -- (void)readAttributeSecurityPolicyWithCompletionHandler:(void (^)( - NSArray * _Nullable value, NSError * _Nullable error))completionHandler +- (void)readAttributeSecurityPolicyWithCompletionHandler: + (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge( + new CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo; - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); @@ -77337,9 +77340,10 @@ - (void)subscribeAttributeSecurityPolicyWithMinInterval:(NSNumber * _Nonnull)min params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler: - (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler + (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, + NSError * _Nullable error))reportHandler { - new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionBridge( + new CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { @@ -77347,11 +77351,11 @@ new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionB return CHIP_ERROR_INVALID_ARGUMENT; } using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::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 unsignedShortValue], [maxInterval unsignedShortValue], - CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); }, @@ -77361,10 +77365,10 @@ new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionB + (void)readAttributeSecurityPolicyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue - completionHandler: - (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler + completionHandler:(void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, + NSError * _Nullable error))completionHandler { - new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge( + new CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge( queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; @@ -77374,7 +77378,7 @@ new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge( path.mAttributeId = TypeInfo::GetAttributeId(); TypeInfo::DecodableType value; CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); if (err == CHIP_NO_ERROR) { successFn->mCall(successFn->mContext, value); } @@ -77445,28 +77449,32 @@ new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(C }); } -- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler:(void (^)(NSArray * _Nullable value, - NSError * _Nullable error))completionHandler +- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler: + (void (^)(CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, + NSError * _Nullable error))completionHandler { - new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge( + new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo; auto successFn - = Callback::FromCancelable(success); + = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval - maxInterval:(NSNumber * _Nonnull)maxInterval - params:(CHIPSubscribeParams * _Nullable)params - subscriptionEstablished: - (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler - reportHandler:(void (^)(NSArray * _Nullable value, - NSError * _Nullable error))reportHandler +- (void) + subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished: + (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)( + CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, + NSError * _Nullable error))reportHandler { - new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackSubscriptionBridge( + new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { @@ -77475,11 +77483,11 @@ new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbac } using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo; auto successFn - = Callback::FromCancelable(success); + = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], - CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackSubscriptionBridge:: + CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge:: OnSubscriptionEstablished, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); @@ -77487,13 +77495,16 @@ new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbac subscriptionEstablishedHandler); } -+ (void)readAttributeOperationalDatasetComponentsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer - endpoint:(NSNumber *)endpoint - queue:(dispatch_queue_t)queue - completionHandler:(void (^)(NSArray * _Nullable value, - NSError * _Nullable error))completionHandler ++ (void) + readAttributeOperationalDatasetComponentsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)( + CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, + NSError * _Nullable error))completionHandler { - new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge( + new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge( queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; @@ -77504,7 +77515,8 @@ new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbac TypeInfo::DecodableType value; CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); auto successFn - = Callback::FromCancelable(success); + = Callback::FromCancelable( + success); if (err == CHIP_NO_ERROR) { successFn->mCall(successFn->mContext, value); } diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp index 5d5ce4f5fe77cc..c3f13a25aef6d7 100644 --- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp +++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp @@ -1523,10 +1523,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread::_WriteThreadNetw securityPolicy.rotationTime = policyAsInts[0]; securityPolicy.flags = policyAsInts[1]; - err = encoder.EncodeList([securityPolicy](const auto & aEncoder) -> CHIP_ERROR { - ReturnErrorOnFailure(aEncoder.Encode(securityPolicy)); - return CHIP_NO_ERROR; - }); + err = encoder.Encode(securityPolicy); } } break; @@ -1576,10 +1573,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread::_WriteThreadNetw OpDatasetComponents.securityPolicyPresent = activeDataset.mComponents.mIsSecurityPolicyPresent; OpDatasetComponents.channelMaskPresent = activeDataset.mComponents.mIsChannelMaskPresent; - err = encoder.EncodeList([OpDatasetComponents](const auto & aEncoder) -> CHIP_ERROR { - ReturnErrorOnFailure(aEncoder.Encode(OpDatasetComponents)); - return CHIP_NO_ERROR; - }); + err = encoder.Encode(OpDatasetComponents); } } break; diff --git a/src/platform/webos/ThreadStackManagerImpl.cpp b/src/platform/webos/ThreadStackManagerImpl.cpp index 07f326615d8269..db26c22518157d 100644 --- a/src/platform/webos/ThreadStackManagerImpl.cpp +++ b/src/platform/webos/ThreadStackManagerImpl.cpp @@ -680,17 +680,17 @@ CHIP_ERROR ThreadStackManagerImpl::_WriteThreadNetworkDiagnosticAttributeToTlv(A { case ThreadNetworkDiagnostics::Attributes::NeighborTableList::Id: case ThreadNetworkDiagnostics::Attributes::RouteTableList::Id: + case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id: + err = encoder.EncodeEmptyList(); + break; case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id: case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id: - case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id: { - err = encoder.EncodeEmptyList(); + err = encoder.EncodeNull(); break; - } - default: { + default: err = CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE; break; } - } return err; } 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 e4270dc4b1c1a7..daa02592d8663b 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -658,11 +658,11 @@ ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \ { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* delay */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \ - { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \ diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h index 7b3b17f1865b22..0095ed968b3a61 100644 --- a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h @@ -470,11 +470,11 @@ ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */ \ { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \ - { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \ 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 6af0e3613dfe1d..9690744c1c1e44 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 @@ -8974,9 +8974,10 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl namespace RoutingRole { -EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) +EmberAfStatus Get(chip::EndpointId endpoint, + DataModel::Nullable & value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, readable, sizeof(temp)); @@ -8991,9 +8992,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & valu } return status; } -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -9006,14 +9007,15 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) EmberAfStatus SetNull(chip::EndpointId endpoint) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); } -EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +EmberAfStatus Set(chip::EndpointId endpoint, + const chip::app::DataModel::Nullable & value) { if (value.IsNull()) { 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 7c9b06e3ac06d7..1c18d071840ba8 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 @@ -1627,10 +1627,12 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl } // namespace Channel namespace RoutingRole { -EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // enum8 -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus Get(chip::EndpointId endpoint, + DataModel::Nullable & value); // RoutingRole +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole value); EmberAfStatus SetNull(chip::EndpointId endpoint); -EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); +EmberAfStatus Set(chip::EndpointId endpoint, + const chip::app::DataModel::Nullable & value); } // namespace RoutingRole namespace NetworkName { 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 4a617a39efb024..6b8d1e56ce07ed 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 @@ -12485,9 +12485,9 @@ struct TypeInfo namespace RoutingRole { struct TypeInfo { - using Type = chip::app::DataModel::Nullable; - using DecodableType = chip::app::DataModel::Nullable; - using DecodableArgType = const chip::app::DataModel::Nullable &; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::RoutingRole::Id; } @@ -13187,12 +13187,11 @@ struct TypeInfo namespace SecurityPolicy { struct TypeInfo { - using Type = chip::app::DataModel::Nullable< - chip::app::DataModel::List>; - using DecodableType = chip::app::DataModel::Nullable< - chip::app::DataModel::DecodableList>; - using DecodableArgType = const chip::app::DataModel::Nullable> &; + using Type = chip::app::DataModel::Nullable; + using DecodableType = + chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> &; static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SecurityPolicy::Id; } @@ -13215,12 +13214,12 @@ struct TypeInfo namespace OperationalDatasetComponents { struct TypeInfo { - using Type = chip::app::DataModel::Nullable>; - using DecodableType = chip::app::DataModel::Nullable>; - using DecodableArgType = const chip::app::DataModel::Nullable> &; + using Type = + chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType>; + using DecodableArgType = const chip::app::DataModel::Nullable< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> &; static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OperationalDatasetComponents::Id; } diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h index bfa8b7a7f1bae8..8afa704d8f49d3 100644 --- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h +++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h @@ -329,11 +329,11 @@ ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \ { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* delay */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \ - { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \ 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 5a606898d7eb3b..01a00669b1d938 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -9359,7 +9359,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("channel", 1, value); } case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id: { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("RoutingRole", 1, value); } @@ -9652,8 +9652,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("delay", 1, value); } case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id: { - chip::app::DataModel::Nullable> + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SecurityPolicy", 1, value); @@ -9664,8 +9663,8 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("ChannelMask", 1, value); } case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id: { - chip::app::DataModel::Nullable> + chip::app::DataModel::Nullable< + chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("OperationalDatasetComponents", 1, value); diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index f41c59751146ef..78ad505972b574 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -33440,7 +33440,7 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand case 3: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNull("routingRole", value)); } @@ -33448,7 +33448,7 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand case 4: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "", "RoutingRole")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0)); diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h index b3bf51fd7b2de1..a1ae4558ce883f 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -473,14 +473,6 @@ typedef void (*ThreadNetworkDiagnosticsRouteTableListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback)( - void * context, - const chip::app::DataModel::Nullable> & data); -typedef void (*ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback)( - void * context, - const chip::app::DataModel::Nullable> & data); typedef void (*ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback)( diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.h index d879eddb8b368e..6ba80ae8a0b606 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.h @@ -1449,9 +1449,11 @@ NS_ASSUME_NONNULL_BEGIN - (void)writeAttributeActiveTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributePendingTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeDelayWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeSecurityPolicyWithValue:(NSArray * _Nullable)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeSecurityPolicyWithValue:(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable)value + completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeChannelMaskWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeOperationalDatasetComponentsWithValue:(NSArray * _Nullable)value +- (void)writeAttributeOperationalDatasetComponentsWithValue: + (CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeActiveNetworkFaultsListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm b/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm index e209f7fbffb67d..c5d3f7608ce72f 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm @@ -18675,7 +18675,7 @@ new CHIPDefaultSuccessCallbackBridge( cppValue.SetNull(); } else { auto & nonNullValue_0 = cppValue.SetNonNull(); - nonNullValue_0 = value.unsignedCharValue; + nonNullValue_0 = static_cast>(value.unsignedCharValue); } auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); @@ -19853,7 +19853,8 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)writeAttributeSecurityPolicyWithValue:(NSArray * _Nullable)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeSecurityPolicyWithValue:(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable)value + completionHandler:(StatusCompletion)completionHandler { new CHIPDefaultSuccessCallbackBridge( self.callbackQueue, @@ -19868,29 +19869,8 @@ new CHIPDefaultSuccessCallbackBridge( cppValue.SetNull(); } else { auto & nonNullValue_0 = cppValue.SetNonNull(); - { - using ListType_1 = std::remove_reference_t; - using ListMemberType_1 = ListMemberTypeGetter::Type; - if (value.count != 0) { - auto * listHolder_1 = new ListHolder(value.count); - if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) { - return CHIP_ERROR_INVALID_ARGUMENT; - } - listFreer.add(listHolder_1); - for (size_t i_1 = 0; i_1 < value.count; ++i_1) { - if (![value[i_1] isKindOfClass:[CHIPThreadNetworkDiagnosticsClusterSecurityPolicy class]]) { - // Wrong kind of value. - return CHIP_ERROR_INVALID_ARGUMENT; - } - auto element_1 = (CHIPThreadNetworkDiagnosticsClusterSecurityPolicy *) value[i_1]; - listHolder_1->mList[i_1].rotationTime = element_1.rotationTime.unsignedShortValue; - listHolder_1->mList[i_1].flags = element_1.flags.unsignedShortValue; - } - nonNullValue_0 = ListType_1(listHolder_1->mList, value.count); - } else { - nonNullValue_0 = ListType_1(); - } - } + nonNullValue_0.rotationTime = value.rotationTime.unsignedShortValue; + nonNullValue_0.flags = value.flags.unsignedShortValue; } auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); @@ -19921,7 +19901,8 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)writeAttributeOperationalDatasetComponentsWithValue:(NSArray * _Nullable)value +- (void)writeAttributeOperationalDatasetComponentsWithValue: + (CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable)value completionHandler:(StatusCompletion)completionHandler { new CHIPDefaultSuccessCallbackBridge( @@ -19937,40 +19918,18 @@ new CHIPDefaultSuccessCallbackBridge( cppValue.SetNull(); } else { auto & nonNullValue_0 = cppValue.SetNonNull(); - { - using ListType_1 = std::remove_reference_t; - using ListMemberType_1 = ListMemberTypeGetter::Type; - if (value.count != 0) { - auto * listHolder_1 = new ListHolder(value.count); - if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) { - return CHIP_ERROR_INVALID_ARGUMENT; - } - listFreer.add(listHolder_1); - for (size_t i_1 = 0; i_1 < value.count; ++i_1) { - if (![value[i_1] - isKindOfClass:[CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents class]]) { - // Wrong kind of value. - return CHIP_ERROR_INVALID_ARGUMENT; - } - auto element_1 = (CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents *) value[i_1]; - listHolder_1->mList[i_1].activeTimestampPresent = element_1.activeTimestampPresent.boolValue; - listHolder_1->mList[i_1].pendingTimestampPresent = element_1.pendingTimestampPresent.boolValue; - listHolder_1->mList[i_1].masterKeyPresent = element_1.masterKeyPresent.boolValue; - listHolder_1->mList[i_1].networkNamePresent = element_1.networkNamePresent.boolValue; - listHolder_1->mList[i_1].extendedPanIdPresent = element_1.extendedPanIdPresent.boolValue; - listHolder_1->mList[i_1].meshLocalPrefixPresent = element_1.meshLocalPrefixPresent.boolValue; - listHolder_1->mList[i_1].delayPresent = element_1.delayPresent.boolValue; - listHolder_1->mList[i_1].panIdPresent = element_1.panIdPresent.boolValue; - listHolder_1->mList[i_1].channelPresent = element_1.channelPresent.boolValue; - listHolder_1->mList[i_1].pskcPresent = element_1.pskcPresent.boolValue; - listHolder_1->mList[i_1].securityPolicyPresent = element_1.securityPolicyPresent.boolValue; - listHolder_1->mList[i_1].channelMaskPresent = element_1.channelMaskPresent.boolValue; - } - nonNullValue_0 = ListType_1(listHolder_1->mList, value.count); - } else { - nonNullValue_0 = ListType_1(); - } - } + nonNullValue_0.activeTimestampPresent = value.activeTimestampPresent.boolValue; + nonNullValue_0.pendingTimestampPresent = value.pendingTimestampPresent.boolValue; + nonNullValue_0.masterKeyPresent = value.masterKeyPresent.boolValue; + nonNullValue_0.networkNamePresent = value.networkNamePresent.boolValue; + nonNullValue_0.extendedPanIdPresent = value.extendedPanIdPresent.boolValue; + nonNullValue_0.meshLocalPrefixPresent = value.meshLocalPrefixPresent.boolValue; + nonNullValue_0.delayPresent = value.delayPresent.boolValue; + nonNullValue_0.panIdPresent = value.panIdPresent.boolValue; + nonNullValue_0.channelPresent = value.channelPresent.boolValue; + nonNullValue_0.pskcPresent = value.pskcPresent.boolValue; + nonNullValue_0.securityPolicyPresent = value.securityPolicyPresent.boolValue; + nonNullValue_0.channelMaskPresent = value.channelMaskPresent.boolValue; } auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 4e9ecd9d7b187c..a7114ae0387363 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -90639,7 +90639,8 @@ class ReadThreadNetworkDiagnosticsSecurityPolicy : public ReadAttribute { CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster readAttributeSecurityPolicyWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { + [cluster readAttributeSecurityPolicyWithCompletionHandler:^( + CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) { NSLog(@"ThreadNetworkDiagnostics.SecurityPolicy response %@", [value description]); if (error != nil) { LogNSError("ThreadNetworkDiagnostics SecurityPolicy read Error", error); @@ -90670,17 +90671,19 @@ class SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy : public Subscrib params.keepPreviousSubscriptions = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; - [cluster subscribeAttributeSecurityPolicyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] - maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] - params:params - subscriptionEstablished:nullptr - reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"ThreadNetworkDiagnostics.SecurityPolicy response %@", - [value description]); - if (error || !mWait) { - SetCommandExitStatus(error); - } - }]; + [cluster + subscribeAttributeSecurityPolicyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] + params:params + subscriptionEstablished:nullptr + reportHandler:^(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, + NSError * _Nullable error) { + NSLog( + @"ThreadNetworkDiagnostics.SecurityPolicy response %@", [value description]); + if (error || !mWait) { + SetCommandExitStatus(error); + } + }]; return CHIP_NO_ERROR; } @@ -90782,14 +90785,14 @@ class ReadThreadNetworkDiagnosticsOperationalDatasetComponents : public ReadAttr CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster - readAttributeOperationalDatasetComponentsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"ThreadNetworkDiagnostics.OperationalDatasetComponents response %@", [value description]); - if (error != nil) { - LogNSError("ThreadNetworkDiagnostics OperationalDatasetComponents read Error", error); - } - SetCommandExitStatus(error); - }]; + [cluster readAttributeOperationalDatasetComponentsWithCompletionHandler:^( + CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) { + NSLog(@"ThreadNetworkDiagnostics.OperationalDatasetComponents response %@", [value description]); + if (error != nil) { + LogNSError("ThreadNetworkDiagnostics OperationalDatasetComponents read Error", error); + } + SetCommandExitStatus(error); + }]; return CHIP_NO_ERROR; } }; @@ -90819,7 +90822,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents : p maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:nullptr - reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { + reportHandler:^( + CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, + NSError * _Nullable error) { NSLog(@"ThreadNetworkDiagnostics.OperationalDatasetComponents " @"response %@", [value description]); 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 b97dcaac5e19e7..82024da5d594ef 100644 --- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h +++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h @@ -327,11 +327,11 @@ ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \ { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* delay */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \ - { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \ diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h index ce7a9fcabe5c6f..c287606943d02b 100644 --- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h @@ -346,11 +346,11 @@ ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \ { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* delay */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \ - { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \ diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h index 10a76b396aa1dc..9022830e150cfc 100644 --- a/zzz_generated/lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h @@ -384,11 +384,11 @@ ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \ { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* delay */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \ - { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \ diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h index c0f20ef873e662..1eceb8ba9f67f0 100644 --- a/zzz_generated/pump-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h @@ -366,11 +366,11 @@ ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \ { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* delay */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \ - { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \ 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 62b9af250bc4bd..c7b0398f3e2971 100644 --- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h @@ -347,11 +347,11 @@ ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \ { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* delay */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \ - { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \ diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index c5e592239b1b0c..efbf35ee00d8ab 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -355,11 +355,11 @@ ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \ { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* delay */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \ - { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \ diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index 8e2063efcd9397..40ff755abf8f0f 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -395,11 +395,11 @@ ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \ { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* delay */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \ - { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \ 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 b7f63e52eb3fde..569bce96dad03b 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -380,11 +380,11 @@ ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \ { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* delay */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \ - { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \ diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h index 71c52ca3255560..fd5f75861af51a 100644 --- a/zzz_generated/window-app/zap-generated/endpoint_config.h +++ b/zzz_generated/window-app/zap-generated/endpoint_config.h @@ -347,11 +347,11 @@ ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */ \ { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* delay */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* ChannelMask */ \ - { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \