From 2342079daacbf8588e01f60e41693a85a0a976ea Mon Sep 17 00:00:00 2001 From: "m.trayer" Date: Fri, 13 Dec 2024 12:34:13 -0600 Subject: [PATCH] CChange struct field name from values -> presets --- ...settings-user-level-management-cluster.xml | 2 +- .../data_model/controller-clusters.matter | 2 +- .../chip/devicecontroller/ChipStructs.java | 22 ++--- ...rLevelManagementClusterMPTZPresetStruct.kt | 14 ++-- ...rLevelManagementClusterMPTZPresetStruct.kt | 14 ++-- .../CHIPAttributeTLVValueDecoder.cpp | 80 +++++++++---------- .../python/chip/clusters/Objects.py | 4 +- .../MTRAttributeTLVValueDecoder.mm | 20 ++--- .../CHIP/zap-generated/MTRStructsObjc.h | 2 +- .../CHIP/zap-generated/MTRStructsObjc.mm | 6 +- .../zap-generated/cluster-objects.cpp | 6 +- .../zap-generated/cluster-objects.h | 4 +- .../cluster/ComplexArgumentParser.cpp | 11 +-- .../cluster/logging/DataModelLogger.cpp | 4 +- 14 files changed, 96 insertions(+), 95 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml index 584b5c67344023..a174ba6658f37d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml @@ -26,7 +26,7 @@ Git: 1.4-267-gc3d95b5c9 - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 3a23b00418254f..03216c639cacb9 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -9859,7 +9859,7 @@ provisional cluster CameraAvSettingsUserLevelManagement = 1362 { struct MPTZPresetStruct { int8u presetID = 0; char_string<32> name = 1; - MPTZStruct values = 2; + MPTZStruct presets = 2; } struct ViewportStruct { diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java index 4ccfed9afbe295..4ffb58d5205f30 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java @@ -14181,26 +14181,26 @@ public String toString() { public static class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct { public Integer presetID; public String name; - public ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct values; + public ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct presets; private static final long PRESET_ID_ID = 0L; private static final long NAME_ID = 1L; - private static final long VALUES_ID = 2L; + private static final long PRESETS_ID = 2L; public CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( Integer presetID, String name, - ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct values + ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct presets ) { this.presetID = presetID; this.name = name; - this.values = values; + this.presets = presets; } public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(PRESET_ID_ID, new UIntType(presetID))); values.add(new StructElement(NAME_ID, new StringType(name))); - values.add(new StructElement(VALUES_ID, values.encodeTlv())); + values.add(new StructElement(PRESETS_ID, presets.encodeTlv())); return new StructType(values); } @@ -14211,7 +14211,7 @@ public static CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct decodeT } Integer presetID = null; String name = null; - ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct values = null; + ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct presets = null; for (StructElement element: ((StructType)tlvValue).value()) { if (element.contextTagNum() == PRESET_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { @@ -14223,17 +14223,17 @@ public static CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct decodeT StringType castingValue = element.value(StringType.class); name = castingValue.value(String.class); } - } else if (element.contextTagNum() == VALUES_ID) { + } else if (element.contextTagNum() == PRESETS_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Struct) { StructType castingValue = element.value(StructType.class); - values = ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct.decodeTlv(castingValue); + presets = ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct.decodeTlv(castingValue); } } } return new CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( presetID, name, - values + presets ); } @@ -14247,8 +14247,8 @@ public String toString() { output.append("\tname: "); output.append(name); output.append("\n"); - output.append("\tvalues: "); - output.append(values); + output.append("\tpresets: "); + output.append(presets); output.append("\n"); output.append("}\n"); return output.toString(); diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt index 766c02742ca5f6..01b0cbb49a8fde 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt @@ -25,13 +25,13 @@ import matter.tlv.TlvWriter class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( val presetID: UInt, val name: String, - val values: CameraAvSettingsUserLevelManagementClusterMPTZStruct, + val presets: CameraAvSettingsUserLevelManagementClusterMPTZStruct, ) { override fun toString(): String = buildString { append("CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct {\n") append("\tpresetID : $presetID\n") append("\tname : $name\n") - append("\tvalues : $values\n") + append("\tpresets : $presets\n") append("}\n") } @@ -40,7 +40,7 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( startStructure(tlvTag) put(ContextSpecificTag(TAG_PRESET_ID), presetID) put(ContextSpecificTag(TAG_NAME), name) - values.toTlv(ContextSpecificTag(TAG_VALUES), this) + presets.toTlv(ContextSpecificTag(TAG_PRESETS), this) endStructure() } } @@ -48,7 +48,7 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( companion object { private const val TAG_PRESET_ID = 0 private const val TAG_NAME = 1 - private const val TAG_VALUES = 2 + private const val TAG_PRESETS = 2 fun fromTlv( tlvTag: Tag, @@ -57,15 +57,15 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( tlvReader.enterStructure(tlvTag) val presetID = tlvReader.getUInt(ContextSpecificTag(TAG_PRESET_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) - val values = + val presets = CameraAvSettingsUserLevelManagementClusterMPTZStruct.fromTlv( - ContextSpecificTag(TAG_VALUES), + ContextSpecificTag(TAG_PRESETS), tlvReader, ) tlvReader.exitContainer() - return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, values) + return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, presets) } } } diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt index 5831e0cac5c6a6..09c9b75b22e09b 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt @@ -25,13 +25,13 @@ import matter.tlv.TlvWriter class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( val presetID: UByte, val name: String, - val values: CameraAvSettingsUserLevelManagementClusterMPTZStruct, + val presets: CameraAvSettingsUserLevelManagementClusterMPTZStruct, ) { override fun toString(): String = buildString { append("CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct {\n") append("\tpresetID : $presetID\n") append("\tname : $name\n") - append("\tvalues : $values\n") + append("\tpresets : $presets\n") append("}\n") } @@ -40,7 +40,7 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( startStructure(tlvTag) put(ContextSpecificTag(TAG_PRESET_ID), presetID) put(ContextSpecificTag(TAG_NAME), name) - values.toTlv(ContextSpecificTag(TAG_VALUES), this) + presets.toTlv(ContextSpecificTag(TAG_PRESETS), this) endStructure() } } @@ -48,7 +48,7 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( companion object { private const val TAG_PRESET_ID = 0 private const val TAG_NAME = 1 - private const val TAG_VALUES = 2 + private const val TAG_PRESETS = 2 fun fromTlv( tlvTag: Tag, @@ -57,15 +57,15 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( tlvReader.enterStructure(tlvTag) val presetID = tlvReader.getUByte(ContextSpecificTag(TAG_PRESET_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) - val values = + val presets = CameraAvSettingsUserLevelManagementClusterMPTZStruct.fromTlv( - ContextSpecificTag(TAG_VALUES), + ContextSpecificTag(TAG_PRESETS), tlvReader, ) tlvReader.exitContainer() - return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, values) + return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, presets) } } } diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 902ea029a0b64d..d39889772d53e9 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -41709,60 +41709,60 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jninewElement_0_presetID, newElement_0_presetID); jobject newElement_0_name; LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.name, newElement_0_name)); - jobject newElement_0_values; - jobject newElement_0_values_pan; - if (!entry_0.values.pan.HasValue()) + jobject newElement_0_presets; + jobject newElement_0_presets_pan; + if (!entry_0.presets.pan.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_values_pan); + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_presets_pan); } else { - jobject newElement_0_values_panInsideOptional; - std::string newElement_0_values_panInsideOptionalClassName = "java/lang/Integer"; - std::string newElement_0_values_panInsideOptionalCtorSignature = "(I)V"; - jint jninewElement_0_values_panInsideOptional = static_cast(entry_0.values.pan.Value()); + jobject newElement_0_presets_panInsideOptional; + std::string newElement_0_presets_panInsideOptionalClassName = "java/lang/Integer"; + std::string newElement_0_presets_panInsideOptionalCtorSignature = "(I)V"; + jint jninewElement_0_presets_panInsideOptional = static_cast(entry_0.presets.pan.Value()); chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0_values_panInsideOptionalClassName.c_str(), - newElement_0_values_panInsideOptionalCtorSignature.c_str(), jninewElement_0_values_panInsideOptional, - newElement_0_values_panInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(newElement_0_values_panInsideOptional, - newElement_0_values_pan); + newElement_0_presets_panInsideOptionalClassName.c_str(), + newElement_0_presets_panInsideOptionalCtorSignature.c_str(), jninewElement_0_presets_panInsideOptional, + newElement_0_presets_panInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_0_presets_panInsideOptional, + newElement_0_presets_pan); } - jobject newElement_0_values_tilt; - if (!entry_0.values.tilt.HasValue()) + jobject newElement_0_presets_tilt; + if (!entry_0.presets.tilt.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_values_tilt); + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_presets_tilt); } else { - jobject newElement_0_values_tiltInsideOptional; - std::string newElement_0_values_tiltInsideOptionalClassName = "java/lang/Integer"; - std::string newElement_0_values_tiltInsideOptionalCtorSignature = "(I)V"; - jint jninewElement_0_values_tiltInsideOptional = static_cast(entry_0.values.tilt.Value()); + jobject newElement_0_presets_tiltInsideOptional; + std::string newElement_0_presets_tiltInsideOptionalClassName = "java/lang/Integer"; + std::string newElement_0_presets_tiltInsideOptionalCtorSignature = "(I)V"; + jint jninewElement_0_presets_tiltInsideOptional = static_cast(entry_0.presets.tilt.Value()); chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0_values_tiltInsideOptionalClassName.c_str(), - newElement_0_values_tiltInsideOptionalCtorSignature.c_str(), jninewElement_0_values_tiltInsideOptional, - newElement_0_values_tiltInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(newElement_0_values_tiltInsideOptional, - newElement_0_values_tilt); + newElement_0_presets_tiltInsideOptionalClassName.c_str(), + newElement_0_presets_tiltInsideOptionalCtorSignature.c_str(), jninewElement_0_presets_tiltInsideOptional, + newElement_0_presets_tiltInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_0_presets_tiltInsideOptional, + newElement_0_presets_tilt); } - jobject newElement_0_values_zoom; - if (!entry_0.values.zoom.HasValue()) + jobject newElement_0_presets_zoom; + if (!entry_0.presets.zoom.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_values_zoom); + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_presets_zoom); } else { - jobject newElement_0_values_zoomInsideOptional; - std::string newElement_0_values_zoomInsideOptionalClassName = "java/lang/Integer"; - std::string newElement_0_values_zoomInsideOptionalCtorSignature = "(I)V"; - jint jninewElement_0_values_zoomInsideOptional = static_cast(entry_0.values.zoom.Value()); + jobject newElement_0_presets_zoomInsideOptional; + std::string newElement_0_presets_zoomInsideOptionalClassName = "java/lang/Integer"; + std::string newElement_0_presets_zoomInsideOptionalCtorSignature = "(I)V"; + jint jninewElement_0_presets_zoomInsideOptional = static_cast(entry_0.presets.zoom.Value()); chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0_values_zoomInsideOptionalClassName.c_str(), - newElement_0_values_zoomInsideOptionalCtorSignature.c_str(), jninewElement_0_values_zoomInsideOptional, - newElement_0_values_zoomInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(newElement_0_values_zoomInsideOptional, - newElement_0_values_zoom); + newElement_0_presets_zoomInsideOptionalClassName.c_str(), + newElement_0_presets_zoomInsideOptionalCtorSignature.c_str(), jninewElement_0_presets_zoomInsideOptional, + newElement_0_presets_zoomInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_0_presets_zoomInsideOptional, + newElement_0_presets_zoom); } { @@ -41787,8 +41787,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return nullptr; } - newElement_0_values = env->NewObject(MPTZStructStructClass_2, MPTZStructStructCtor_2, newElement_0_values_pan, - newElement_0_values_tilt, newElement_0_values_zoom); + newElement_0_presets = env->NewObject(MPTZStructStructClass_2, MPTZStructStructCtor_2, newElement_0_presets_pan, + newElement_0_presets_tilt, newElement_0_presets_zoom); } { @@ -41818,7 +41818,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } newElement_0 = env->NewObject(MPTZPresetStructStructClass_1, MPTZPresetStructStructCtor_1, - newElement_0_presetID, newElement_0_name, newElement_0_values); + newElement_0_presetID, newElement_0_name, newElement_0_presets); } chip::JniReferences::GetInstance().AddToList(value, newElement_0); } diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 56de1cf8ab0c72..52ea2b53db791e 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -46302,12 +46302,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="presetID", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str), - ClusterObjectFieldDescriptor(Label="values", Tag=2, Type=CameraAvSettingsUserLevelManagement.Structs.MPTZStruct), + ClusterObjectFieldDescriptor(Label="presets", Tag=2, Type=CameraAvSettingsUserLevelManagement.Structs.MPTZStruct), ]) presetID: 'uint' = 0 name: 'str' = "" - values: 'CameraAvSettingsUserLevelManagement.Structs.MPTZStruct' = field(default_factory=lambda: CameraAvSettingsUserLevelManagement.Structs.MPTZStruct()) + presets: 'CameraAvSettingsUserLevelManagement.Structs.MPTZStruct' = field(default_factory=lambda: CameraAvSettingsUserLevelManagement.Structs.MPTZStruct()) @dataclass class ViewportStruct(ClusterObject): diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 215a146b3bbbb4..c554b28dca1c88 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -17703,21 +17703,21 @@ static id _Nullable DecodeAttributeValueForCameraAVSettingsUserLevelManagementCl *aError = err; return nil; } - newElement_0.values = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; - if (entry_0.values.pan.HasValue()) { - newElement_0.values.pan = [NSNumber numberWithShort:entry_0.values.pan.Value()]; + newElement_0.presets = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; + if (entry_0.presets.pan.HasValue()) { + newElement_0.presets.pan = [NSNumber numberWithShort:entry_0.presets.pan.Value()]; } else { - newElement_0.values.pan = nil; + newElement_0.presets.pan = nil; } - if (entry_0.values.tilt.HasValue()) { - newElement_0.values.tilt = [NSNumber numberWithShort:entry_0.values.tilt.Value()]; + if (entry_0.presets.tilt.HasValue()) { + newElement_0.presets.tilt = [NSNumber numberWithShort:entry_0.presets.tilt.Value()]; } else { - newElement_0.values.tilt = nil; + newElement_0.presets.tilt = nil; } - if (entry_0.values.zoom.HasValue()) { - newElement_0.values.zoom = [NSNumber numberWithUnsignedChar:entry_0.values.zoom.Value()]; + if (entry_0.presets.zoom.HasValue()) { + newElement_0.presets.zoom = [NSNumber numberWithUnsignedChar:entry_0.presets.zoom.Value()]; } else { - newElement_0.values.zoom = nil; + newElement_0.presets.zoom = nil; } [array_0 addObject:newElement_0]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index cc38b0deab1ba5..c77c43889bf6b8 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -2294,7 +2294,7 @@ MTR_PROVISIONALLY_AVAILABLE @interface MTRCameraAVSettingsUserLevelManagementClusterMPTZPresetStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull presetID MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSString * _Nonnull name MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nonnull values MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nonnull presets MTR_PROVISIONALLY_AVAILABLE; @end MTR_PROVISIONALLY_AVAILABLE diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index c1940e66ff4c51..60cc927c362100 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -9524,7 +9524,7 @@ - (instancetype)init _name = @""; - _values = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; + _presets = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; } return self; } @@ -9535,14 +9535,14 @@ - (id)copyWithZone:(NSZone * _Nullable)zone other.presetID = self.presetID; other.name = self.name; - other.values = self.values; + other.presets = self.presets; return other; } - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetID:%@; name:%@; values:%@; >", NSStringFromClass([self class]), _presetID, _name, _values]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetID:%@; name:%@; presets:%@; >", NSStringFromClass([self class]), _presetID, _name, _presets]; return descriptionString; } 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 a38c2ba9336771..791203370f737d 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 @@ -30367,7 +30367,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; encoder.Encode(to_underlying(Fields::kPresetID), presetID); encoder.Encode(to_underlying(Fields::kName), name); - encoder.Encode(to_underlying(Fields::kValues), values); + encoder.Encode(to_underlying(Fields::kPresets), presets); return encoder.Finalize(); } @@ -30393,9 +30393,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, name); } - else if (__context_tag == to_underlying(Fields::kValues)) + else if (__context_tag == to_underlying(Fields::kPresets)) { - err = DataModel::Decode(reader, values); + err = DataModel::Decode(reader, presets); } else { 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 069d1027d78de3..9daec21249d52f 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 @@ -42557,7 +42557,7 @@ enum class Fields : uint8_t { kPresetID = 0, kName = 1, - kValues = 2, + kPresets = 2, }; struct Type @@ -42565,7 +42565,7 @@ struct Type public: uint8_t presetID = static_cast(0); chip::CharSpan name; - Structs::MPTZStruct::Type values; + Structs::MPTZStruct::Type presets; 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 376ea2fdd9d7ab..8c5568e9cec40b 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -6532,7 +6532,8 @@ ComplexArgumentParser::Setup(const char * label, ReturnErrorOnFailure( ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.presetID", "presetID", value.isMember("presetID"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.name", "name", value.isMember("name"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.values", "values", value.isMember("values"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.presets", "presets", value.isMember("presets"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "presetID"); @@ -6543,9 +6544,9 @@ ComplexArgumentParser::Setup(const char * label, ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.name, value["name"])); valueCopy.removeMember("name"); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "values"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.values, value["values"])); - valueCopy.removeMember("values"); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "presets"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.presets, value["presets"])); + valueCopy.removeMember("presets"); return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } @@ -6555,7 +6556,7 @@ void ComplexArgumentParser::Finalize( { ComplexArgumentParser::Finalize(request.presetID); ComplexArgumentParser::Finalize(request.name); - ComplexArgumentParser::Finalize(request.values); + ComplexArgumentParser::Finalize(request.presets); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::Chime::Structs::ChimeSoundStruct::Type & request, diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 864e25d34b9118..ada271d1922c3d 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -5808,10 +5808,10 @@ CHIP_ERROR DataModelLogger::LogValue( } } { - CHIP_ERROR err = LogValue("Values", indent + 1, value.values); + CHIP_ERROR err = LogValue("Presets", indent + 1, value.presets); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Values'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Presets'"); return err; } }