From 112509981cc625ebb240a9401bbb05f837726660 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Thu, 19 Jan 2023 23:25:44 -0500 Subject: [PATCH] Align naming in Target Navigator cluster XML with the spec. (#24498) * Align naming in Target Navigator cluster XML with the spec. * Regenerate generated code. --- .../all-clusters-app.matter | 4 ++-- .../all-clusters-minimal-app.matter | 4 ++-- .../placeholder/linux/apps/app1/config.matter | 8 +++---- .../placeholder/linux/apps/app2/config.matter | 8 +++---- .../TargetNavigatorManager.cpp | 4 ++-- .../target-navigator/TargetNavigatorManager.h | 2 +- .../TargetNavigatorManager.cpp | 2 +- .../target-navigator/TargetNavigatorManager.h | 2 +- examples/tv-app/tv-common/tv-app.matter | 4 ++-- .../tv-casting-common/tv-casting-app.matter | 4 ++-- .../suites/TV_TargetNavigatorCluster.yaml | 4 ++-- .../chip/target-navigator-cluster.xml | 16 +++++++------- .../data_model/controller-clusters.matter | 4 ++-- .../CHIPAttributeTLVValueDecoder.cpp | 18 +++++++-------- .../zap-generated/CHIPInvokeCallbacks.cpp | 22 +++++++++---------- .../java/zap-generated/CHIPReadCallbacks.cpp | 20 +++++++++-------- .../java/zap-generated/CHIPReadCallbacks.h | 3 ++- .../chip/devicecontroller/ChipClusters.java | 2 +- .../chip/devicecontroller/ChipStructs.java | 6 ++--- .../devicecontroller/ClusterInfoMapping.java | 14 ++++++------ .../python/chip/clusters/Objects.py | 10 ++++----- .../CHIP/templates/availability.yaml | 10 +++++++++ .../MTRAttributeTLVValueDecoder.mm | 4 ++-- .../CHIP/zap-generated/MTRCallbackBridge.h | 5 +++-- .../CHIP/zap-generated/MTRCallbackBridge.mm | 7 +++--- .../CHIP/zap-generated/MTRStructsObjc.h | 11 +++++++--- .../CHIP/zap-generated/MTRStructsObjc.mm | 7 ++++-- .../app-common/zap-generated/callback.h | 2 +- .../zap-generated/cluster-objects.cpp | 4 ++-- .../zap-generated/cluster-objects.h | 10 ++++----- .../cluster/ComplexArgumentParser.cpp | 8 +++---- .../cluster/ComplexArgumentParser.h | 4 ++-- .../cluster/logging/DataModelLogger.cpp | 5 +++-- .../cluster/logging/DataModelLogger.h | 2 +- .../chip-tool/zap-generated/test/Commands.h | 9 +++++--- .../zap-generated/test/Commands.h | 14 +++++++----- .../zap-generated/CHIPClientCallbacks.h | 3 ++- 37 files changed, 148 insertions(+), 118 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 18ca22ae62fa7c..309b0a1aec6522 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 @@ -3218,12 +3218,12 @@ server cluster TargetNavigator = 1285 { kNotAllowed = 2; } - struct TargetInfo { + struct TargetInfoStruct { int8u identifier = 0; char_string<32> name = 1; } - readonly attribute TargetInfo targetList[] = 0; + readonly attribute TargetInfoStruct targetList[] = 0; readonly attribute int8u currentTarget = 1; 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 6f0389d641c243..afa4f35175bdaf 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 @@ -2571,12 +2571,12 @@ server cluster TargetNavigator = 1285 { kNotAllowed = 2; } - struct TargetInfo { + struct TargetInfoStruct { int8u identifier = 0; char_string<32> name = 1; } - readonly attribute TargetInfo targetList[] = 0; + readonly attribute TargetInfoStruct targetList[] = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index cec23e204157a8..1a6215df5c2ec1 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -2179,12 +2179,12 @@ client cluster TargetNavigator = 1285 { kNotAllowed = 2; } - struct TargetInfo { + struct TargetInfoStruct { int8u identifier = 0; char_string<32> name = 1; } - readonly attribute TargetInfo targetList[] = 0; + readonly attribute TargetInfoStruct targetList[] = 0; readonly attribute int8u currentTarget = 1; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -2212,12 +2212,12 @@ server cluster TargetNavigator = 1285 { kNotAllowed = 2; } - struct TargetInfo { + struct TargetInfoStruct { int8u identifier = 0; char_string<32> name = 1; } - readonly attribute TargetInfo targetList[] = 0; + readonly attribute TargetInfoStruct targetList[] = 0; readonly attribute int8u currentTarget = 1; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index dfe8fa1df176a1..4c3e0a9eabcace 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -2156,12 +2156,12 @@ client cluster TargetNavigator = 1285 { kNotAllowed = 2; } - struct TargetInfo { + struct TargetInfoStruct { int8u identifier = 0; char_string<32> name = 1; } - readonly attribute TargetInfo targetList[] = 0; + readonly attribute TargetInfoStruct targetList[] = 0; readonly attribute int8u currentTarget = 1; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -2189,12 +2189,12 @@ server cluster TargetNavigator = 1285 { kNotAllowed = 2; } - struct TargetInfo { + struct TargetInfoStruct { int8u identifier = 0; char_string<32> name = 1; } - readonly attribute TargetInfo targetList[] = 0; + readonly attribute TargetInfoStruct targetList[] = 0; readonly attribute int8u currentTarget = 1; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp index ca07c349ff432c..8d571bdb4f85fb 100644 --- a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp +++ b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp @@ -68,7 +68,7 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a i++; continue; } - Structs::TargetInfo::Type outputInfo; + Structs::TargetInfoStruct::Type outputInfo; outputInfo.identifier = static_cast(entry[targetId].asUInt()); outputInfo.name = CharSpan::fromCharString(entry[targetName].asCString()); ReturnErrorOnFailure(encoder.Encode(outputInfo)); @@ -86,7 +86,7 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a int i = 0; for (std::string & entry : mTargets) { - Structs::TargetInfo::Type outputInfo; + Structs::TargetInfoStruct::Type outputInfo; outputInfo.identifier = static_cast(i + 1); outputInfo.name = CharSpan::fromCharString(entry.c_str()); ReturnErrorOnFailure(encoder.Encode(outputInfo)); diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h index 8e0825c24c93ce..1f7f4a2096b20b 100644 --- a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h +++ b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h @@ -25,7 +25,7 @@ using chip::EndpointId; using chip::app::AttributeValueEncoder; using chip::app::CommandResponseHelper; using TargetNavigatorDelegate = chip::app::Clusters::TargetNavigator::Delegate; -using TargetInfoType = chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type; +using TargetInfoType = chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::Type; using NavigateTargetResponseType = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type; using ContentAppAttributeDelegate = chip::AppPlatform::ContentAppAttributeDelegate; diff --git a/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.cpp index ec9b24598acd3d..ba52adace6955d 100644 --- a/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.cpp +++ b/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.cpp @@ -34,7 +34,7 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a int i = 0; for (std::string & entry : mTargets) { - Structs::TargetInfo::Type outputInfo; + Structs::TargetInfoStruct::Type outputInfo; outputInfo.identifier = static_cast(i + 1); outputInfo.name = CharSpan::fromCharString(entry.c_str()); ReturnErrorOnFailure(encoder.Encode(outputInfo)); diff --git a/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.h b/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.h index f4cb0b372bc7e3..0294e75876ac2b 100644 --- a/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.h +++ b/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.h @@ -23,7 +23,7 @@ using chip::CharSpan; using chip::app::AttributeValueEncoder; using chip::app::CommandResponseHelper; using TargetNavigatorDelegate = chip::app::Clusters::TargetNavigator::Delegate; -using TargetInfoType = chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type; +using TargetInfoType = chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::Type; using NavigateTargetResponseType = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type; class TargetNavigatorManager : public TargetNavigatorDelegate diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index ee392b654ecb63..787b514b831080 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1628,12 +1628,12 @@ server cluster TargetNavigator = 1285 { kNotAllowed = 2; } - struct TargetInfo { + struct TargetInfoStruct { int8u identifier = 0; char_string<32> name = 1; } - readonly attribute TargetInfo targetList[] = 0; + readonly attribute TargetInfoStruct targetList[] = 0; readonly attribute int8u currentTarget = 1; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; 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 290552732b7a68..99c35b564a431b 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 @@ -1731,12 +1731,12 @@ client cluster TargetNavigator = 1285 { kNotAllowed = 2; } - struct TargetInfo { + struct TargetInfoStruct { int8u identifier = 0; char_string<32> name = 1; } - readonly attribute TargetInfo targetList[] = 0; + readonly attribute TargetInfoStruct targetList[] = 0; readonly attribute int16u clusterRevision = 65533; request struct NavigateTargetRequest { diff --git a/src/app/tests/suites/TV_TargetNavigatorCluster.yaml b/src/app/tests/suites/TV_TargetNavigatorCluster.yaml index e7118fca646907..ed67e8b9de37d5 100644 --- a/src/app/tests/suites/TV_TargetNavigatorCluster.yaml +++ b/src/app/tests/suites/TV_TargetNavigatorCluster.yaml @@ -34,8 +34,8 @@ tests: response: value: [ - { identifier: 1, name: "exampleName" }, - { identifier: 2, name: "exampleName" }, + { Identifier: 1, Name: "exampleName" }, + { Identifier: 2, Name: "exampleName" }, ] - label: "Read attribute current navigator target" diff --git a/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml index 8a62451bfe3580..705510cc5ac36d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml @@ -24,19 +24,19 @@ limitations under the License. true true This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. - TargetList + TargetList CurrentTarget Upon receipt, this SHALL navigation the UX to the target identified. - - + + This command SHALL be generated in response to NavigateTarget commands. - - + + @@ -47,9 +47,9 @@ limitations under the License. - + - - + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 803653bdcd569e..e1d61b552cfe1d 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3580,12 +3580,12 @@ client cluster TargetNavigator = 1285 { kNotAllowed = 2; } - struct TargetInfo { + struct TargetInfoStruct { int8u identifier = 0; char_string<32> name = 1; } - readonly attribute TargetInfo targetList[] = 0; + readonly attribute TargetInfoStruct targetList[] = 0; readonly attribute int8u currentTarget = 1; 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 06b3403f5966cb..550f63691b4e10 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -15062,24 +15062,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jobject newElement_0_name; newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str()); - jclass targetInfoStructClass_1; + jclass targetInfoStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$TargetNavigatorClusterTargetInfo", targetInfoStructClass_1); + env, "chip/devicecontroller/ChipStructs$TargetNavigatorClusterTargetInfoStruct", targetInfoStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$TargetNavigatorClusterTargetInfo"); + ChipLogError(Zcl, "Could not find class ChipStructs$TargetNavigatorClusterTargetInfoStruct"); return nullptr; } - jmethodID targetInfoStructCtor_1 = - env->GetMethodID(targetInfoStructClass_1, "", "(Ljava/lang/Integer;Ljava/lang/String;)V"); - if (targetInfoStructCtor_1 == nullptr) + jmethodID targetInfoStructStructCtor_1 = + env->GetMethodID(targetInfoStructStructClass_1, "", "(Ljava/lang/Integer;Ljava/lang/String;)V"); + if (targetInfoStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$TargetNavigatorClusterTargetInfo constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$TargetNavigatorClusterTargetInfoStruct constructor"); return nullptr; } - newElement_0 = - env->NewObject(targetInfoStructClass_1, targetInfoStructCtor_1, newElement_0_identifier, newElement_0_name); + newElement_0 = env->NewObject(targetInfoStructStructClass_1, targetInfoStructStructCtor_1, newElement_0_identifier, + newElement_0_name); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index bd7e31c87047ac..9543a2a5a4351a 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -3377,25 +3377,25 @@ void CHIPTargetNavigatorClusterNavigateTargetResponseCallback::CallbackFn( &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject status; - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - static_cast(dataResponse.status), status); - jobject data; + jobject Status; + std::string StatusClassName = "java/lang/Integer"; + std::string StatusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), + static_cast(dataResponse.status), Status); + jobject Data; if (!dataResponse.data.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, data); + chip::JniReferences::GetInstance().CreateOptional(nullptr, Data); } else { - jobject dataInsideOptional; - dataInsideOptional = + jobject DataInsideOptional; + DataInsideOptional = env->NewStringUTF(std::string(dataResponse.data.Value().data(), dataResponse.data.Value().size()).c_str()); - chip::JniReferences::GetInstance().CreateOptional(dataInsideOptional, data); + chip::JniReferences::GetInstance().CreateOptional(DataInsideOptional, Data); } - env->CallVoidMethod(javaCallbackRef, javaMethod, status, data); + env->CallVoidMethod(javaCallbackRef, javaMethod, Status, Data); } CHIPMediaPlaybackClusterPlaybackResponseCallback::CHIPMediaPlaybackClusterPlaybackResponseCallback(jobject javaCallback) : Callback::Callback(CallbackFn, this) diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index f0e8b360ad82a2..10e345ee26b59e 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -22664,7 +22664,8 @@ CHIPTargetNavigatorTargetListAttributeCallback::~CHIPTargetNavigatorTargetListAt void CHIPTargetNavigatorTargetListAttributeCallback::CallbackFn( void * context, - const chip::app::DataModel::DecodableList & list) + const chip::app::DataModel::DecodableList & + list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22702,23 +22703,24 @@ void CHIPTargetNavigatorTargetListAttributeCallback::CallbackFn( jobject newElement_0_name; newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str()); - jclass targetInfoStructClass_1; + jclass targetInfoStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$TargetNavigatorClusterTargetInfo", targetInfoStructClass_1); + env, "chip/devicecontroller/ChipStructs$TargetNavigatorClusterTargetInfoStruct", targetInfoStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$TargetNavigatorClusterTargetInfo"); + ChipLogError(Zcl, "Could not find class ChipStructs$TargetNavigatorClusterTargetInfoStruct"); return; } - jmethodID targetInfoStructCtor_1 = - env->GetMethodID(targetInfoStructClass_1, "", "(Ljava/lang/Integer;Ljava/lang/String;)V"); - if (targetInfoStructCtor_1 == nullptr) + jmethodID targetInfoStructStructCtor_1 = + env->GetMethodID(targetInfoStructStructClass_1, "", "(Ljava/lang/Integer;Ljava/lang/String;)V"); + if (targetInfoStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$TargetNavigatorClusterTargetInfo constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$TargetNavigatorClusterTargetInfoStruct constructor"); return; } - newElement_0 = env->NewObject(targetInfoStructClass_1, targetInfoStructCtor_1, newElement_0_identifier, newElement_0_name); + newElement_0 = + env->NewObject(targetInfoStructStructClass_1, targetInfoStructStructCtor_1, newElement_0_identifier, newElement_0_name); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index 43fc82e6d4d600..7d6b368437a03d 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -9498,7 +9498,8 @@ class CHIPTargetNavigatorTargetListAttributeCallback static void CallbackFn( void * context, - const chip::app::DataModel::DecodableList & list); + const chip::app::DataModel::DecodableList & + list); static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 845e3597365f0b..54589628b79cbb 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -19522,7 +19522,7 @@ public interface NavigateTargetResponseCallback { } public interface TargetListAttributeCallback { - void onSuccess(List valueList); + void onSuccess(List valueList); void onError(Exception ex); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index 45db65c348cfbd..0ea155298bb547 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -1454,11 +1454,11 @@ public String toString() { } } - public static class TargetNavigatorClusterTargetInfo { + public static class TargetNavigatorClusterTargetInfoStruct { public Integer identifier; public String name; - public TargetNavigatorClusterTargetInfo(Integer identifier, String name) { + public TargetNavigatorClusterTargetInfoStruct(Integer identifier, String name) { this.identifier = identifier; this.name = name; } @@ -1466,7 +1466,7 @@ public TargetNavigatorClusterTargetInfo(Integer identifier, String name) { @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("TargetNavigatorClusterTargetInfo {\n"); + output.append("TargetNavigatorClusterTargetInfoStruct {\n"); output.append("\tidentifier: "); output.append(identifier); output.append("\n"); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 31dd1d8eef2dae..1da988e8b8d2da 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -5623,12 +5623,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer status, Optional data) { + public void onSuccess(Integer Status, Optional Data) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer"); - responseValues.put(statusResponseValue, status); - CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional"); - responseValues.put(dataResponseValue, data); + CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); + responseValues.put(StatusResponseValue, Status); + CommandResponseInfo DataResponseValue = new CommandResponseInfo("Data", "Optional"); + responseValues.put(DataResponseValue, Data); callback.onSuccess(responseValues); } @@ -5649,11 +5649,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(List valueList) { + public void onSuccess(List valueList) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo commandResponseInfo = new CommandResponseInfo( - "valueList", "List"); + "valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index f23dc2b906237f..d484afd327cf51 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -22842,7 +22842,7 @@ class TargetNavigator(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="targetList", Tag=0x00000000, Type=typing.List[TargetNavigator.Structs.TargetInfo]), + ClusterObjectFieldDescriptor(Label="targetList", Tag=0x00000000, Type=typing.List[TargetNavigator.Structs.TargetInfoStruct]), ClusterObjectFieldDescriptor(Label="currentTarget", Tag=0x00000001, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), @@ -22851,7 +22851,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - targetList: 'typing.List[TargetNavigator.Structs.TargetInfo]' = None + targetList: 'typing.List[TargetNavigator.Structs.TargetInfoStruct]' = None currentTarget: 'typing.Optional[uint]' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None @@ -22874,7 +22874,7 @@ class TargetNavigatorStatusEnum(MatterIntEnum): class Structs: @dataclass - class TargetInfo(ClusterObject): + class TargetInfoStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -22939,9 +22939,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[TargetNavigator.Structs.TargetInfo]) + return ClusterObjectFieldDescriptor(Type=typing.List[TargetNavigator.Structs.TargetInfoStruct]) - value: 'typing.List[TargetNavigator.Structs.TargetInfo]' = field(default_factory=lambda: []) + value: 'typing.List[TargetNavigator.Structs.TargetInfoStruct]' = field(default_factory=lambda: []) @dataclass class CurrentTarget(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 1ea322864385f0..cda8dd159aee27 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -5052,6 +5052,8 @@ - FabricDescriptorStruct DoorLock: - CredentialStruct + TargetNavigator: + - TargetInfoStruct struct fields: UnitTesting: SimpleStruct: @@ -5167,6 +5169,10 @@ CredentialStruct: - credentialType - credentialIndex + TargetNavigator: + TargetInfoStruct: + - identifier + - name events: OTASoftwareUpdateRequestor: - StateTransition @@ -5648,6 +5654,8 @@ - FabricDescriptor DoorLock: - DlCredential + TargetNavigator: + - TargetInfo struct fields: Descriptor: DeviceTypeStruct: @@ -5898,6 +5906,8 @@ FabricDescriptorStruct: FabricDescriptor DoorLock: CredentialStruct: DlCredential + TargetNavigator: + TargetInfoStruct: TargetInfo struct fields: Descriptor: DeviceTypeStruct: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 331a8ec4fbb387..b0c6d626231b30 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -13063,8 +13063,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRTargetNavigatorClusterTargetInfo * newElement_0; - newElement_0 = [MTRTargetNavigatorClusterTargetInfo new]; + MTRTargetNavigatorClusterTargetInfoStruct * newElement_0; + newElement_0 = [MTRTargetNavigatorClusterTargetInfoStruct new]; newElement_0.identifier = [NSNumber numberWithUnsignedChar:entry_0.identifier]; newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data() length:entry_0.name.size() diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 15a1fe8b5b0cc8..b30211594c8af8 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -987,7 +987,8 @@ typedef void (*ChannelAttributeListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); typedef void (*TargetNavigatorTargetListListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); + const chip::app::DataModel::DecodableList & + data); typedef void (*TargetNavigatorGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*TargetNavigatorAcceptedCommandListListAttributeCallback)( @@ -8865,7 +8866,7 @@ class MTRTargetNavigatorTargetListListAttributeCallbackBridge static void OnSuccessFn( void * context, - const chip::app::DataModel::DecodableList & + const chip::app::DataModel::DecodableList & value); }; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index 0947b5de898af5..b1d48338b49f2e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -8818,7 +8818,8 @@ } void MTRTargetNavigatorTargetListListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList & value) + const chip::app::DataModel::DecodableList & + value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -8826,8 +8827,8 @@ auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRTargetNavigatorClusterTargetInfo * newElement_0; - newElement_0 = [MTRTargetNavigatorClusterTargetInfo new]; + MTRTargetNavigatorClusterTargetInfoStruct * newElement_0; + newElement_0 = [MTRTargetNavigatorClusterTargetInfoStruct new]; newElement_0.identifier = [NSNumber numberWithUnsignedChar:entry_0.identifier]; newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data() length:entry_0.name.size() diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 1f90dbbb216142..469a3a4f04ee1a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -790,10 +790,15 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSNumber * _Nonnull lineupInfoType API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end +MTR_NEWLY_AVAILABLE +@interface MTRTargetNavigatorClusterTargetInfoStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull identifier MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nonnull name MTR_NEWLY_AVAILABLE; +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRTargetNavigatorClusterTargetInfo : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull identifier API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSString * _Nonnull name API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRTargetNavigatorClusterTargetInfoStruct") +@interface MTRTargetNavigatorClusterTargetInfo : MTRTargetNavigatorClusterTargetInfoStruct @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 1d00021a616711..e6dcf4c24d4e85 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -3312,7 +3312,7 @@ - (NSString *)description @end -@implementation MTRTargetNavigatorClusterTargetInfo +@implementation MTRTargetNavigatorClusterTargetInfoStruct - (instancetype)init { if (self = [super init]) { @@ -3326,7 +3326,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRTargetNavigatorClusterTargetInfo alloc] init]; + auto other = [[MTRTargetNavigatorClusterTargetInfoStruct alloc] init]; other.identifier = self.identifier; other.name = self.name; @@ -3343,6 +3343,9 @@ - (NSString *)description @end +@implementation MTRTargetNavigatorClusterTargetInfo : MTRTargetNavigatorClusterTargetInfoStruct +@end + @implementation MTRMediaPlaybackClusterPlaybackPosition - (instancetype)init { diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index e29537c05b2441..4edc55370c5644 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -8593,7 +8593,7 @@ bool emberAfTargetNavigatorClusterNavigateTargetCallback( * @brief Target Navigator Cluster NavigateTargetResponse Command callback (from server) */ bool emberAfTargetNavigatorClusterNavigateTargetResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status, chip::CharSpan data); + uint8_t Status, chip::CharSpan Data); /** * @brief Media Playback Cluster Play Command callback (from client) */ diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 9f9e4f394f0fe4..a10d016ae037a9 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -15663,7 +15663,7 @@ namespace Events {} // namespace Events } // namespace Channel namespace TargetNavigator { namespace Structs { -namespace TargetInfo { +namespace TargetInfoStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -15706,7 +15706,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace TargetInfo +} // namespace TargetInfoStruct } // namespace Structs namespace Commands { 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 6590c48c17a38c..8c0119bea980e5 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 @@ -20861,7 +20861,7 @@ struct TypeInfo } // namespace Channel namespace TargetNavigator { namespace Structs { -namespace TargetInfo { +namespace TargetInfoStruct { enum class Fields { kIdentifier = 0, @@ -20883,7 +20883,7 @@ struct Type using DecodableType = Type; -} // namespace TargetInfo +} // namespace TargetInfoStruct } // namespace Structs namespace Commands { @@ -20979,11 +20979,11 @@ namespace Attributes { namespace TargetList { struct TypeInfo { - using Type = chip::app::DataModel::List; + using Type = chip::app::DataModel::List; using DecodableType = - chip::app::DataModel::DecodableList; + chip::app::DataModel::DecodableList; using DecodableArgType = - const chip::app::DataModel::DecodableList &; + const chip::app::DataModel::DecodableList &; static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::TargetList::Id; } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index ae169a0046aa34..32c5fbb7c4ed94 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -1871,14 +1871,14 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::AccessControl::Structs ComplexArgumentParser::Finalize(request.deviceType); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type & request, + chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("TargetInfo.identifier", "identifier", value.isMember("identifier"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TargetInfo.name", "name", value.isMember("name"))); + ComplexArgumentParser::EnsureMemberExist("TargetInfoStruct.identifier", "identifier", value.isMember("identifier"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TargetInfoStruct.name", "name", value.isMember("name"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "identifier"); @@ -1890,7 +1890,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return CHIP_NO_ERROR; } -void ComplexArgumentParser::Finalize(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::Type & request) { ComplexArgumentParser::Finalize(request.identifier); ComplexArgumentParser::Finalize(request.name); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index 483493b009426a..2393db91e0a2c6 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -222,10 +222,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::AccessControl:: Json::Value & value); static void Finalize(chip::app::Clusters::AccessControl::Structs::Target::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type & request); +static void Finalize(chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Binding::Structs::TargetStruct::Type & request, Json::Value & value); 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 e5d1d79bfc9825..e5bc01968ffac1 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -2009,7 +2009,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType & value) + const chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -8576,7 +8576,8 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP switch (path.mAttributeId) { case TargetNavigator::Attributes::TargetList::Id: { - chip::app::DataModel::DecodableList value; + chip::app::DataModel::DecodableList + value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TargetList", 1, value); } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index dee95473a7f8aa..3e6913657bb6b9 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -122,7 +122,7 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::AccessControl::Structs::Target::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType & value); + const chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 2849648972b939..2c042ba8a28385 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -33863,7 +33863,8 @@ class Test_TC_TGTNAV_8_1Suite : public TestCommand chip::Optional mTargetvalue; chip::Optional mTimeout; - chip::app::DataModel::DecodableList TargetListValues; + chip::app::DataModel::DecodableList + TargetListValues; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -33902,7 +33903,8 @@ class Test_TC_TGTNAV_8_1Suite : public TestCommand case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::DecodableList value; + chip::app::DataModel::DecodableList + value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "list", "list")); TargetListValues = value; @@ -53419,7 +53421,8 @@ class TV_TargetNavigatorClusterSuite : public TestCommand case 1: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::DecodableList value; + chip::app::DataModel::DecodableList + value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); { auto iter_0 = value.begin(); diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 33e3772b3d8ab6..cbfed49c88c7b8 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -72836,12 +72836,14 @@ class TV_TargetNavigatorCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("TargetList", [actualValue count], static_cast(2))); - VerifyOrReturn(CheckValue("identifier", ((MTRTargetNavigatorClusterTargetInfo *) actualValue[0]).identifier, 1U)); VerifyOrReturn( - CheckValueAsString("name", ((MTRTargetNavigatorClusterTargetInfo *) actualValue[0]).name, @"exampleName")); - VerifyOrReturn(CheckValue("identifier", ((MTRTargetNavigatorClusterTargetInfo *) actualValue[1]).identifier, 2U)); + CheckValue("Identifier", ((MTRTargetNavigatorClusterTargetInfoStruct *) actualValue[0]).identifier, 1U)); + VerifyOrReturn(CheckValueAsString( + "Name", ((MTRTargetNavigatorClusterTargetInfoStruct *) actualValue[0]).name, @"exampleName")); VerifyOrReturn( - CheckValueAsString("name", ((MTRTargetNavigatorClusterTargetInfo *) actualValue[1]).name, @"exampleName")); + CheckValue("Identifier", ((MTRTargetNavigatorClusterTargetInfoStruct *) actualValue[1]).identifier, 2U)); + VerifyOrReturn(CheckValueAsString( + "Name", ((MTRTargetNavigatorClusterTargetInfoStruct *) actualValue[1]).name, @"exampleName")); } NextTest(); @@ -72894,12 +72896,12 @@ class TV_TargetNavigatorCluster : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.data; - VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response")); + VerifyOrReturn(CheckValueAsString("Data", actualValue, @"data response")); } NextTest(); diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h index 3f697a1360a23a..860f7a36456706 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -418,7 +418,8 @@ typedef void (*ChannelAttributeListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); typedef void (*TargetNavigatorTargetListListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); + const chip::app::DataModel::DecodableList & + data); typedef void (*TargetNavigatorGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*TargetNavigatorAcceptedCommandListListAttributeCallback)(