From 1180978394e6ef3215fa1edcb730e5a297c2a1ff Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 20 Jan 2023 08:47:26 -0500 Subject: [PATCH] Align naming in Media Input cluster XML with the spec. (#24504) * Align naming in Media Input cluster XML with the spec. * Regenerate generated code. --- .../all-clusters-app.matter | 4 +- .../all-clusters-minimal-app.matter | 4 +- .../tv-app/android/java/MediaInputManager.cpp | 2 +- .../include/media-input/MediaInputManager.h | 4 +- examples/tv-app/tv-common/tv-app.matter | 4 +- .../tv-casting-common/tv-casting-app.matter | 4 +- .../media-input-server/media-input-delegate.h | 2 +- .../tests/suites/TV_MediaInputCluster.yaml | 32 ++++++------- .../data-model/chip/media-input-cluster.xml | 26 +++++------ .../data_model/controller-clusters.matter | 4 +- .../CHIPAttributeTLVValueDecoder.cpp | 16 +++---- .../java/zap-generated/CHIPReadCallbacks.cpp | 23 +++++----- .../java/zap-generated/CHIPReadCallbacks.h | 2 +- .../chip/devicecontroller/ChipClusters.java | 2 +- .../chip/devicecontroller/ChipStructs.java | 6 +-- .../devicecontroller/ClusterInfoMapping.java | 5 ++- .../python/chip/clusters/Objects.py | 18 ++++---- .../CHIP/templates/availability.yaml | 27 +++++++++++ .../MTRAttributeTLVValueDecoder.mm | 4 +- .../CHIP/zap-generated/MTRBaseClusters.h | 15 +++++-- .../CHIP/zap-generated/MTRCallbackBridge.h | 5 ++- .../CHIP/zap-generated/MTRCallbackBridge.mm | 6 +-- .../CHIP/zap-generated/MTRStructsObjc.h | 15 ++++--- .../CHIP/zap-generated/MTRStructsObjc.mm | 7 ++- .../zap-generated/cluster-objects.cpp | 4 +- .../zap-generated/cluster-objects.h | 11 ++--- .../cluster/ComplexArgumentParser.cpp | 14 +++--- .../cluster/ComplexArgumentParser.h | 4 +- .../cluster/logging/DataModelLogger.cpp | 4 +- .../cluster/logging/DataModelLogger.h | 2 +- .../chip-tool/zap-generated/test/Commands.h | 12 ++--- .../zap-generated/test/Commands.h | 45 ++++++++++--------- .../zap-generated/CHIPClientCallbacks.h | 2 +- 33 files changed, 195 insertions(+), 140 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 309b0a1aec6522..8d34771fbf0ab3 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 @@ -3293,14 +3293,14 @@ server cluster MediaInput = 1287 { kNameUpdates = 0x1; } - struct InputInfo { + struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; char_string<32> name = 2; char_string<32> description = 3; } - readonly attribute InputInfo inputList[] = 0; + readonly attribute InputInfoStruct inputList[] = 0; readonly attribute int8u currentInput = 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 afa4f35175bdaf..a8744b0bf38980 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 @@ -2649,14 +2649,14 @@ server cluster MediaInput = 1287 { kNameUpdates = 0x1; } - struct InputInfo { + struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; char_string<32> name = 2; char_string<32> description = 3; } - readonly attribute InputInfo inputList[] = 0; + readonly attribute InputInfoStruct inputList[] = 0; readonly attribute int8u currentInput = 1; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/tv-app/android/java/MediaInputManager.cpp b/examples/tv-app/android/java/MediaInputManager.cpp index 39819d32a76f38..b28609d0efc3fa 100644 --- a/examples/tv-app/android/java/MediaInputManager.cpp +++ b/examples/tv-app/android/java/MediaInputManager.cpp @@ -72,7 +72,7 @@ CHIP_ERROR MediaInputManager::HandleGetInputList(chip::app::AttributeValueEncode jint size = env->GetArrayLength(inputArray); for (int i = 0; i < size; i++) { - app::Clusters::MediaInput::Structs::InputInfo::Type mediaInput; + app::Clusters::MediaInput::Structs::InputInfoStruct::Type mediaInput; jobject inputObj = env->GetObjectArrayElement(inputArray, i); jclass inputClass = env->GetObjectClass(inputObj); diff --git a/examples/tv-app/linux/include/media-input/MediaInputManager.h b/examples/tv-app/linux/include/media-input/MediaInputManager.h index 4fb1d5a690ee7d..1b8a78503b1d27 100644 --- a/examples/tv-app/linux/include/media-input/MediaInputManager.h +++ b/examples/tv-app/linux/include/media-input/MediaInputManager.h @@ -22,7 +22,7 @@ #include #include -using InputInfoType = chip::app::Clusters::MediaInput::Structs::InputInfo::Type; +using InputInfoType = chip::app::Clusters::MediaInput::Structs::InputInfoStruct::Type; class MediaInputManager : public chip::app::Clusters::MediaInput::Delegate { @@ -39,7 +39,7 @@ class MediaInputManager : public chip::app::Clusters::MediaInput::Delegate protected: uint8_t mCurrentInput; - std::vector mInputs; + std::vector mInputs; // Magic numbers are here on purpose, please allocate memory char mCharDataBuffer[10][32]; }; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 787b514b831080..2266f26d42446f 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1744,14 +1744,14 @@ server cluster MediaInput = 1287 { kNameUpdates = 0x1; } - struct InputInfo { + struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; char_string<32> name = 2; char_string<32> description = 3; } - readonly attribute InputInfo inputList[] = 0; + readonly attribute InputInfoStruct inputList[] = 0; readonly attribute int8u currentInput = 1; 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 99c35b564a431b..b1a5a9d8ee7c3d 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 @@ -1816,14 +1816,14 @@ client cluster MediaInput = 1287 { kNameUpdates = 0x1; } - struct InputInfo { + struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; char_string<32> name = 2; char_string<32> description = 3; } - readonly attribute InputInfo inputList[] = 0; + readonly attribute InputInfoStruct inputList[] = 0; readonly attribute int16u clusterRevision = 65533; request struct SelectInputRequest { diff --git a/src/app/clusters/media-input-server/media-input-delegate.h b/src/app/clusters/media-input-server/media-input-delegate.h index 862298b9352777..609c66bef69ed9 100644 --- a/src/app/clusters/media-input-server/media-input-delegate.h +++ b/src/app/clusters/media-input-server/media-input-delegate.h @@ -34,7 +34,7 @@ namespace MediaInput { class Delegate { public: - // no easy way to handle the return memory of app::Clusters::MediaInput::Structs::InputInfo::Type list, so encoder is used + // no easy way to handle the return memory of app::Clusters::MediaInput::Structs::InputInfoStruct::Type list, so encoder is used virtual CHIP_ERROR HandleGetInputList(app::AttributeValueEncoder & aEncoder) = 0; virtual uint8_t HandleGetCurrentInput() = 0; virtual bool HandleSelectInput(const uint8_t index) = 0; diff --git a/src/app/tests/suites/TV_MediaInputCluster.yaml b/src/app/tests/suites/TV_MediaInputCluster.yaml index e9ba89a3485b12..153b4aaf99b40c 100644 --- a/src/app/tests/suites/TV_MediaInputCluster.yaml +++ b/src/app/tests/suites/TV_MediaInputCluster.yaml @@ -35,16 +35,16 @@ tests: value: [ { - index: 1, - inputType: 4, - name: "HDMI", - description: "High-Definition Multimedia Interface", + Index: 1, + InputType: 4, + Name: "HDMI", + Description: "High-Definition Multimedia Interface", }, { - index: 2, - inputType: 4, - name: "HDMI", - description: "High-Definition Multimedia Interface", + Index: 2, + InputType: 4, + Name: "HDMI", + Description: "High-Definition Multimedia Interface", }, ] @@ -83,15 +83,15 @@ tests: value: [ { - index: 1, - inputType: 4, - name: "HDMI Test", - description: "High-Definition Multimedia Interface", + Index: 1, + InputType: 4, + Name: "HDMI Test", + Description: "High-Definition Multimedia Interface", }, { - index: 2, - inputType: 4, - name: "HDMI", - description: "High-Definition Multimedia Interface", + Index: 2, + InputType: 4, + Name: "HDMI", + Description: "High-Definition Multimedia Interface", }, ] diff --git a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml index 2f876925426ac4..f69ea234fe7d64 100644 --- a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml @@ -25,12 +25,12 @@ limitations under the License. true This cluster provides an interface for controlling the Input Selector on a media device such as a TV. - InputList - CurrentInput + InputList + CurrentInput Upon receipt, this SHALL change the input on the media device to the input at a specific index in the Input List. - + @@ -43,18 +43,18 @@ limitations under the License. Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus. - - + + - + - - - - + + + + @@ -63,13 +63,13 @@ limitations under the License. - + - - + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index e1d61b552cfe1d..e0f2c08b869331 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3696,14 +3696,14 @@ client cluster MediaInput = 1287 { kNameUpdates = 0x1; } - struct InputInfo { + struct InputInfoStruct { int8u index = 0; InputTypeEnum inputType = 1; char_string<32> name = 2; char_string<32> description = 3; } - readonly attribute InputInfo inputList[] = 0; + readonly attribute InputInfoStruct inputList[] = 0; readonly attribute int8u currentInput = 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 550f63691b4e10..0ddb01e00633f6 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -15531,24 +15531,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR newElement_0_description = env->NewStringUTF(std::string(entry_0.description.data(), entry_0.description.size()).c_str()); - jclass inputInfoStructClass_1; + jclass inputInfoStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$MediaInputClusterInputInfo", inputInfoStructClass_1); + env, "chip/devicecontroller/ChipStructs$MediaInputClusterInputInfoStruct", inputInfoStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$MediaInputClusterInputInfo"); + ChipLogError(Zcl, "Could not find class ChipStructs$MediaInputClusterInputInfoStruct"); return nullptr; } - jmethodID inputInfoStructCtor_1 = - env->GetMethodID(inputInfoStructClass_1, "", + jmethodID inputInfoStructStructCtor_1 = + env->GetMethodID(inputInfoStructStructClass_1, "", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;)V"); - if (inputInfoStructCtor_1 == nullptr) + if (inputInfoStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$MediaInputClusterInputInfo constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$MediaInputClusterInputInfoStruct constructor"); return nullptr; } - newElement_0 = env->NewObject(inputInfoStructClass_1, inputInfoStructCtor_1, newElement_0_index, + newElement_0 = env->NewObject(inputInfoStructStructClass_1, inputInfoStructStructCtor_1, newElement_0_index, newElement_0_inputType, newElement_0_name, newElement_0_description); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 10e345ee26b59e..d53aa3272c1496 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -23446,7 +23446,7 @@ CHIPMediaInputInputListAttributeCallback::~CHIPMediaInputInputListAttributeCallb void CHIPMediaInputInputListAttributeCallback::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; @@ -23491,24 +23491,25 @@ void CHIPMediaInputInputListAttributeCallback::CallbackFn( jobject newElement_0_description; newElement_0_description = env->NewStringUTF(std::string(entry_0.description.data(), entry_0.description.size()).c_str()); - jclass inputInfoStructClass_1; - err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$MediaInputClusterInputInfo", - inputInfoStructClass_1); + jclass inputInfoStructStructClass_1; + err = chip::JniReferences::GetInstance().GetClassRef( + env, "chip/devicecontroller/ChipStructs$MediaInputClusterInputInfoStruct", inputInfoStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$MediaInputClusterInputInfo"); + ChipLogError(Zcl, "Could not find class ChipStructs$MediaInputClusterInputInfoStruct"); return; } - jmethodID inputInfoStructCtor_1 = env->GetMethodID( - inputInfoStructClass_1, "", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;)V"); - if (inputInfoStructCtor_1 == nullptr) + jmethodID inputInfoStructStructCtor_1 = + env->GetMethodID(inputInfoStructStructClass_1, "", + "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;)V"); + if (inputInfoStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$MediaInputClusterInputInfo constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$MediaInputClusterInputInfoStruct constructor"); return; } - newElement_0 = env->NewObject(inputInfoStructClass_1, inputInfoStructCtor_1, newElement_0_index, newElement_0_inputType, - newElement_0_name, newElement_0_description); + newElement_0 = env->NewObject(inputInfoStructStructClass_1, inputInfoStructStructCtor_1, newElement_0_index, + newElement_0_inputType, newElement_0_name, newElement_0_description); 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 7d6b368437a03d..94e820056c84d2 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -9831,7 +9831,7 @@ class CHIPMediaInputInputListAttributeCallback 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 54589628b79cbb..57cb2ad43791f7 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -20154,7 +20154,7 @@ private native void renameInput( @Nullable Integer timedInvokeTimeoutMs); public interface InputListAttributeCallback { - 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 0ea155298bb547..2df9af288aa989 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -1502,13 +1502,13 @@ public String toString() { } } - public static class MediaInputClusterInputInfo { + public static class MediaInputClusterInputInfoStruct { public Integer index; public Integer inputType; public String name; public String description; - public MediaInputClusterInputInfo( + public MediaInputClusterInputInfoStruct( Integer index, Integer inputType, String name, String description) { this.index = index; this.inputType = inputType; @@ -1519,7 +1519,7 @@ public MediaInputClusterInputInfo( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("MediaInputClusterInputInfo {\n"); + output.append("MediaInputClusterInputInfoStruct {\n"); output.append("\tindex: "); output.append(index); 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 1da988e8b8d2da..a75245a45e0dbe 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -5845,10 +5845,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"); + new CommandResponseInfo( + "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 d484afd327cf51..55b5ee1ddc401d 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -23507,8 +23507,8 @@ class MediaInput(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="inputList", Tag=0x00000000, Type=typing.List[MediaInput.Structs.InputInfo]), - ClusterObjectFieldDescriptor(Label="currentInput", Tag=0x00000001, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="inputList", Tag=0x00000000, Type=typing.List[MediaInput.Structs.InputInfoStruct]), + ClusterObjectFieldDescriptor(Label="currentInput", Tag=0x00000001, Type=uint), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), @@ -23516,8 +23516,8 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - inputList: 'typing.List[MediaInput.Structs.InputInfo]' = None - currentInput: 'typing.Optional[uint]' = None + inputList: 'typing.List[MediaInput.Structs.InputInfoStruct]' = None + currentInput: 'uint' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None attributeList: 'typing.List[uint]' = None @@ -23552,7 +23552,7 @@ class MediaInputFeature(IntFlag): class Structs: @dataclass - class InputInfo(ClusterObject): + class InputInfoStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -23647,9 +23647,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[MediaInput.Structs.InputInfo]) + return ClusterObjectFieldDescriptor(Type=typing.List[MediaInput.Structs.InputInfoStruct]) - value: 'typing.List[MediaInput.Structs.InputInfo]' = field(default_factory=lambda: []) + value: 'typing.List[MediaInput.Structs.InputInfoStruct]' = field(default_factory=lambda: []) @dataclass class CurrentInput(ClusterAttributeDescriptor): @@ -23663,9 +23663,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + return ClusterObjectFieldDescriptor(Type=uint) - value: 'typing.Optional[uint]' = None + value: 'uint' = 0 @dataclass class GeneratedCommandList(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index cda8dd159aee27..de0b1294bf8c6e 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -5054,6 +5054,8 @@ - CredentialStruct TargetNavigator: - TargetInfoStruct + MediaInput: + - InputInfoStruct struct fields: UnitTesting: SimpleStruct: @@ -5173,6 +5175,12 @@ TargetInfoStruct: - identifier - name + MediaInput: + InputInfoStruct: + - index + - inputType + - name + - descriptionString events: OTASoftwareUpdateRequestor: - StateTransition @@ -5493,6 +5501,11 @@ - ExpiringUser - ScheduleRestrictedUser - RemoteOnlyUser + MediaInput: + InputTypeEnum: + - HDMI + - SCART + - USB bitmaps: UnitTesting: - Bitmap8MaskMap @@ -5656,6 +5669,8 @@ - DlCredential TargetNavigator: - TargetInfo + MediaInput: + - InputInfo struct fields: Descriptor: DeviceTypeStruct: @@ -5733,6 +5748,11 @@ - NotSupported - Unrestricted - MasterUser + MediaInput: + InputTypeEnum: + - Hdmi + - Scart + - Usb bitmaps: DoorLock: - DlDaysMaskMap @@ -5908,6 +5928,8 @@ CredentialStruct: DlCredential TargetNavigator: TargetInfoStruct: TargetInfo + MediaInput: + InputInfoStruct: InputInfo struct fields: Descriptor: DeviceTypeStruct: @@ -5998,6 +6020,11 @@ UserTypeEnum: UnrestrictedUser: Unrestricted ProgrammingUser: MasterUser + MediaInput: + InputTypeEnum: + HDMI: Hdmi + SCART: Scart + USB: Usb bitmaps: DoorLock: DaysMaskMap: DlDaysMaskMap diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index b0c6d626231b30..5c22716cd7f43a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -13425,8 +13425,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRMediaInputClusterInputInfo * newElement_0; - newElement_0 = [MTRMediaInputClusterInputInfo new]; + MTRMediaInputClusterInputInfoStruct * newElement_0; + newElement_0 = [MTRMediaInputClusterInputInfoStruct new]; newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index]; newElement_0.inputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.inputType)]; newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data() diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 2799912b5ae98e..ab65a9ab93ae7b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -19028,13 +19028,22 @@ typedef NS_ENUM(uint8_t, MTRMediaInputInputType) { MTRMediaInputInputTypeAux API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, MTRMediaInputInputTypeCoax API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, MTRMediaInputInputTypeComposite API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRMediaInputInputTypeHdmi API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, + MTRMediaInputInputTypeHDMI MTR_NEWLY_AVAILABLE = 0x04, + MTRMediaInputInputTypeHdmi API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRMediaInputInputTypeHDMI") + = 0x04, MTRMediaInputInputTypeInput API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, MTRMediaInputInputTypeLine API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06, MTRMediaInputInputTypeOptical API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07, MTRMediaInputInputTypeVideo API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08, - MTRMediaInputInputTypeScart API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x09, - MTRMediaInputInputTypeUsb API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0A, + MTRMediaInputInputTypeSCART MTR_NEWLY_AVAILABLE = 0x09, + MTRMediaInputInputTypeScart API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRMediaInputInputTypeSCART") + = 0x09, + MTRMediaInputInputTypeUSB MTR_NEWLY_AVAILABLE = 0x0A, + MTRMediaInputInputTypeUsb API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRMediaInputInputTypeUSB") + = 0x0A, MTRMediaInputInputTypeOther API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0B, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index b30211594c8af8..9f0baf21b4e1ac 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -1005,7 +1005,7 @@ typedef void (*MediaPlaybackAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*MediaInputInputListListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); + const chip::app::DataModel::DecodableList & data); typedef void (*MediaInputGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*MediaInputAcceptedCommandListListAttributeCallback)( @@ -9133,7 +9133,8 @@ class MTRMediaInputInputListListAttributeCallbackBridge : public MTRCallbackBrid static void OnSuccessFn( void * context, - const chip::app::DataModel::DecodableList & value); + const chip::app::DataModel::DecodableList & + value); }; class MTRMediaInputInputListListAttributeCallbackSubscriptionBridge : public MTRMediaInputInputListListAttributeCallbackBridge diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index b1d48338b49f2e..ae44cd81bd8991 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -9122,7 +9122,7 @@ } void MTRMediaInputInputListListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList & value) + const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -9130,8 +9130,8 @@ auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRMediaInputClusterInputInfo * newElement_0; - newElement_0 = [MTRMediaInputClusterInputInfo new]; + MTRMediaInputClusterInputInfoStruct * newElement_0; + newElement_0 = [MTRMediaInputClusterInputInfoStruct new]; newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index]; newElement_0.inputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.inputType)]; newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data() diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 469a3a4f04ee1a..a3700cfe2ceacf 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -807,12 +807,17 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSNumber * _Nullable position API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end +MTR_NEWLY_AVAILABLE +@interface MTRMediaInputClusterInputInfoStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull index MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull inputType MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nonnull name MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nonnull descriptionString MTR_NEWLY_AVAILABLE; +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRMediaInputClusterInputInfo : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull index API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull inputType 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)); -@property (nonatomic, copy) NSString * _Nonnull descriptionString API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRMediaInputClusterInputInfoStruct") +@interface MTRMediaInputClusterInputInfo : MTRMediaInputClusterInputInfoStruct @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 e6dcf4c24d4e85..eb5aa85344830c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -3377,7 +3377,7 @@ - (NSString *)description @end -@implementation MTRMediaInputClusterInputInfo +@implementation MTRMediaInputClusterInputInfoStruct - (instancetype)init { if (self = [super init]) { @@ -3395,7 +3395,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRMediaInputClusterInputInfo alloc] init]; + auto other = [[MTRMediaInputClusterInputInfoStruct alloc] init]; other.index = self.index; other.inputType = self.inputType; @@ -3414,6 +3414,9 @@ - (NSString *)description @end +@implementation MTRMediaInputClusterInputInfo : MTRMediaInputClusterInputInfoStruct +@end + @implementation MTRContentLauncherClusterDimension - (instancetype)init { 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 a10d016ae037a9..8fa6f3957765e3 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 @@ -16354,7 +16354,7 @@ namespace Events {} // namespace Events } // namespace MediaPlayback namespace MediaInput { namespace Structs { -namespace InputInfo { +namespace InputInfoStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -16405,7 +16405,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace InputInfo +} // namespace InputInfoStruct } // 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 8c0119bea980e5..565809fbe38ce2 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 @@ -21648,7 +21648,7 @@ struct TypeInfo } // namespace MediaPlayback namespace MediaInput { namespace Structs { -namespace InputInfo { +namespace InputInfoStruct { enum class Fields { kIndex = 0, @@ -21674,7 +21674,7 @@ struct Type using DecodableType = Type; -} // namespace InputInfo +} // namespace InputInfoStruct } // namespace Structs namespace Commands { @@ -21833,10 +21833,11 @@ namespace Attributes { namespace InputList { struct TypeInfo { - using Type = chip::app::DataModel::List; - using DecodableType = chip::app::DataModel::DecodableList; + using Type = chip::app::DataModel::List; + using DecodableType = + chip::app::DataModel::DecodableList; using DecodableArgType = - const chip::app::DataModel::DecodableList &; + const chip::app::DataModel::DecodableList &; static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::InputList::Id; } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 32c5fbb7c4ed94..a7a5a1b22f9b0b 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -877,16 +877,18 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::GroupKeyManagement::St ComplexArgumentParser::Finalize(request.epochKey2); ComplexArgumentParser::Finalize(request.epochStartTime2); } -CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::MediaInput::Structs::InputInfo::Type & request, +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::MediaInput::Structs::InputInfoStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("InputInfo.index", "index", value.isMember("index"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("InputInfo.inputType", "inputType", value.isMember("inputType"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("InputInfo.name", "name", value.isMember("name"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("InputInfoStruct.index", "index", value.isMember("index"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("InputInfoStruct.inputType", "inputType", value.isMember("inputType"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("InputInfoStruct.name", "name", value.isMember("name"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("InputInfo.description", "description", value.isMember("description"))); + ComplexArgumentParser::EnsureMemberExist("InputInfoStruct.description", "description", value.isMember("description"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "index"); @@ -904,7 +906,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters: return CHIP_NO_ERROR; } -void ComplexArgumentParser::Finalize(chip::app::Clusters::MediaInput::Structs::InputInfo::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::MediaInput::Structs::InputInfoStruct::Type & request) { ComplexArgumentParser::Finalize(request.index); ComplexArgumentParser::Finalize(request.inputType); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index 2393db91e0a2c6..14967e2df584df 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -130,10 +130,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::GroupKeyManagem Json::Value & value); static void Finalize(chip::app::Clusters::GroupKeyManagement::Structs::GroupKeySetStruct::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::MediaInput::Structs::InputInfo::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::MediaInput::Structs::InputInfoStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::MediaInput::Structs::InputInfo::Type & request); +static void Finalize(chip::app::Clusters::MediaInput::Structs::InputInfoStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::detail::Structs::LabelStruct::Type & request, Json::Value & value); static void Finalize(chip::app::Clusters::detail::Structs::LabelStruct::Type & request); 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 e5bc01968ffac1..45c397d722cf05 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -889,7 +889,7 @@ 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::MediaInput::Structs::InputInfo::DecodableType & value) + const chip::app::Clusters::MediaInput::Structs::InputInfoStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -8684,7 +8684,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP switch (path.mAttributeId) { case MediaInput::Attributes::InputList::Id: { - chip::app::DataModel::DecodableList value; + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("InputList", 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 3e6913657bb6b9..588e919d32e7e2 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -75,7 +75,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::GroupKeyManagement::Structs::GroupKeySetStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType & value); + const chip::app::Clusters::MediaInput::Structs::InputInfoStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::detail::Structs::LabelStruct::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 2c042ba8a28385..4c97b05a8bb4cf 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -31328,7 +31328,7 @@ class Test_TC_MEDIAINPUT_3_10Suite : 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))); } break; @@ -31426,7 +31426,7 @@ class Test_TC_MEDIAINPUT_3_11Suite : 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))); } break; @@ -31552,7 +31552,7 @@ class Test_TC_MEDIAINPUT_3_12Suite : 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))); } break; @@ -31676,7 +31676,7 @@ class Test_TC_MEDIAINPUT_3_13Suite : 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))); } break; @@ -55477,7 +55477,7 @@ class TV_MediaInputClusterSuite : 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(); @@ -55520,7 +55520,7 @@ class TV_MediaInputClusterSuite : public TestCommand case 7: 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 cbfed49c88c7b8..8e6f470a6d79dc 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -76105,16 +76105,18 @@ class TV_MediaInputCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("InputList", [actualValue count], static_cast(2))); - VerifyOrReturn(CheckValue("index", ((MTRMediaInputClusterInputInfo *) actualValue[0]).index, 1U)); - VerifyOrReturn(CheckValue("inputType", ((MTRMediaInputClusterInputInfo *) actualValue[0]).inputType, 4U)); - VerifyOrReturn(CheckValueAsString("name", ((MTRMediaInputClusterInputInfo *) actualValue[0]).name, @"HDMI")); - VerifyOrReturn(CheckValueAsString("description", - ((MTRMediaInputClusterInputInfo *) actualValue[0]).descriptionString, @"High-Definition Multimedia Interface")); - VerifyOrReturn(CheckValue("index", ((MTRMediaInputClusterInputInfo *) actualValue[1]).index, 2U)); - VerifyOrReturn(CheckValue("inputType", ((MTRMediaInputClusterInputInfo *) actualValue[1]).inputType, 4U)); - VerifyOrReturn(CheckValueAsString("name", ((MTRMediaInputClusterInputInfo *) actualValue[1]).name, @"HDMI")); - VerifyOrReturn(CheckValueAsString("description", - ((MTRMediaInputClusterInputInfo *) actualValue[1]).descriptionString, @"High-Definition Multimedia Interface")); + VerifyOrReturn(CheckValue("Index", ((MTRMediaInputClusterInputInfoStruct *) actualValue[0]).index, 1U)); + VerifyOrReturn(CheckValue("InputType", ((MTRMediaInputClusterInputInfoStruct *) actualValue[0]).inputType, 4U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRMediaInputClusterInputInfoStruct *) actualValue[0]).name, @"HDMI")); + VerifyOrReturn( + CheckValueAsString("Description", ((MTRMediaInputClusterInputInfoStruct *) actualValue[0]).descriptionString, + @"High-Definition Multimedia Interface")); + VerifyOrReturn(CheckValue("Index", ((MTRMediaInputClusterInputInfoStruct *) actualValue[1]).index, 2U)); + VerifyOrReturn(CheckValue("InputType", ((MTRMediaInputClusterInputInfoStruct *) actualValue[1]).inputType, 4U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRMediaInputClusterInputInfoStruct *) actualValue[1]).name, @"HDMI")); + VerifyOrReturn( + CheckValueAsString("Description", ((MTRMediaInputClusterInputInfoStruct *) actualValue[1]).descriptionString, + @"High-Definition Multimedia Interface")); } NextTest(); @@ -76246,16 +76248,19 @@ class TV_MediaInputCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("InputList", [actualValue count], static_cast(2))); - VerifyOrReturn(CheckValue("index", ((MTRMediaInputClusterInputInfo *) actualValue[0]).index, 1U)); - VerifyOrReturn(CheckValue("inputType", ((MTRMediaInputClusterInputInfo *) actualValue[0]).inputType, 4U)); - VerifyOrReturn(CheckValueAsString("name", ((MTRMediaInputClusterInputInfo *) actualValue[0]).name, @"HDMI Test")); - VerifyOrReturn(CheckValueAsString("description", - ((MTRMediaInputClusterInputInfo *) actualValue[0]).descriptionString, @"High-Definition Multimedia Interface")); - VerifyOrReturn(CheckValue("index", ((MTRMediaInputClusterInputInfo *) actualValue[1]).index, 2U)); - VerifyOrReturn(CheckValue("inputType", ((MTRMediaInputClusterInputInfo *) actualValue[1]).inputType, 4U)); - VerifyOrReturn(CheckValueAsString("name", ((MTRMediaInputClusterInputInfo *) actualValue[1]).name, @"HDMI")); - VerifyOrReturn(CheckValueAsString("description", - ((MTRMediaInputClusterInputInfo *) actualValue[1]).descriptionString, @"High-Definition Multimedia Interface")); + VerifyOrReturn(CheckValue("Index", ((MTRMediaInputClusterInputInfoStruct *) actualValue[0]).index, 1U)); + VerifyOrReturn(CheckValue("InputType", ((MTRMediaInputClusterInputInfoStruct *) actualValue[0]).inputType, 4U)); + VerifyOrReturn( + CheckValueAsString("Name", ((MTRMediaInputClusterInputInfoStruct *) actualValue[0]).name, @"HDMI Test")); + VerifyOrReturn( + CheckValueAsString("Description", ((MTRMediaInputClusterInputInfoStruct *) actualValue[0]).descriptionString, + @"High-Definition Multimedia Interface")); + VerifyOrReturn(CheckValue("Index", ((MTRMediaInputClusterInputInfoStruct *) actualValue[1]).index, 2U)); + VerifyOrReturn(CheckValue("InputType", ((MTRMediaInputClusterInputInfoStruct *) actualValue[1]).inputType, 4U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRMediaInputClusterInputInfoStruct *) actualValue[1]).name, @"HDMI")); + VerifyOrReturn( + CheckValueAsString("Description", ((MTRMediaInputClusterInputInfoStruct *) actualValue[1]).descriptionString, + @"High-Definition Multimedia Interface")); } NextTest(); diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h index 860f7a36456706..973fab88ac7eac 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -434,7 +434,7 @@ typedef void (*MediaPlaybackAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*MediaInputInputListListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); + const chip::app::DataModel::DecodableList & data); typedef void (*MediaInputGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*MediaInputAcceptedCommandListListAttributeCallback)(