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 808d781ce4ca27..9a7b55d575fbc6 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 @@ -1777,13 +1777,13 @@ server cluster ModeSelect = 80 { } struct ModeOptionStruct { - char_string<32> label = 0; + char_string<64> label = 0; int8u mode = 1; - SemanticTag semanticTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } - struct SemanticTag { - enum16 mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; } diff --git a/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp b/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp index c9f118464c27ae..3bc8d9a60fdf71 100644 --- a/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp +++ b/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp @@ -6,7 +6,7 @@ using namespace chip::app::Clusters; using namespace chip::app::Clusters::ModeSelect; using ModeOptionStructType = Structs::ModeOptionStruct::Type; -using SemanticTag = Structs::SemanticTag::Type; +using SemanticTag = Structs::SemanticTagStruct::Type; template using List = app::DataModel::List; using storage_value_type = const ModeOptionStructType; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 68437a196a1287..49524b16ef18ab 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -1622,13 +1622,13 @@ server cluster ModeSelect = 80 { } struct ModeOptionStruct { - char_string<32> label = 0; + char_string<64> label = 0; int8u mode = 1; - SemanticTag semanticTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } - struct SemanticTag { - enum16 mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; } diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 674d4eda7b6611..956a3eead3b7d5 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1536,13 +1536,13 @@ client cluster ModeSelect = 80 { } struct ModeOptionStruct { - char_string<32> label = 0; + char_string<64> label = 0; int8u mode = 1; - SemanticTag semanticTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } - struct SemanticTag { - enum16 mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; } @@ -1570,13 +1570,13 @@ server cluster ModeSelect = 80 { } struct ModeOptionStruct { - char_string<32> label = 0; + char_string<64> label = 0; int8u mode = 1; - SemanticTag semanticTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } - struct SemanticTag { - enum16 mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; } diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index a8f8b0ebf2455c..0e5ab941009479 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1513,13 +1513,13 @@ client cluster ModeSelect = 80 { } struct ModeOptionStruct { - char_string<32> label = 0; + char_string<64> label = 0; int8u mode = 1; - SemanticTag semanticTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } - struct SemanticTag { - enum16 mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; } @@ -1547,13 +1547,13 @@ server cluster ModeSelect = 80 { } struct ModeOptionStruct { - char_string<32> label = 0; + char_string<64> label = 0; int8u mode = 1; - SemanticTag semanticTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } - struct SemanticTag { - enum16 mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; } diff --git a/examples/placeholder/linux/static-supported-modes-manager.cpp b/examples/placeholder/linux/static-supported-modes-manager.cpp index c9f118464c27ae..3bc8d9a60fdf71 100644 --- a/examples/placeholder/linux/static-supported-modes-manager.cpp +++ b/examples/placeholder/linux/static-supported-modes-manager.cpp @@ -6,7 +6,7 @@ using namespace chip::app::Clusters; using namespace chip::app::Clusters::ModeSelect; using ModeOptionStructType = Structs::ModeOptionStruct::Type; -using SemanticTag = Structs::SemanticTag::Type; +using SemanticTag = Structs::SemanticTagStruct::Type; template using List = app::DataModel::List; using storage_value_type = const ModeOptionStructType; diff --git a/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml index 5d5f19d09fdf07..b4ff95c8bf6587 100644 --- a/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml @@ -17,17 +17,17 @@ limitations under the License. - + - + - + - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index c2b10d9cdc4978..8e0857f405e907 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2022,13 +2022,13 @@ client cluster ModeSelect = 80 { } struct ModeOptionStruct { - char_string<32> label = 0; + char_string<64> label = 0; int8u mode = 1; - SemanticTag semanticTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } - struct SemanticTag { - enum16 mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; } diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 7269388b208342..a912db34f740ac 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -9338,9 +9338,9 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jobject newElement_2_mfgCode; std::string newElement_2_mfgCodeClassName = "java/lang/Integer"; std::string newElement_2_mfgCodeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_2_mfgCodeClassName.c_str(), - newElement_2_mfgCodeCtorSignature.c_str(), - entry_2.mfgCode, newElement_2_mfgCode); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_2_mfgCodeClassName.c_str(), newElement_2_mfgCodeCtorSignature.c_str(), + static_cast(entry_2.mfgCode), newElement_2_mfgCode); jobject newElement_2_value; std::string newElement_2_valueClassName = "java/lang/Integer"; std::string newElement_2_valueCtorSignature = "(I)V"; @@ -9348,24 +9348,25 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jclass semanticTagStructClass_3; + jclass semanticTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ModeSelectClusterSemanticTag", semanticTagStructClass_3); + env, "chip/devicecontroller/ChipStructs$ModeSelectClusterSemanticTagStruct", + semanticTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterSemanticTag"); + ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterSemanticTagStruct"); return nullptr; } - jmethodID semanticTagStructCtor_3 = - env->GetMethodID(semanticTagStructClass_3, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); - if (semanticTagStructCtor_3 == nullptr) + jmethodID semanticTagStructStructCtor_3 = + env->GetMethodID(semanticTagStructStructClass_3, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); + if (semanticTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterSemanticTag constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterSemanticTagStruct constructor"); return nullptr; } - newElement_2 = - env->NewObject(semanticTagStructClass_3, semanticTagStructCtor_3, newElement_2_mfgCode, newElement_2_value); + newElement_2 = env->NewObject(semanticTagStructStructClass_3, semanticTagStructStructCtor_3, + newElement_2_mfgCode, newElement_2_value); chip::JniReferences::GetInstance().AddToList(newElement_0_semanticTags, newElement_2); } diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index e261866ed624ae..576fb43c870dde 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -14477,33 +14477,33 @@ void CHIPModeSelectSupportedModesAttributeCallback::CallbackFn( jobject newElement_2_mfgCode; std::string newElement_2_mfgCodeClassName = "java/lang/Integer"; std::string newElement_2_mfgCodeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_2_mfgCodeClassName.c_str(), - newElement_2_mfgCodeCtorSignature.c_str(), - entry_2.mfgCode, newElement_2_mfgCode); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_2_mfgCodeClassName.c_str(), newElement_2_mfgCodeCtorSignature.c_str(), + static_cast(entry_2.mfgCode), newElement_2_mfgCode); jobject newElement_2_value; std::string newElement_2_valueClassName = "java/lang/Integer"; std::string newElement_2_valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jclass semanticTagStructClass_3; + jclass semanticTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ModeSelectClusterSemanticTag", semanticTagStructClass_3); + env, "chip/devicecontroller/ChipStructs$ModeSelectClusterSemanticTagStruct", semanticTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterSemanticTag"); + ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterSemanticTagStruct"); return; } - jmethodID semanticTagStructCtor_3 = - env->GetMethodID(semanticTagStructClass_3, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); - if (semanticTagStructCtor_3 == nullptr) + jmethodID semanticTagStructStructCtor_3 = + env->GetMethodID(semanticTagStructStructClass_3, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); + if (semanticTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterSemanticTag constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterSemanticTagStruct constructor"); return; } - newElement_2 = - env->NewObject(semanticTagStructClass_3, semanticTagStructCtor_3, newElement_2_mfgCode, newElement_2_value); + newElement_2 = env->NewObject(semanticTagStructStructClass_3, semanticTagStructStructCtor_3, newElement_2_mfgCode, + newElement_2_value); chip::JniReferences::GetInstance().AddToList(newElement_0_semanticTags, newElement_2); } diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index 977dae52bb60bd..87079f933b5ee2 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -1262,11 +1262,11 @@ public String toString() { } } - public static class ModeSelectClusterSemanticTag { + public static class ModeSelectClusterSemanticTagStruct { public Integer mfgCode; public Integer value; - public ModeSelectClusterSemanticTag(Integer mfgCode, Integer value) { + public ModeSelectClusterSemanticTagStruct(Integer mfgCode, Integer value) { this.mfgCode = mfgCode; this.value = value; } @@ -1274,7 +1274,7 @@ public ModeSelectClusterSemanticTag(Integer mfgCode, Integer value) { @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("ModeSelectClusterSemanticTag {\n"); + output.append("ModeSelectClusterSemanticTagStruct {\n"); output.append("\tmfgCode: "); output.append(mfgCode); output.append("\n"); @@ -1289,12 +1289,12 @@ public String toString() { public static class ModeSelectClusterModeOptionStruct { public String label; public Integer mode; - public ArrayList semanticTags; + public ArrayList semanticTags; public ModeSelectClusterModeOptionStruct( String label, Integer mode, - ArrayList semanticTags) { + ArrayList semanticTags) { this.label = label; this.mode = mode; this.semanticTags = semanticTags; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 58012b98909f7b..92cab8362db39a 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -13058,7 +13058,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Structs: @dataclass - class SemanticTag(ClusterObject): + class SemanticTagStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -13078,12 +13078,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields = [ ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str), ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="semanticTags", Tag=2, Type=typing.List[ModeSelect.Structs.SemanticTag]), + ClusterObjectFieldDescriptor(Label="semanticTags", Tag=2, Type=typing.List[ModeSelect.Structs.SemanticTagStruct]), ]) label: 'str' = "" mode: 'uint' = 0 - semanticTags: 'typing.List[ModeSelect.Structs.SemanticTag]' = field(default_factory=lambda: []) + semanticTags: 'typing.List[ModeSelect.Structs.SemanticTagStruct]' = field(default_factory=lambda: []) diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index f740554a682705..6cb565286d9c47 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -4974,6 +4974,8 @@ - ThreadMetricsStruct GeneralDiagnostics: - NetworkInterface + ModeSelect: + - SemanticTagStruct struct fields: UnitTesting: SimpleStruct: @@ -5068,6 +5070,10 @@ - iPv4Addresses - iPv6Addresses - type + ModeSelect: + SemanticTagStruct: + - mfgCode + - value events: OTASoftwareUpdateRequestor: - StateTransition @@ -5374,6 +5380,8 @@ - ThreadMetrics GeneralDiagnostics: - NetworkInterfaceType + ModeSelect: + - SemanticTag struct fields: Descriptor: DeviceTypeStruct: @@ -5521,6 +5529,8 @@ ThreadMetricsStruct: ThreadMetrics GeneralDiagnostics: NetworkInterface: NetworkInterfaceType + ModeSelect: + SemanticTagStruct: SemanticTag struct fields: Descriptor: DeviceTypeStruct: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 04e99df067a6ff..d198564b137073 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -7750,9 +7750,9 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & auto iter_2 = entry_0.semanticTags.begin(); while (iter_2.Next()) { auto & entry_2 = iter_2.GetValue(); - MTRModeSelectClusterSemanticTag * newElement_2; - newElement_2 = [MTRModeSelectClusterSemanticTag new]; - newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:entry_2.mfgCode]; + MTRModeSelectClusterSemanticTagStruct * newElement_2; + newElement_2 = [MTRModeSelectClusterSemanticTagStruct new]; + newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode)]; newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value]; [array_2 addObject:newElement_2]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index b63df8097eb31d..28d59429a107bf 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -6362,9 +6362,9 @@ auto iter_2 = entry_0.semanticTags.begin(); while (iter_2.Next()) { auto & entry_2 = iter_2.GetValue(); - MTRModeSelectClusterSemanticTag * newElement_2; - newElement_2 = [MTRModeSelectClusterSemanticTag new]; - newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:entry_2.mfgCode]; + MTRModeSelectClusterSemanticTagStruct * newElement_2; + newElement_2 = [MTRModeSelectClusterSemanticTagStruct new]; + newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode)]; newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value]; [array_2 addObject:newElement_2]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index d43c1a846330f7..4ed03fb24dd717 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -605,12 +605,16 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSNumber * _Nonnull stateValue API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end -API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRModeSelectClusterSemanticTag : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull mfgCode API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull value API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_AVAILABLE +@interface MTRModeSelectClusterSemanticTagStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull mfgCode MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull value MTR_NEWLY_AVAILABLE; @end +API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) +MTR_NEWLY_DEPRECATED("Please use MTRModeSelectClusterSemanticTagStruct") +@interface MTRModeSelectClusterSemanticTag : MTRModeSelectClusterSemanticTagStruct +@end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRModeSelectClusterModeOptionStruct : NSObject @property (nonatomic, copy) NSString * _Nonnull label API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 3234a6b64555ba..b53d2e9f772f05 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -2466,7 +2466,7 @@ - (NSString *)description @end -@implementation MTRModeSelectClusterSemanticTag +@implementation MTRModeSelectClusterSemanticTagStruct - (instancetype)init { if (self = [super init]) { @@ -2480,7 +2480,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRModeSelectClusterSemanticTag alloc] init]; + auto other = [[MTRModeSelectClusterSemanticTagStruct alloc] init]; other.mfgCode = self.mfgCode; other.value = self.value; @@ -2497,6 +2497,9 @@ - (NSString *)description @end +@implementation MTRModeSelectClusterSemanticTag : MTRModeSelectClusterSemanticTagStruct +@end + @implementation MTRModeSelectClusterModeOptionStruct - (instancetype)init { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index dae848078394c0..50f984dc7acf6a 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 @@ -10303,7 +10303,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace BooleanState namespace ModeSelect { namespace Structs { -namespace SemanticTag { +namespace SemanticTagStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -10346,7 +10346,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace SemanticTag +} // namespace SemanticTagStruct namespace ModeOptionStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { 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 71c15d330b5576..62a0fb93405645 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 @@ -12785,7 +12785,7 @@ struct DecodableType } // namespace BooleanState namespace ModeSelect { namespace Structs { -namespace SemanticTag { +namespace SemanticTagStruct { enum class Fields { kMfgCode = 0, @@ -12795,8 +12795,8 @@ enum class Fields struct Type { public: - uint16_t mfgCode = static_cast(0); - uint16_t value = static_cast(0); + chip::VendorId mfgCode = static_cast(0); + uint16_t value = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -12807,7 +12807,7 @@ struct Type using DecodableType = Type; -} // namespace SemanticTag +} // namespace SemanticTagStruct namespace ModeOptionStruct { enum class Fields { @@ -12821,7 +12821,7 @@ struct Type public: chip::CharSpan label; uint8_t mode = static_cast(0); - DataModel::List semanticTags; + DataModel::List semanticTags; static constexpr bool kIsFabricScoped = false; @@ -12833,7 +12833,7 @@ struct DecodableType public: chip::CharSpan label; uint8_t mode = static_cast(0); - DataModel::DecodableList semanticTags; + DataModel::DecodableList semanticTags; CHIP_ERROR Decode(TLV::TLVReader & reader); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 7b635a6c5897b3..28a59a03b7366d 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -1726,13 +1726,15 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::ThreadNetworkDiagnosti ComplexArgumentParser::Finalize(request.rotationTime); ComplexArgumentParser::Finalize(request.flags); } -CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::ModeSelect::Structs::SemanticTag::Type & request, +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::ModeSelect::Structs::SemanticTagStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("SemanticTag.mfgCode", "mfgCode", value.isMember("mfgCode"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("SemanticTag.value", "value", value.isMember("value"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("SemanticTagStruct.mfgCode", "mfgCode", value.isMember("mfgCode"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("SemanticTagStruct.value", "value", value.isMember("value"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "mfgCode"); @@ -1744,7 +1746,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters: return CHIP_NO_ERROR; } -void ComplexArgumentParser::Finalize(chip::app::Clusters::ModeSelect::Structs::SemanticTag::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::ModeSelect::Structs::SemanticTagStruct::Type & request) { ComplexArgumentParser::Finalize(request.mfgCode); ComplexArgumentParser::Finalize(request.value); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index ec007119bca492..94cd1b782b1ba7 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -205,10 +205,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ThreadNetworkDi Json::Value & value); static void Finalize(chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ModeSelect::Structs::SemanticTag::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ModeSelect::Structs::SemanticTagStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::ModeSelect::Structs::SemanticTag::Type & request); +static void Finalize(chip::app::Clusters::ModeSelect::Structs::SemanticTagStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::UnitTesting::Structs::SimpleStruct::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 f08aa9a67b1f4c..11321680a18fe0 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -1849,7 +1849,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::ModeSelect::Structs::SemanticTag::DecodableType & value) + const chip::app::Clusters::ModeSelect::Structs::SemanticTagStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { 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 0b3923972caaa3..077dece4c4c9c2 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -113,7 +113,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::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ModeSelect::Structs::SemanticTag::DecodableType & value); + const chip::app::Clusters::ModeSelect::Structs::SemanticTagStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::UnitTesting::Structs::SimpleStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, 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 c65316664f6cb9..b10b8061646233 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -98396,7 +98396,8 @@ class TestModeSelectCluster : public TestCommandBridge { VerifyOrReturn(CheckValue("SemanticTags", [((MTRModeSelectClusterModeOptionStruct *) actualValue[0]).semanticTags count], static_cast(1))); VerifyOrReturn(CheckValue("Value", - ((MTRModeSelectClusterSemanticTag *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[0]).semanticTags[0]) + ((MTRModeSelectClusterSemanticTagStruct *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[0]) + .semanticTags[0]) .value, 0U)); VerifyOrReturn( @@ -98405,7 +98406,8 @@ class TestModeSelectCluster : public TestCommandBridge { VerifyOrReturn(CheckValue("SemanticTags", [((MTRModeSelectClusterModeOptionStruct *) actualValue[1]).semanticTags count], static_cast(1))); VerifyOrReturn(CheckValue("Value", - ((MTRModeSelectClusterSemanticTag *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[1]).semanticTags[0]) + ((MTRModeSelectClusterSemanticTagStruct *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[1]) + .semanticTags[0]) .value, 0U)); VerifyOrReturn( @@ -98414,7 +98416,8 @@ class TestModeSelectCluster : public TestCommandBridge { VerifyOrReturn(CheckValue("SemanticTags", [((MTRModeSelectClusterModeOptionStruct *) actualValue[2]).semanticTags count], static_cast(1))); VerifyOrReturn(CheckValue("Value", - ((MTRModeSelectClusterSemanticTag *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[2]).semanticTags[0]) + ((MTRModeSelectClusterSemanticTagStruct *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[2]) + .semanticTags[0]) .value, 0U)); }