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 4d824f7c9523c8..59b186e80f2fbe 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 @@ -3198,15 +3198,15 @@ server cluster Channel = 1284 { kLineupInfo = 0x2; } - struct ChannelInfo { + struct ChannelInfoStruct { int16u majorNumber = 0; int16u minorNumber = 1; - optional char_string<32> name = 2; - optional char_string<32> callSign = 3; - optional char_string<32> affiliateCallSign = 4; + optional char_string name = 2; + optional char_string callSign = 3; + optional char_string affiliateCallSign = 4; } - readonly attribute ChannelInfo channelList[] = 0; + readonly attribute ChannelInfoStruct channelList[] = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; } diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 492ab63d4b5a91..1b75963cfa4f85 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -17717,7 +17717,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "LineupInfo", + "type": "LineupInfoStruct", "included": 0, "storageOption": "External", "singleton": 0, @@ -17733,7 +17733,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "ChannelInfo", + "type": "ChannelInfoStruct", "included": 0, "storageOption": "External", "singleton": 0, diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index e5c4258b21f8fd..8d099cae8ed00c 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -17217,7 +17217,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "LineupInfo", + "type": "LineupInfoStruct", "included": 0, "storageOption": "External", "singleton": 0, @@ -17233,7 +17233,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "ChannelInfo", + "type": "ChannelInfoStruct", "included": 0, "storageOption": "External", "singleton": 0, diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index fb1b971e9c8919..6857e8151289ee 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -13253,7 +13253,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "LineupInfo", + "type": "LineupInfoStruct", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -13269,7 +13269,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "ChannelInfo", + "type": "ChannelInfoStruct", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp index 3781b2587bf837..1305aad809972f 100644 --- a/examples/tv-app/android/java/ChannelManager.cpp +++ b/examples/tv-app/android/java/ChannelManager.cpp @@ -78,7 +78,7 @@ CHIP_ERROR ChannelManager::HandleGetChannelList(AttributeValueEncoder & aEncoder for (jint i = 0; i < length; i++) { - chip::app::Clusters::Channel::Structs::ChannelInfo::Type channelInfo; + chip::app::Clusters::Channel::Structs::ChannelInfoStruct::Type channelInfo; jobject channelObject = env->GetObjectArrayElement(channelInfoList, i); jclass channelClass = env->GetObjectClass(channelObject); @@ -131,7 +131,7 @@ CHIP_ERROR ChannelManager::HandleGetChannelList(AttributeValueEncoder & aEncoder CHIP_ERROR ChannelManager::HandleGetLineup(AttributeValueEncoder & aEncoder) { - chip::app::Clusters::Channel::Structs::LineupInfo::Type lineupInfo; + chip::app::Clusters::Channel::Structs::LineupInfoStruct::Type lineupInfo; CHIP_ERROR err = CHIP_NO_ERROR; JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -193,7 +193,7 @@ CHIP_ERROR ChannelManager::HandleGetLineup(AttributeValueEncoder & aEncoder) CHIP_ERROR ChannelManager::HandleGetCurrentChannel(AttributeValueEncoder & aEncoder) { - chip::app::Clusters::Channel::Structs::ChannelInfo::Type channelInfo; + chip::app::Clusters::Channel::Structs::ChannelInfoStruct::Type channelInfo; CHIP_ERROR err = CHIP_NO_ERROR; JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); ChipLogProgress(Zcl, "Received ChannelManager::HandleGetCurrentChannel"); diff --git a/examples/tv-app/linux/include/channel/ChannelManager.h b/examples/tv-app/linux/include/channel/ChannelManager.h index e56681e4810a65..0557624a3c408a 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.h +++ b/examples/tv-app/linux/include/channel/ChannelManager.h @@ -25,8 +25,8 @@ using chip::app::AttributeValueEncoder; using chip::app::CommandResponseHelper; using ChannelDelegate = chip::app::Clusters::Channel::Delegate; using ChangeChannelResponseType = chip::app::Clusters::Channel::Commands::ChangeChannelResponse::Type; -using ChannelInfoType = chip::app::Clusters::Channel::Structs::ChannelInfo::Type; -using LineupInfoType = chip::app::Clusters::Channel::Structs::LineupInfo::Type; +using ChannelInfoType = chip::app::Clusters::Channel::Structs::ChannelInfoStruct::Type; +using LineupInfoType = chip::app::Clusters::Channel::Structs::LineupInfoStruct::Type; class ChannelManager : public ChannelDelegate { diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index ebf90432b978aa..6dce482b4495ef 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1574,24 +1574,24 @@ server cluster Channel = 1284 { kLineupInfo = 0x2; } - struct ChannelInfo { + struct ChannelInfoStruct { int16u majorNumber = 0; int16u minorNumber = 1; - optional char_string<32> name = 2; - optional char_string<32> callSign = 3; - optional char_string<32> affiliateCallSign = 4; + optional char_string name = 2; + optional char_string callSign = 3; + optional char_string affiliateCallSign = 4; } - struct LineupInfo { + struct LineupInfoStruct { char_string operatorName = 0; optional char_string lineupName = 1; optional char_string postalCode = 2; LineupInfoTypeEnum lineupInfoType = 3; } - readonly attribute ChannelInfo channelList[] = 0; - readonly attribute nullable LineupInfo lineup = 1; - readonly attribute nullable ChannelInfo currentChannel = 2; + readonly attribute ChannelInfoStruct channelList[] = 0; + readonly attribute nullable LineupInfoStruct lineup = 1; + readonly attribute nullable ChannelInfoStruct currentChannel = 2; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute attrib_id attributeList[] = 65531; diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 465cfb35fc98e9..871e5543af91eb 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -7737,7 +7737,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "LineupInfo", + "type": "LineupInfoStruct", "included": 1, "storageOption": "External", "singleton": 0, @@ -7753,7 +7753,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "ChannelInfo", + "type": "ChannelInfoStruct", "included": 1, "storageOption": "External", "singleton": 0, @@ -10811,7 +10811,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "LineupInfo", + "type": "LineupInfoStruct", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -10827,7 +10827,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "ChannelInfo", + "type": "ChannelInfoStruct", "included": 0, "storageOption": "RAM", "singleton": 0, 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 b1274ea3994a6b..c4481ea1626c1f 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 @@ -1686,24 +1686,24 @@ client cluster Channel = 1284 { kLineupInfo = 0x2; } - struct ChannelInfo { + struct ChannelInfoStruct { int16u majorNumber = 0; int16u minorNumber = 1; - optional char_string<32> name = 2; - optional char_string<32> callSign = 3; - optional char_string<32> affiliateCallSign = 4; + optional char_string name = 2; + optional char_string callSign = 3; + optional char_string affiliateCallSign = 4; } - struct LineupInfo { + struct LineupInfoStruct { char_string operatorName = 0; optional char_string lineupName = 1; optional char_string postalCode = 2; LineupInfoTypeEnum lineupInfoType = 3; } - readonly attribute ChannelInfo channelList[] = 0; - readonly attribute nullable LineupInfo lineup = 1; - readonly attribute nullable ChannelInfo currentChannel = 2; + readonly attribute ChannelInfoStruct channelList[] = 0; + readonly attribute nullable LineupInfoStruct lineup = 1; + readonly attribute nullable ChannelInfoStruct currentChannel = 2; readonly attribute int16u clusterRevision = 65533; request struct ChangeChannelRequest { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index 565fb7921fe529..8242d2ca19e34c 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -12409,7 +12409,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "LineupInfo", + "type": "LineupInfoStruct", "included": 1, "storageOption": "External", "singleton": 0, @@ -12425,7 +12425,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "ChannelInfo", + "type": "ChannelInfoStruct", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/src/app/tests/suites/TV_ChannelCluster.yaml b/src/app/tests/suites/TV_ChannelCluster.yaml index d425a4709e331b..f0316029d33168 100644 --- a/src/app/tests/suites/TV_ChannelCluster.yaml +++ b/src/app/tests/suites/TV_ChannelCluster.yaml @@ -35,32 +35,32 @@ tests: value: [ { - majorNumber: 6, - minorNumber: 0, - name: "ABC", - callSign: "KAAL-TV", - affiliateCallSign: "KAAL", + MajorNumber: 6, + MinorNumber: 0, + Name: "ABC", + CallSign: "KAAL-TV", + AffiliateCallSign: "KAAL", }, { - majorNumber: 9, - minorNumber: 1, - name: "PBS", - callSign: "KCTS-TV", - affiliateCallSign: "KCTS", + MajorNumber: 9, + MinorNumber: 1, + Name: "PBS", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", }, { - majorNumber: 9, - minorNumber: 2, - name: "PBS Kids", - callSign: "KCTS-TV", - affiliateCallSign: "KCTS", + MajorNumber: 9, + MinorNumber: 2, + Name: "PBS Kids", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", }, { - majorNumber: 9, - minorNumber: 3, - name: "World Channel", - callSign: "KCTS-TV", - affiliateCallSign: "KCTS", + MajorNumber: 9, + MinorNumber: 3, + Name: "World Channel", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", }, ] @@ -70,10 +70,10 @@ tests: response: value: { - operatorName: "Comcast", - lineupName: "Comcast King County", - postalCode: "98052", - lineupInfoType: 0, + OperatorName: "Comcast", + LineupName: "Comcast King County", + PostalCode: "98052", + LineupInfoType: 0, } - label: "Read attribute current channel" @@ -82,11 +82,11 @@ tests: response: value: { - majorNumber: 6, - minorNumber: 0, - name: "ABC", - callSign: "KAAL-TV", - affiliateCallSign: "KAAL", + MajorNumber: 6, + MinorNumber: 0, + Name: "ABC", + CallSign: "KAAL-TV", + AffiliateCallSign: "KAAL", } - label: "Change Channel Command" diff --git a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml index dacacde2c201a4..517d3c6f2073cc 100644 --- a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml @@ -87,4 +87,4 @@ tests: response: value: [majorNumber: majornumber, minorNumber: minornumber + 1] constraints: - type: ChannelInfo + type: ChannelInfoStruct diff --git a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml index d02cce013faf7d..47ac01d7eb5cc1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml @@ -24,54 +24,54 @@ limitations under the License. true true This cluster provides an interface for controlling the current Channel on a device. - ChannelList - Lineup - CurrentChannel + ChannelList + Lineup + CurrentChannel Change the channel on the media player to the channel case-insensitive exact matching the value passed as an argument. - + Change the channel on the media plaeyer to the channel with the given Number in the ChannelList attribute. - - + + This command provides channel up and channel down functionality, but allows channel index jumps of size Count. When the value of the increase or decrease is larger than the number of channels remaining in the given direction, then the behavior SHALL be to return to the beginning (or end) of the channel list and continue. For example, if the current channel is at index 0 and count value of -1 is given, then the current channel should change to the last channel. - + Upon receipt, this SHALL display the active status of the input list on screen. - - + + - + - - - - - + + + + + - + - - - - + + + + - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 3d2cba1636585a..b248975f7e54dd 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3526,24 +3526,24 @@ client cluster Channel = 1284 { kLineupInfo = 0x2; } - struct ChannelInfo { + struct ChannelInfoStruct { int16u majorNumber = 0; int16u minorNumber = 1; - optional char_string<32> name = 2; - optional char_string<32> callSign = 3; - optional char_string<32> affiliateCallSign = 4; + optional char_string name = 2; + optional char_string callSign = 3; + optional char_string affiliateCallSign = 4; } - struct LineupInfo { + struct LineupInfoStruct { char_string operatorName = 0; optional char_string lineupName = 1; optional char_string postalCode = 2; LineupInfoTypeEnum lineupInfoType = 3; } - readonly attribute ChannelInfo channelList[] = 0; - readonly attribute nullable LineupInfo lineup = 1; - readonly attribute nullable ChannelInfo currentChannel = 2; + readonly attribute ChannelInfoStruct channelList[] = 0; + readonly attribute nullable LineupInfoStruct lineup = 1; + readonly attribute nullable ChannelInfoStruct currentChannel = 2; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute attrib_id attributeList[] = 65531; diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index a7bae8bd29abf7..e6f739d98fdab0 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -15339,7 +15339,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "LineupInfo", + "type": "LineupInfoStruct", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -15355,7 +15355,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "ChannelInfo", + "type": "ChannelInfoStruct", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 3df45104c137bd..08ff98454d81a2 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -14739,26 +14739,26 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR newElement_0_affiliateCallSign); } - jclass channelInfoStructClass_1; + jclass channelInfoStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ChannelClusterChannelInfo", channelInfoStructClass_1); + env, "chip/devicecontroller/ChipStructs$ChannelClusterChannelInfoStruct", channelInfoStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterChannelInfo"); + ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterChannelInfoStruct"); return nullptr; } - jmethodID channelInfoStructCtor_1 = env->GetMethodID( - channelInfoStructClass_1, "", + jmethodID channelInfoStructStructCtor_1 = env->GetMethodID( + channelInfoStructStructClass_1, "", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V"); - if (channelInfoStructCtor_1 == nullptr) + if (channelInfoStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterChannelInfo constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterChannelInfoStruct constructor"); return nullptr; } - newElement_0 = env->NewObject(channelInfoStructClass_1, channelInfoStructCtor_1, newElement_0_majorNumber, - newElement_0_minorNumber, newElement_0_name, newElement_0_callSign, - newElement_0_affiliateCallSign); + newElement_0 = env->NewObject(channelInfoStructStructClass_1, channelInfoStructStructCtor_1, + newElement_0_majorNumber, newElement_0_minorNumber, newElement_0_name, + newElement_0_callSign, newElement_0_affiliateCallSign); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; @@ -14814,25 +14814,25 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR value_lineupInfoTypeClassName.c_str(), value_lineupInfoTypeCtorSignature.c_str(), static_cast(cppValue.Value().lineupInfoType), value_lineupInfoType); - jclass lineupInfoStructClass_1; + jclass lineupInfoStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ChannelClusterLineupInfo", lineupInfoStructClass_1); + env, "chip/devicecontroller/ChipStructs$ChannelClusterLineupInfoStruct", lineupInfoStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterLineupInfo"); + ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterLineupInfoStruct"); return nullptr; } - jmethodID lineupInfoStructCtor_1 = - env->GetMethodID(lineupInfoStructClass_1, "", + jmethodID lineupInfoStructStructCtor_1 = + env->GetMethodID(lineupInfoStructStructClass_1, "", "(Ljava/lang/String;Ljava/util/Optional;Ljava/util/Optional;Ljava/lang/Integer;)V"); - if (lineupInfoStructCtor_1 == nullptr) + if (lineupInfoStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterLineupInfo constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterLineupInfoStruct constructor"); return nullptr; } - value = env->NewObject(lineupInfoStructClass_1, lineupInfoStructCtor_1, value_operatorName, value_lineupName, - value_postalCode, value_lineupInfoType); + value = env->NewObject(lineupInfoStructStructClass_1, lineupInfoStructStructCtor_1, value_operatorName, + value_lineupName, value_postalCode, value_lineupInfoType); } return value; } @@ -14903,25 +14903,25 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR value_affiliateCallSign); } - jclass channelInfoStructClass_1; + jclass channelInfoStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ChannelClusterChannelInfo", channelInfoStructClass_1); + env, "chip/devicecontroller/ChipStructs$ChannelClusterChannelInfoStruct", channelInfoStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterChannelInfo"); + ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterChannelInfoStruct"); return nullptr; } - jmethodID channelInfoStructCtor_1 = env->GetMethodID( - channelInfoStructClass_1, "", + jmethodID channelInfoStructStructCtor_1 = env->GetMethodID( + channelInfoStructStructClass_1, "", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V"); - if (channelInfoStructCtor_1 == nullptr) + if (channelInfoStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterChannelInfo constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterChannelInfoStruct constructor"); return nullptr; } - value = env->NewObject(channelInfoStructClass_1, channelInfoStructCtor_1, value_majorNumber, value_minorNumber, - value_name, value_callSign, value_affiliateCallSign); + value = env->NewObject(channelInfoStructStructClass_1, channelInfoStructStructCtor_1, value_majorNumber, + value_minorNumber, value_name, value_callSign, value_affiliateCallSign); } return value; } diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index 617c66020edf6c..b069454b598fd1 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -3303,25 +3303,25 @@ void CHIPChannelClusterChangeChannelResponseCallback::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); } CHIPTargetNavigatorClusterNavigateTargetResponseCallback::CHIPTargetNavigatorClusterNavigateTargetResponseCallback( jobject javaCallback) : diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index f280621327230a..4d7b458aceb649 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -22315,7 +22315,7 @@ CHIPChannelChannelListAttributeCallback::~CHIPChannelChannelListAttributeCallbac void CHIPChannelChannelListAttributeCallback::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; @@ -22394,26 +22394,26 @@ void CHIPChannelChannelListAttributeCallback::CallbackFn( newElement_0_affiliateCallSign); } - jclass channelInfoStructClass_1; - err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$ChannelClusterChannelInfo", - channelInfoStructClass_1); + jclass channelInfoStructStructClass_1; + err = chip::JniReferences::GetInstance().GetClassRef( + env, "chip/devicecontroller/ChipStructs$ChannelClusterChannelInfoStruct", channelInfoStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterChannelInfo"); + ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterChannelInfoStruct"); return; } - jmethodID channelInfoStructCtor_1 = env->GetMethodID( - channelInfoStructClass_1, "", + jmethodID channelInfoStructStructCtor_1 = env->GetMethodID( + channelInfoStructStructClass_1, "", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V"); - if (channelInfoStructCtor_1 == nullptr) + if (channelInfoStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterChannelInfo constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterChannelInfoStruct constructor"); return; } newElement_0 = - env->NewObject(channelInfoStructClass_1, channelInfoStructCtor_1, newElement_0_majorNumber, newElement_0_minorNumber, - newElement_0_name, newElement_0_callSign, newElement_0_affiliateCallSign); + env->NewObject(channelInfoStructStructClass_1, channelInfoStructStructCtor_1, newElement_0_majorNumber, + newElement_0_minorNumber, newElement_0_name, newElement_0_callSign, newElement_0_affiliateCallSign); 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 16355d6ff77b5a..245ea4d0ebb478 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -9374,9 +9374,9 @@ class CHIPChannelChannelListAttributeCallback : public chip::Callback::Callback< } } - static void - CallbackFn(void * context, - const chip::app::DataModel::DecodableList & list); + static void CallbackFn( + void * context, + 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 7bfe29414270a6..32555b323e8246 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -19351,7 +19351,7 @@ public interface ChangeChannelResponseCallback { } public interface ChannelListAttributeCallback { - 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 1028ae6fdd0610..ed78ef268319bd 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -1372,14 +1372,14 @@ public String toString() { } } - public static class ChannelClusterChannelInfo { + public static class ChannelClusterChannelInfoStruct { public Integer majorNumber; public Integer minorNumber; public Optional name; public Optional callSign; public Optional affiliateCallSign; - public ChannelClusterChannelInfo( + public ChannelClusterChannelInfoStruct( Integer majorNumber, Integer minorNumber, Optional name, @@ -1395,7 +1395,7 @@ public ChannelClusterChannelInfo( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("ChannelClusterChannelInfo {\n"); + output.append("ChannelClusterChannelInfoStruct {\n"); output.append("\tmajorNumber: "); output.append(majorNumber); output.append("\n"); @@ -1416,13 +1416,13 @@ public String toString() { } } - public static class ChannelClusterLineupInfo { + public static class ChannelClusterLineupInfoStruct { public String operatorName; public Optional lineupName; public Optional postalCode; public Integer lineupInfoType; - public ChannelClusterLineupInfo( + public ChannelClusterLineupInfoStruct( String operatorName, Optional lineupName, Optional postalCode, @@ -1436,7 +1436,7 @@ public ChannelClusterLineupInfo( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("ChannelClusterLineupInfo {\n"); + output.append("ChannelClusterLineupInfoStruct {\n"); output.append("\toperatorName: "); output.append(operatorName); 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 b671e37bf1e43f..ab4f8ca3bd87f4 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -5500,12 +5500,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); } @@ -5526,10 +5526,10 @@ 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 c646435fc0f568..778393a7ed66e2 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -22549,9 +22549,9 @@ class Channel(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="channelList", Tag=0x00000000, Type=typing.Optional[typing.List[Channel.Structs.ChannelInfo]]), - ClusterObjectFieldDescriptor(Label="lineup", Tag=0x00000001, Type=typing.Union[None, Nullable, Channel.Structs.LineupInfo]), - ClusterObjectFieldDescriptor(Label="currentChannel", Tag=0x00000002, Type=typing.Union[None, Nullable, Channel.Structs.ChannelInfo]), + ClusterObjectFieldDescriptor(Label="channelList", Tag=0x00000000, Type=typing.Optional[typing.List[Channel.Structs.ChannelInfoStruct]]), + ClusterObjectFieldDescriptor(Label="lineup", Tag=0x00000001, Type=typing.Union[None, Nullable, Channel.Structs.LineupInfoStruct]), + ClusterObjectFieldDescriptor(Label="currentChannel", Tag=0x00000002, Type=typing.Union[None, Nullable, Channel.Structs.ChannelInfoStruct]), 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]), @@ -22559,9 +22559,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - channelList: 'typing.Optional[typing.List[Channel.Structs.ChannelInfo]]' = None - lineup: 'typing.Union[None, Nullable, Channel.Structs.LineupInfo]' = None - currentChannel: 'typing.Union[None, Nullable, Channel.Structs.ChannelInfo]' = None + channelList: 'typing.Optional[typing.List[Channel.Structs.ChannelInfoStruct]]' = None + lineup: 'typing.Union[None, Nullable, Channel.Structs.LineupInfoStruct]' = None + currentChannel: 'typing.Union[None, Nullable, Channel.Structs.ChannelInfoStruct]' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None attributeList: 'typing.List[uint]' = None @@ -22596,7 +22596,7 @@ class ChannelFeature(IntFlag): class Structs: @dataclass - class ChannelInfo(ClusterObject): + class ChannelInfoStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -22615,7 +22615,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: affiliateCallSign: 'typing.Optional[str]' = None @dataclass - class LineupInfo(ClusterObject): + class LineupInfoStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -22716,9 +22716,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[Channel.Structs.ChannelInfo]]) + return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[Channel.Structs.ChannelInfoStruct]]) - value: 'typing.Optional[typing.List[Channel.Structs.ChannelInfo]]' = None + value: 'typing.Optional[typing.List[Channel.Structs.ChannelInfoStruct]]' = None @dataclass class Lineup(ClusterAttributeDescriptor): @@ -22732,9 +22732,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, Channel.Structs.LineupInfo]) + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, Channel.Structs.LineupInfoStruct]) - value: 'typing.Union[None, Nullable, Channel.Structs.LineupInfo]' = None + value: 'typing.Union[None, Nullable, Channel.Structs.LineupInfoStruct]' = None @dataclass class CurrentChannel(ClusterAttributeDescriptor): @@ -22748,9 +22748,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, Channel.Structs.ChannelInfo]) + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, Channel.Structs.ChannelInfoStruct]) - value: 'typing.Union[None, Nullable, Channel.Structs.ChannelInfo]' = None + value: 'typing.Union[None, Nullable, Channel.Structs.ChannelInfoStruct]' = None @dataclass class GeneratedCommandList(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 956c5723741f65..42e5e2afb7b666 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -5064,6 +5064,9 @@ - InputInfoStruct AudioOutput: - OutputInfoStruct + Channel: + - ChannelInfoStruct + - LineupInfoStruct struct fields: UnitTesting: SimpleStruct: @@ -5194,6 +5197,18 @@ - index - outputType - name + Channel: + ChannelInfoStruct: + - majorNumber + - minorNumber + - name + - callSign + - affiliateCallSign + LineupInfoStruct: + - operatorName + - lineupName + - postalCode + - lineupInfoType events: OTASoftwareUpdateRequestor: - StateTransition @@ -5523,6 +5538,9 @@ OutputTypeEnum: - HDMI - BT + Channel: + LineupInfoTypeEnum: + - MSO bitmaps: UnitTesting: - Bitmap8MaskMap @@ -5698,6 +5716,9 @@ - InputInfo AudioOutput: - OutputInfo + Channel: + - ChannelInfo + - LineupInfo struct fields: Descriptor: DeviceTypeStruct: @@ -5784,6 +5805,9 @@ OutputTypeEnum: - Hdmi - Bt + Channel: + LineupInfoTypeEnum: + - Mso bitmaps: DoorLock: - DlDaysMaskMap @@ -5963,6 +5987,9 @@ InputInfoStruct: InputInfo AudioOutput: OutputInfoStruct: OutputInfo + Channel: + ChannelInfoStruct: ChannelInfo + LineupInfoStruct: LineupInfo struct fields: Descriptor: DeviceTypeStruct: @@ -6062,6 +6089,9 @@ OutputTypeEnum: HDMI: Hdmi BT: Bt + Channel: + LineupInfoTypeEnum: + MSO: Mso 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 ef6c8ed19a1d46..393bb48521a910 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -12834,8 +12834,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRChannelClusterChannelInfo * newElement_0; - newElement_0 = [MTRChannelClusterChannelInfo new]; + MTRChannelClusterChannelInfoStruct * newElement_0; + newElement_0 = [MTRChannelClusterChannelInfoStruct new]; newElement_0.majorNumber = [NSNumber numberWithUnsignedShort:entry_0.majorNumber]; newElement_0.minorNumber = [NSNumber numberWithUnsignedShort:entry_0.minorNumber]; if (entry_0.name.HasValue()) { @@ -12877,11 +12877,11 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & if (*aError != CHIP_NO_ERROR) { return nil; } - MTRChannelClusterLineupInfo * _Nullable value; + MTRChannelClusterLineupInfoStruct * _Nullable value; if (cppValue.IsNull()) { value = nil; } else { - value = [MTRChannelClusterLineupInfo new]; + value = [MTRChannelClusterLineupInfoStruct new]; value.operatorName = [[NSString alloc] initWithBytes:cppValue.Value().operatorName.data() length:cppValue.Value().operatorName.size() encoding:NSUTF8StringEncoding]; @@ -12910,11 +12910,11 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & if (*aError != CHIP_NO_ERROR) { return nil; } - MTRChannelClusterChannelInfo * _Nullable value; + MTRChannelClusterChannelInfoStruct * _Nullable value; if (cppValue.IsNull()) { value = nil; } else { - value = [MTRChannelClusterChannelInfo new]; + value = [MTRChannelClusterChannelInfoStruct new]; value.majorNumber = [NSNumber numberWithUnsignedShort:cppValue.Value().majorNumber]; value.minorNumber = [NSNumber numberWithUnsignedShort:cppValue.Value().minorNumber]; if (cppValue.Value().name.HasValue()) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 71a1b8d31e4c45..16e875983f4402 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -12171,28 +12171,28 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; -- (void)readAttributeLineupWithCompletion:(void (^)(MTRChannelClusterLineupInfo * _Nullable value, +- (void)readAttributeLineupWithCompletion:(void (^)(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (void)subscribeAttributeLineupWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(MTRChannelClusterLineupInfo * _Nullable value, + reportHandler:(void (^)(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_NEWLY_AVAILABLE; + (void)readAttributeLineupWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue - completion:(void (^)(MTRChannelClusterLineupInfo * _Nullable value, + completion:(void (^)(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; -- (void)readAttributeCurrentChannelWithCompletion:(void (^)(MTRChannelClusterChannelInfo * _Nullable value, +- (void)readAttributeCurrentChannelWithCompletion:(void (^)(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (void)subscribeAttributeCurrentChannelWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(MTRChannelClusterChannelInfo * _Nullable value, + reportHandler:(void (^)(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_NEWLY_AVAILABLE; + (void)readAttributeCurrentChannelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue - completion:(void (^)(MTRChannelClusterChannelInfo * _Nullable value, + completion:(void (^)(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion @@ -18988,7 +18988,10 @@ typedef NS_ENUM(uint8_t, MTRChannelStatus) { } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_ENUM(uint8_t, MTRChannelLineupInfoType) { - MTRChannelLineupInfoTypeMso API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, + MTRChannelLineupInfoTypeMSO MTR_NEWLY_AVAILABLE = 0x00, + MTRChannelLineupInfoTypeMso API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRChannelLineupInfoTypeMSO") + = 0x00, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_OPTIONS(uint32_t, MTRChannelFeature) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 7ee53394cf669f..207978a751f298 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -83816,22 +83816,23 @@ + (void)readAttributeChannelListWithClusterStateCache:(MTRClusterStateCacheConta }); } -- (void)readAttributeLineupWithCompletion:(void (^)( - MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error))completion +- (void)readAttributeLineupWithCompletion:(void (^)(MTRChannelClusterLineupInfoStruct * _Nullable value, + NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = Channel::Attributes::Lineup::TypeInfo; - return MTRReadAttribute( + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } - (void)subscribeAttributeLineupWithParams:(MTRSubscribeParams * _Nonnull)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler: - (void (^)(MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error))reportHandler + reportHandler:(void (^)(MTRChannelClusterLineupInfoStruct * _Nullable value, + NSError * _Nullable error))reportHandler { using TypeInfo = Channel::Attributes::Lineup::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -83839,7 +83840,7 @@ - (void)subscribeAttributeLineupWithParams:(MTRSubscribeParams * _Nonnull)params + (void)readAttributeLineupWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue - completion:(void (^)(MTRChannelClusterLineupInfo * _Nullable value, + completion:(void (^)(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error))completion { auto * bridge = new MTRChannelLineupStructAttributeCallbackBridge(queue, completion); @@ -83862,23 +83863,23 @@ + (void)readAttributeLineupWithClusterStateCache:(MTRClusterStateCacheContainer }); } -- (void)readAttributeCurrentChannelWithCompletion:(void (^)(MTRChannelClusterChannelInfo * _Nullable value, +- (void)readAttributeCurrentChannelWithCompletion:(void (^)(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = Channel::Attributes::CurrentChannel::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } - (void)subscribeAttributeCurrentChannelWithParams:(MTRSubscribeParams * _Nonnull)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(MTRChannelClusterChannelInfo * _Nullable value, + reportHandler:(void (^)(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = Channel::Attributes::CurrentChannel::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -83886,7 +83887,7 @@ - (void)subscribeAttributeCurrentChannelWithParams:(MTRSubscribeParams * _Nonnul + (void)readAttributeCurrentChannelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue - completion:(void (^)(MTRChannelClusterChannelInfo * _Nullable value, + completion:(void (^)(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error))completion { auto * bridge = new MTRChannelCurrentChannelStructAttributeCallbackBridge(queue, completion); @@ -84198,7 +84199,7 @@ + (void)readAttributeChannelListWithAttributeCache:(MTRAttributeCacheContainer * - (void)readAttributeLineupWithCompletionHandler:(void (^)(MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error))completionHandler { - [self readAttributeLineupWithCompletion:^(MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error) { + [self readAttributeLineupWithCompletion:^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. completionHandler(static_cast(value), error); }]; @@ -84219,7 +84220,7 @@ - (void)subscribeAttributeLineupWithMinInterval:(NSNumber * _Nonnull)minInterval } [self subscribeAttributeLineupWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler - reportHandler:^(MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error) { + reportHandler:^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. reportHandler(static_cast(value), error); }]; @@ -84230,19 +84231,21 @@ + (void)readAttributeLineupWithAttributeCache:(MTRAttributeCacheContainer *)attr completionHandler:(void (^)(MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error))completionHandler { - [self readAttributeLineupWithClusterStateCache:attributeCacheContainer.realContainer - endpoint:endpoint - queue:queue - completion:^(MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error) { - // Cast is safe because subclass does not add any selectors. - completionHandler(static_cast(value), error); - }]; + [self + readAttributeLineupWithClusterStateCache:attributeCacheContainer.realContainer + endpoint:endpoint + queue:queue + completion:^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error) { + // Cast is safe because subclass does not add any selectors. + completionHandler(static_cast(value), error); + }]; } - (void)readAttributeCurrentChannelWithCompletionHandler:(void (^)(MTRChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error))completionHandler { - [self readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error) { + [self readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. completionHandler(static_cast(value), error); }]; @@ -84263,7 +84266,8 @@ - (void)subscribeAttributeCurrentChannelWithMinInterval:(NSNumber * _Nonnull)min } [self subscribeAttributeCurrentChannelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler - reportHandler:^(MTRChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error) { + reportHandler:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. reportHandler(static_cast(value), error); }]; @@ -84277,8 +84281,8 @@ + (void)readAttributeCurrentChannelWithAttributeCache:(MTRAttributeCacheContaine [self readAttributeCurrentChannelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue - completion:^( - MTRChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error) { + completion:^(MTRChannelClusterChannelInfoStruct * _Nullable value, + NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. completionHandler(static_cast(value), error); }]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 6ead37c8c4e59f..a545a67106e486 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -974,11 +974,11 @@ typedef void (*WakeOnLANAttributeListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); typedef void (*ChannelChannelListListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); + const chip::app::DataModel::DecodableList & data); typedef void (*ChannelLineupStructAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); + void *, const chip::app::DataModel::Nullable &); typedef void (*ChannelCurrentChannelStructAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); + void *, const chip::app::DataModel::Nullable &); typedef void (*ChannelGeneratedCommandListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); typedef void (*ChannelAcceptedCommandListListAttributeCallback)(void * context, @@ -8671,7 +8671,7 @@ class MTRChannelChannelListListAttributeCallbackBridge : public MTRCallbackBridg static void OnSuccessFn( void * context, - const chip::app::DataModel::DecodableList & value); + const chip::app::DataModel::DecodableList & value); }; class MTRChannelChannelListListAttributeCallbackSubscriptionBridge : public MTRChannelChannelListListAttributeCallbackBridge @@ -8701,9 +8701,9 @@ class MTRChannelLineupStructAttributeCallbackBridge : public MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn( + void * context, + const chip::app::DataModel::Nullable & value); }; class MTRChannelLineupStructAttributeCallbackSubscriptionBridge : public MTRChannelLineupStructAttributeCallbackBridge @@ -8733,9 +8733,9 @@ class MTRChannelCurrentChannelStructAttributeCallbackBridge : public MTRCallback MTRChannelCurrentChannelStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn( + void * context, + const chip::app::DataModel::Nullable & value); }; class MTRChannelCurrentChannelStructAttributeCallbackSubscriptionBridge diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index 2ffa8a90dde52e..e1403c04b5229d 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -8548,7 +8548,7 @@ } void MTRChannelChannelListListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList & value) + const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -8556,8 +8556,8 @@ auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRChannelClusterChannelInfo * newElement_0; - newElement_0 = [MTRChannelClusterChannelInfo new]; + MTRChannelClusterChannelInfoStruct * newElement_0; + newElement_0 = [MTRChannelClusterChannelInfoStruct new]; newElement_0.majorNumber = [NSNumber numberWithUnsignedShort:entry_0.majorNumber]; newElement_0.minorNumber = [NSNumber numberWithUnsignedShort:entry_0.minorNumber]; if (entry_0.name.HasValue()) { @@ -8608,14 +8608,14 @@ } } -void MTRChannelLineupStructAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRChannelLineupStructAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value) { - MTRChannelClusterLineupInfo * _Nullable objCValue; + MTRChannelClusterLineupInfoStruct * _Nullable objCValue; if (value.IsNull()) { objCValue = nil; } else { - objCValue = [MTRChannelClusterLineupInfo new]; + objCValue = [MTRChannelClusterLineupInfoStruct new]; objCValue.operatorName = [[NSString alloc] initWithBytes:value.Value().operatorName.data() length:value.Value().operatorName.size() encoding:NSUTF8StringEncoding]; @@ -8653,14 +8653,14 @@ } } -void MTRChannelCurrentChannelStructAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRChannelCurrentChannelStructAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value) { - MTRChannelClusterChannelInfo * _Nullable objCValue; + MTRChannelClusterChannelInfoStruct * _Nullable objCValue; if (value.IsNull()) { objCValue = nil; } else { - objCValue = [MTRChannelClusterChannelInfo new]; + objCValue = [MTRChannelClusterChannelInfoStruct new]; objCValue.majorNumber = [NSNumber numberWithUnsignedShort:value.Value().majorNumber]; objCValue.minorNumber = [NSNumber numberWithUnsignedShort:value.Value().minorNumber]; if (value.Value().name.HasValue()) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 69f1a4e15559ac..1d17ce7b828f04 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -773,21 +773,30 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSNumber * _Nullable coolSetpoint API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end +MTR_NEWLY_AVAILABLE +@interface MTRChannelClusterChannelInfoStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull majorNumber MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull minorNumber MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nullable name MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nullable callSign MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nullable affiliateCallSign MTR_NEWLY_AVAILABLE; +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRChannelClusterChannelInfo : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull majorNumber API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull minorNumber API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSString * _Nullable name API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSString * _Nullable callSign API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSString * _Nullable affiliateCallSign API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRChannelClusterChannelInfoStruct") +@interface MTRChannelClusterChannelInfo : MTRChannelClusterChannelInfoStruct +@end +MTR_NEWLY_AVAILABLE +@interface MTRChannelClusterLineupInfoStruct : NSObject +@property (nonatomic, copy) NSString * _Nonnull operatorName MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nullable lineupName MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nullable postalCode MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull lineupInfoType MTR_NEWLY_AVAILABLE; @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRChannelClusterLineupInfo : NSObject -@property (nonatomic, copy) NSString * _Nonnull operatorName API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSString * _Nullable lineupName API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSString * _Nullable postalCode 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)); +MTR_NEWLY_DEPRECATED("Please use MTRChannelClusterLineupInfoStruct") +@interface MTRChannelClusterLineupInfo : MTRChannelClusterLineupInfoStruct @end MTR_NEWLY_AVAILABLE diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 3cc483822e7816..266e00379f22fb 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -3233,7 +3233,7 @@ - (NSString *)description @end -@implementation MTRChannelClusterChannelInfo +@implementation MTRChannelClusterChannelInfoStruct - (instancetype)init { if (self = [super init]) { @@ -3253,7 +3253,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRChannelClusterChannelInfo alloc] init]; + auto other = [[MTRChannelClusterChannelInfoStruct alloc] init]; other.majorNumber = self.majorNumber; other.minorNumber = self.minorNumber; @@ -3274,7 +3274,10 @@ - (NSString *)description @end -@implementation MTRChannelClusterLineupInfo +@implementation MTRChannelClusterChannelInfo : MTRChannelClusterChannelInfoStruct +@end + +@implementation MTRChannelClusterLineupInfoStruct - (instancetype)init { if (self = [super init]) { @@ -3292,7 +3295,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRChannelClusterLineupInfo alloc] init]; + auto other = [[MTRChannelClusterLineupInfoStruct alloc] init]; other.operatorName = self.operatorName; other.lineupName = self.lineupName; @@ -3312,6 +3315,9 @@ - (NSString *)description @end +@implementation MTRChannelClusterLineupInfo : MTRChannelClusterLineupInfoStruct +@end + @implementation MTRTargetNavigatorClusterTargetInfoStruct - (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 6e4b93de079725..859b2c5d130c49 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -8570,7 +8570,7 @@ bool emberAfChannelClusterChangeChannelCallback( * @brief Channel Cluster ChangeChannelResponse Command callback (from server) */ bool emberAfChannelClusterChangeChannelResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status, chip::CharSpan data); + uint8_t Status, chip::CharSpan Data); /** * @brief Channel Cluster ChangeChannelByNumber 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 1d8e9c430535fa..626892f8205c2c 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 @@ -15352,7 +15352,7 @@ namespace Events {} // namespace Events } // namespace WakeOnLan namespace Channel { namespace Structs { -namespace ChannelInfo { +namespace ChannelInfoStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -15407,8 +15407,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace ChannelInfo -namespace LineupInfo { +} // namespace ChannelInfoStruct +namespace LineupInfoStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -15459,7 +15459,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace LineupInfo +} // namespace LineupInfoStruct } // 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 a8dc08773df170..8223fc23f24bc3 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 @@ -20547,7 +20547,7 @@ struct TypeInfo } // namespace WakeOnLan namespace Channel { namespace Structs { -namespace ChannelInfo { +namespace ChannelInfoStruct { enum class Fields { kMajorNumber = 0, @@ -20575,8 +20575,8 @@ struct Type using DecodableType = Type; -} // namespace ChannelInfo -namespace LineupInfo { +} // namespace ChannelInfoStruct +namespace LineupInfoStruct { enum class Fields { kOperatorName = 0, @@ -20602,7 +20602,7 @@ struct Type using DecodableType = Type; -} // namespace LineupInfo +} // namespace LineupInfoStruct } // namespace Structs namespace Commands { @@ -20772,10 +20772,11 @@ namespace Attributes { namespace ChannelList { 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::Channel::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ChannelList::Id; } @@ -20785,10 +20786,10 @@ struct TypeInfo namespace Lineup { struct TypeInfo { - using Type = chip::app::DataModel::Nullable; - using DecodableType = chip::app::DataModel::Nullable; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = - const chip::app::DataModel::Nullable &; + const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::Lineup::Id; } @@ -20798,10 +20799,10 @@ struct TypeInfo namespace CurrentChannel { struct TypeInfo { - using Type = chip::app::DataModel::Nullable; - using DecodableType = chip::app::DataModel::Nullable; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = - const chip::app::DataModel::Nullable &; + const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::CurrentChannel::Id; } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 6fb811d71404dc..59df59c1eebdc7 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -431,15 +431,16 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::BasicInformation::Stru ComplexArgumentParser::Finalize(request.caseSessionsPerFabric); ComplexArgumentParser::Finalize(request.subscriptionsPerFabric); } -CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::Channel::Structs::ChannelInfo::Type & request, +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::Channel::Structs::ChannelInfoStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("ChannelInfo.majorNumber", "majorNumber", value.isMember("majorNumber"))); + ComplexArgumentParser::EnsureMemberExist("ChannelInfoStruct.majorNumber", "majorNumber", value.isMember("majorNumber"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("ChannelInfo.minorNumber", "minorNumber", value.isMember("minorNumber"))); + ComplexArgumentParser::EnsureMemberExist("ChannelInfoStruct.minorNumber", "minorNumber", value.isMember("minorNumber"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "majorNumber"); @@ -469,7 +470,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters: return CHIP_NO_ERROR; } -void ComplexArgumentParser::Finalize(chip::app::Clusters::Channel::Structs::ChannelInfo::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::Channel::Structs::ChannelInfoStruct::Type & request) { ComplexArgumentParser::Finalize(request.majorNumber); ComplexArgumentParser::Finalize(request.minorNumber); @@ -936,15 +937,15 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::detail::Structs::Label ComplexArgumentParser::Finalize(request.label); ComplexArgumentParser::Finalize(request.value); } -CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::Channel::Structs::LineupInfo::Type & request, +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::Channel::Structs::LineupInfoStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("LineupInfo.operatorName", "operatorName", value.isMember("operatorName"))); - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("LineupInfo.lineupInfoType", "lineupInfoType", value.isMember("lineupInfoType"))); + ComplexArgumentParser::EnsureMemberExist("LineupInfoStruct.operatorName", "operatorName", value.isMember("operatorName"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("LineupInfoStruct.lineupInfoType", "lineupInfoType", + value.isMember("lineupInfoType"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "operatorName"); @@ -968,7 +969,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters: return CHIP_NO_ERROR; } -void ComplexArgumentParser::Finalize(chip::app::Clusters::Channel::Structs::LineupInfo::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::Channel::Structs::LineupInfoStruct::Type & request) { ComplexArgumentParser::Finalize(request.operatorName); ComplexArgumentParser::Finalize(request.lineupName); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index c6fd570e1de9c6..754e17ce83139d 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -77,10 +77,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::BasicInformatio Json::Value & value); static void Finalize(chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Channel::Structs::ChannelInfo::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Channel::Structs::ChannelInfoStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::Channel::Structs::ChannelInfo::Type & request); +static void Finalize(chip::app::Clusters::Channel::Structs::ChannelInfoStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type & request, Json::Value & value); @@ -137,9 +137,10 @@ static void Finalize(chip::app::Clusters::MediaInput::Structs::InputInfoStruct:: 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); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Channel::Structs::LineupInfo::Type & request, Json::Value & value); +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Channel::Structs::LineupInfoStruct::Type & request, + Json::Value & value); -static void Finalize(chip::app::Clusters::Channel::Structs::LineupInfo::Type & request); +static void Finalize(chip::app::Clusters::Channel::Structs::LineupInfoStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::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 f395b5b63ae5a6..e19342c120e493 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -429,7 +429,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::Channel::Structs::ChannelInfo::DecodableType & value) + const chip::app::Clusters::Channel::Structs::ChannelInfoStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -953,7 +953,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::Channel::Structs::LineupInfo::DecodableType & value) + const chip::app::Clusters::Channel::Structs::LineupInfoStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -8530,17 +8530,17 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP switch (path.mAttributeId) { case Channel::Attributes::ChannelList::Id: { - chip::app::DataModel::DecodableList value; + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ChannelList", 1, value); } case Channel::Attributes::Lineup::Id: { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Lineup", 1, value); } case Channel::Attributes::CurrentChannel::Id: { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CurrentChannel", 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 adad82f4bed94d..3feb91e099db25 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -48,7 +48,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::BasicInformation::Structs::CapabilityMinimaStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType & value); + const chip::app::Clusters::Channel::Structs::ChannelInfoStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ContentLauncher::Structs::ContentSearch::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, @@ -79,7 +79,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::detail::Structs::LabelStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType & value); + const chip::app::Clusters::Channel::Structs::LineupInfoStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::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 5120e5cfef0e51..d678f987dffc00 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -32110,7 +32110,7 @@ class Test_TC_CHANNEL_5_1Suite : 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; @@ -32213,7 +32213,7 @@ class Test_TC_CHANNEL_5_2Suite : 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))); VerifyOrReturn(CheckConstraintType("value", "list", "list")); } @@ -32228,7 +32228,7 @@ class Test_TC_CHANNEL_5_2Suite : public TestCommand case 4: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("currentChannel", value)); } @@ -32357,14 +32357,14 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand case 1: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; 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")); } @@ -32372,7 +32372,7 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand case 3: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("currentChannel", value)); } @@ -32387,10 +32387,10 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("currentChannel", value)); - VerifyOrReturn(CheckConstraintType("value", "ChannelInfo", "ChannelInfo")); + VerifyOrReturn(CheckConstraintType("value", "ChannelInfoStruct", "ChannelInfoStruct")); } break; default: @@ -55072,7 +55072,7 @@ class TV_ChannelClusterSuite : 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(); @@ -55131,7 +55131,7 @@ class TV_ChannelClusterSuite : public TestCommand case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("lineup", value)); VerifyOrReturn( @@ -55148,7 +55148,7 @@ class TV_ChannelClusterSuite : public TestCommand case 3: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("currentChannel", value)); VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 6U)); diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 82b58f558c753d..584d0117c276a1 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -68614,13 +68614,14 @@ class ReadChannelLineup : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - [cluster readAttributeLineupWithCompletion:^(MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error) { - NSLog(@"Channel.Lineup response %@", [value description]); - if (error != nil) { - LogNSError("Channel Lineup read Error", error); - } - SetCommandExitStatus(error); - }]; + [cluster + readAttributeLineupWithCompletion:^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error) { + NSLog(@"Channel.Lineup response %@", [value description]); + if (error != nil) { + LogNSError("Channel Lineup read Error", error); + } + SetCommandExitStatus(error); + }]; return CHIP_NO_ERROR; } }; @@ -68653,7 +68654,7 @@ class SubscribeAttributeChannelLineup : public SubscribeAttribute { subscriptionEstablished:^() { mSubscriptionEstablished = YES; } - reportHandler:^(MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error) { + reportHandler:^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error) { NSLog(@"Channel.Lineup response %@", [value description]); SetCommandExitStatus(error); }]; @@ -68680,14 +68681,14 @@ class ReadChannelCurrentChannel : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - [cluster - readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error) { - NSLog(@"Channel.CurrentChannel response %@", [value description]); - if (error != nil) { - LogNSError("Channel CurrentChannel read Error", error); - } - SetCommandExitStatus(error); - }]; + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error) { + NSLog(@"Channel.CurrentChannel response %@", [value description]); + if (error != nil) { + LogNSError("Channel CurrentChannel read Error", error); + } + SetCommandExitStatus(error); + }]; return CHIP_NO_ERROR; } }; @@ -68720,7 +68721,7 @@ class SubscribeAttributeChannelCurrentChannel : public SubscribeAttribute { subscriptionEstablished:^() { mSubscriptionEstablished = YES; } - reportHandler:^(MTRChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error) { + reportHandler:^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error) { NSLog(@"Channel.CurrentChannel response %@", [value description]); SetCommandExitStatus(error); }]; 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 aa5ff128727f71..f3d5c39e4273a8 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -43211,19 +43211,19 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge { __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster - readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfo * _Nullable value, NSError * _Nullable err) { - NSLog(@"Reads the CurrentChannel attribute Error: %@", err); + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Reads the CurrentChannel attribute Error: %@", err); - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - { - id actualValue = value; - VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); - } + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + } - NextTest(); - }]; + NextTest(); + }]; return CHIP_NO_ERROR; } @@ -43401,7 +43401,7 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster readAttributeLineupWithCompletion:^(MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable err) { + [cluster readAttributeLineupWithCompletion:^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable err) { NSLog(@"TH reads the Lineup attribute from the DUT to show list of Inputs available and Verify that the response " @"contains a lineup info object Error: %@", err); @@ -43442,19 +43442,19 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster - readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfo * _Nullable value, NSError * _Nullable err) { - NSLog(@"Reads the CurrentChannel attribute from the DUT Error: %@", err); + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Reads the CurrentChannel attribute from the DUT Error: %@", err); - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - { - id actualValue = value; - VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); - } + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + } - NextTest(); - }]; + NextTest(); + }]; return CHIP_NO_ERROR; } @@ -43500,23 +43500,23 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster - readAttributeCurrentChannelWithCompletion:^(MTRChannelClusterChannelInfo * _Nullable value, NSError * _Nullable err) { - NSLog(@"Reads the CurrentChannel attribute from the DUT Error: %@", err); + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Reads the CurrentChannel attribute from the DUT Error: %@", err); - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - { - id actualValue = value; - VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); - } - if (value != nil) { + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + } + if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentChannel", "ChannelInfo", "ChannelInfo")); - } + VerifyOrReturn(CheckConstraintType("currentChannel", "ChannelInfoStruct", "ChannelInfoStruct")); + } - NextTest(); - }]; + NextTest(); + }]; return CHIP_NO_ERROR; } @@ -75487,35 +75487,36 @@ class TV_ChannelCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("ChannelList", [actualValue count], static_cast(4))); - VerifyOrReturn(CheckValue("majorNumber", ((MTRChannelClusterChannelInfo *) actualValue[0]).majorNumber, 6U)); - VerifyOrReturn(CheckValue("minorNumber", ((MTRChannelClusterChannelInfo *) actualValue[0]).minorNumber, 0U)); - VerifyOrReturn(CheckValueAsString("name", ((MTRChannelClusterChannelInfo *) actualValue[0]).name, @"ABC")); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).majorNumber, 6U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).minorNumber, 0U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).name, @"ABC")); VerifyOrReturn( - CheckValueAsString("callSign", ((MTRChannelClusterChannelInfo *) actualValue[0]).callSign, @"KAAL-TV")); + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).callSign, @"KAAL-TV")); VerifyOrReturn(CheckValueAsString( - "affiliateCallSign", ((MTRChannelClusterChannelInfo *) actualValue[0]).affiliateCallSign, @"KAAL")); - VerifyOrReturn(CheckValue("majorNumber", ((MTRChannelClusterChannelInfo *) actualValue[1]).majorNumber, 9U)); - VerifyOrReturn(CheckValue("minorNumber", ((MTRChannelClusterChannelInfo *) actualValue[1]).minorNumber, 1U)); - VerifyOrReturn(CheckValueAsString("name", ((MTRChannelClusterChannelInfo *) actualValue[1]).name, @"PBS")); + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).affiliateCallSign, @"KAAL")); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).minorNumber, 1U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).name, @"PBS")); VerifyOrReturn( - CheckValueAsString("callSign", ((MTRChannelClusterChannelInfo *) actualValue[1]).callSign, @"KCTS-TV")); + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).callSign, @"KCTS-TV")); VerifyOrReturn(CheckValueAsString( - "affiliateCallSign", ((MTRChannelClusterChannelInfo *) actualValue[1]).affiliateCallSign, @"KCTS")); - VerifyOrReturn(CheckValue("majorNumber", ((MTRChannelClusterChannelInfo *) actualValue[2]).majorNumber, 9U)); - VerifyOrReturn(CheckValue("minorNumber", ((MTRChannelClusterChannelInfo *) actualValue[2]).minorNumber, 2U)); - VerifyOrReturn(CheckValueAsString("name", ((MTRChannelClusterChannelInfo *) actualValue[2]).name, @"PBS Kids")); + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).affiliateCallSign, @"KCTS")); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).minorNumber, 2U)); VerifyOrReturn( - CheckValueAsString("callSign", ((MTRChannelClusterChannelInfo *) actualValue[2]).callSign, @"KCTS-TV")); + CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).name, @"PBS Kids")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).callSign, @"KCTS-TV")); VerifyOrReturn(CheckValueAsString( - "affiliateCallSign", ((MTRChannelClusterChannelInfo *) actualValue[2]).affiliateCallSign, @"KCTS")); - VerifyOrReturn(CheckValue("majorNumber", ((MTRChannelClusterChannelInfo *) actualValue[3]).majorNumber, 9U)); - VerifyOrReturn(CheckValue("minorNumber", ((MTRChannelClusterChannelInfo *) actualValue[3]).minorNumber, 3U)); + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).affiliateCallSign, @"KCTS")); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).minorNumber, 3U)); VerifyOrReturn( - CheckValueAsString("name", ((MTRChannelClusterChannelInfo *) actualValue[3]).name, @"World Channel")); + CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).name, @"World Channel")); VerifyOrReturn( - CheckValueAsString("callSign", ((MTRChannelClusterChannelInfo *) actualValue[3]).callSign, @"KCTS-TV")); + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).callSign, @"KCTS-TV")); VerifyOrReturn(CheckValueAsString( - "affiliateCallSign", ((MTRChannelClusterChannelInfo *) actualValue[3]).affiliateCallSign, @"KCTS")); + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).affiliateCallSign, @"KCTS")); } NextTest(); @@ -75532,7 +75533,7 @@ class TV_ChannelCluster : public TestCommandBridge { __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster readAttributeLineupWithCompletion:^(MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable err) { + [cluster readAttributeLineupWithCompletion:^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable err) { NSLog(@"Read attribute channel lineup Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -75540,13 +75541,14 @@ class TV_ChannelCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValueNonNull("Lineup", actualValue)); - VerifyOrReturn( - CheckValueAsString("operatorName", ((MTRChannelClusterLineupInfo *) actualValue).operatorName, @"Comcast")); VerifyOrReturn(CheckValueAsString( - "lineupName", ((MTRChannelClusterLineupInfo *) actualValue).lineupName, @"Comcast King County")); + "OperatorName", ((MTRChannelClusterLineupInfoStruct *) actualValue).operatorName, @"Comcast")); + VerifyOrReturn(CheckValueAsString( + "LineupName", ((MTRChannelClusterLineupInfoStruct *) actualValue).lineupName, @"Comcast King County")); + VerifyOrReturn( + CheckValueAsString("PostalCode", ((MTRChannelClusterLineupInfoStruct *) actualValue).postalCode, @"98052")); VerifyOrReturn( - CheckValueAsString("postalCode", ((MTRChannelClusterLineupInfo *) actualValue).postalCode, @"98052")); - VerifyOrReturn(CheckValue("lineupInfoType", ((MTRChannelClusterLineupInfo *) actualValue).lineupInfoType, 0U)); + CheckValue("LineupInfoType", ((MTRChannelClusterLineupInfoStruct *) actualValue).lineupInfoType, 0U)); } NextTest(); @@ -75564,7 +75566,7 @@ class TV_ChannelCluster : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeCurrentChannelWithCompletion:^( - MTRChannelClusterChannelInfo * _Nullable value, NSError * _Nullable err) { + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { NSLog(@"Read attribute current channel Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -75572,12 +75574,13 @@ class TV_ChannelCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); - VerifyOrReturn(CheckValue("majorNumber", ((MTRChannelClusterChannelInfo *) actualValue).majorNumber, 6U)); - VerifyOrReturn(CheckValue("minorNumber", ((MTRChannelClusterChannelInfo *) actualValue).minorNumber, 0U)); - VerifyOrReturn(CheckValueAsString("name", ((MTRChannelClusterChannelInfo *) actualValue).name, @"ABC")); - VerifyOrReturn(CheckValueAsString("callSign", ((MTRChannelClusterChannelInfo *) actualValue).callSign, @"KAAL-TV")); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 6U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 0U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"ABC")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KAAL-TV")); VerifyOrReturn(CheckValueAsString( - "affiliateCallSign", ((MTRChannelClusterChannelInfo *) actualValue).affiliateCallSign, @"KAAL")); + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KAAL")); } NextTest(); @@ -75605,12 +75608,12 @@ class TV_ChannelCluster : 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 4650af33503184..0d282e706e2b72 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -409,7 +409,7 @@ typedef void (*WakeOnLanAttributeListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); typedef void (*ChannelChannelListListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); + const chip::app::DataModel::DecodableList & data); typedef void (*ChannelGeneratedCommandListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); typedef void (*ChannelAcceptedCommandListListAttributeCallback)(void * context,