From 89058aaa3107936701a9abdb006621ed93cbee76 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 3 Jan 2023 15:17:24 -0500 Subject: [PATCH] Align naming in On/Off cluster XML with the spec. (#24237) * Align naming in On/Off cluster XML with the spec. * Regenerate generated files. --- .../all-clusters-app.matter | 2 +- .../ameba/main/include/OnOffCommands.h | 8 +++---- ...de_colortemperaturelight_hbUnzYVeyn.matter | 2 +- .../lighting-common/lighting-app.matter | 2 +- .../nxp/zap/lighting-on-off.matter | 2 +- .../ota-requestor-app.matter | 2 +- .../placeholder/linux/apps/app1/config.matter | 4 ++-- .../placeholder/linux/apps/app2/config.matter | 4 ++-- .../clusters/on-off-server/on-off-server.cpp | 2 +- .../suites/certification/Test_TC_OO_2_3.yaml | 8 +++---- .../zcl/data-model/chip/onoff-cluster.xml | 2 +- .../data_model/controller-clusters.matter | 2 +- .../chip/devicecontroller/ChipClusters.java | 11 +++++----- .../devicecontroller/ClusterInfoMapping.java | 9 ++++---- .../python/chip/clusters/CHIPClusters.py | 2 +- .../python/chip/clusters/Objects.py | 4 ++-- .../CHIP/templates/availability.yaml | 18 +++++++++++----- .../CHIP/zap-generated/MTRBaseClusters.mm | 3 ++- .../CHIP/zap-generated/MTRClusters.mm | 4 ++-- .../zap-generated/MTRCommandPayloadsObjc.h | 8 ++++++- .../zap-generated/MTRCommandPayloadsObjc.mm | 21 +++++++++++++++---- .../zap-generated/cluster-objects.cpp | 6 +++--- .../zap-generated/cluster-objects.h | 8 +++---- .../zap-generated/cluster/Commands.h | 2 +- .../chip-tool/zap-generated/test/Commands.h | 16 +++++++------- .../zap-generated/cluster/Commands.h | 4 ++-- 26 files changed, 93 insertions(+), 63 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 9b446d57e763f5..0c3bb7f015e6de 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 @@ -258,7 +258,7 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectId = 0; + OnOffEffectIdentifier effectIdentifier = 0; OnOffDelayedAllOffEffectVariant effectVariant = 1; } diff --git a/examples/all-clusters-app/ameba/main/include/OnOffCommands.h b/examples/all-clusters-app/ameba/main/include/OnOffCommands.h index 47dfe5698de4aa..02b77ed029284d 100644 --- a/examples/all-clusters-app/ameba/main/include/OnOffCommands.h +++ b/examples/all-clusters-app/ameba/main/include/OnOffCommands.h @@ -124,8 +124,8 @@ void ProcessOnOffUnicastBindingCommand(BindingCommandData * data, const EmberBin break; case Clusters::OnOff::Commands::OffWithEffect::Id: - offwitheffectCommand.effectId = static_cast(data->args[0]); - offwitheffectCommand.effectVariant = static_cast(data->args[1]); + offwitheffectCommand.effectIdentifier = static_cast(data->args[0]); + offwitheffectCommand.effectVariant = static_cast(data->args[1]); Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, offwitheffectCommand, onSuccess, onFailure); break; @@ -171,8 +171,8 @@ void ProcessOnOffGroupBindingCommand(BindingCommandData * data, const EmberBindi break; case Clusters::OnOff::Commands::OffWithEffect::Id: - offwitheffectCommand.effectId = static_cast(data->args[0]); - offwitheffectCommand.effectVariant = static_cast(data->args[1]); + offwitheffectCommand.effectIdentifier = static_cast(data->args[0]); + offwitheffectCommand.effectVariant = static_cast(data->args[1]); Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, offwitheffectCommand); break; diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 419c1c0ec3e50f..1e0ca4414ce712 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -154,7 +154,7 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectId = 0; + OnOffEffectIdentifier effectIdentifier = 0; OnOffDelayedAllOffEffectVariant effectVariant = 1; } diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 094eb487f73404..d122bdfb961da6 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -150,7 +150,7 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectId = 0; + OnOffEffectIdentifier effectIdentifier = 0; OnOffDelayedAllOffEffectVariant effectVariant = 1; } diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 462581defec908..43cc20a1e3cee1 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -154,7 +154,7 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectId = 0; + OnOffEffectIdentifier effectIdentifier = 0; OnOffDelayedAllOffEffectVariant effectVariant = 1; } diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 4227875db77573..0f0fa82faa66e7 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -150,7 +150,7 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectId = 0; + OnOffEffectIdentifier effectIdentifier = 0; OnOffDelayedAllOffEffectVariant effectVariant = 1; } diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 8c8d610530ec8d..26617541ec25cb 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -247,7 +247,7 @@ client cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectId = 0; + OnOffEffectIdentifier effectIdentifier = 0; OnOffDelayedAllOffEffectVariant effectVariant = 1; } @@ -308,7 +308,7 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectId = 0; + OnOffEffectIdentifier effectIdentifier = 0; OnOffDelayedAllOffEffectVariant effectVariant = 1; } diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 8c8d610530ec8d..26617541ec25cb 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -247,7 +247,7 @@ client cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectId = 0; + OnOffEffectIdentifier effectIdentifier = 0; OnOffDelayedAllOffEffectVariant effectVariant = 1; } @@ -308,7 +308,7 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectId = 0; + OnOffEffectIdentifier effectIdentifier = 0; OnOffDelayedAllOffEffectVariant effectVariant = 1; } diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp index 260051d636a78c..4fa560a30b902d 100644 --- a/src/app/clusters/on-off-server/on-off-server.cpp +++ b/src/app/clusters/on-off-server/on-off-server.cpp @@ -351,7 +351,7 @@ bool OnOffServer::toggleCommand(const app::ConcreteCommandPath & commandPath) bool OnOffServer::offWithEffectCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, const Commands::OffWithEffect::DecodableType & commandData) { - OnOffEffectIdentifier effectId = commandData.effectId; + OnOffEffectIdentifier effectId = commandData.effectIdentifier; uint8_t effectVariant = commandData.effectVariant; chip::EndpointId endpoint = commandPath.mEndpointId; EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml index c43a0ceacc8e61..970d252bbc6029 100644 --- a/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml @@ -64,7 +64,7 @@ tests: PICS: OO.S.C40.Rsp arguments: values: - - name: "EffectId" + - name: "EffectIdentifier" value: 0 - name: "EffectVariant" value: 0 @@ -122,7 +122,7 @@ tests: PICS: OO.S.C40.Rsp arguments: values: - - name: "EffectId" + - name: "EffectIdentifier" value: 0 - name: "EffectVariant" value: 0 @@ -180,7 +180,7 @@ tests: PICS: OO.S.C40.Rsp arguments: values: - - name: "EffectId" + - name: "EffectIdentifier" value: 1 - name: "EffectVariant" value: 0 @@ -416,7 +416,7 @@ tests: PICS: OO.S.C40.Rsp arguments: values: - - name: "EffectId" + - name: "EffectIdentifier" value: 0 - name: "EffectVariant" value: 0 diff --git a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml index e8cd3ce0bb6410..7ef1790f37f1d8 100644 --- a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml @@ -79,7 +79,7 @@ limitations under the License. The OffWithEffect command allows devices to be turned off using enhanced ways of fading. - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 57579f0d2bbf99..50c53e93283245 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -270,7 +270,7 @@ client cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectId = 0; + OnOffEffectIdentifier effectIdentifier = 0; OnOffDelayedAllOffEffectVariant effectVariant = 1; } diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 51d696f1b15781..ce0271a21ee45f 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -1039,16 +1039,17 @@ public void toggle(DefaultClusterCallback callback, int timedInvokeTimeoutMs) { } public void offWithEffect( - DefaultClusterCallback callback, Integer effectId, Integer effectVariant) { - offWithEffect(chipClusterPtr, callback, effectId, effectVariant, null); + DefaultClusterCallback callback, Integer effectIdentifier, Integer effectVariant) { + offWithEffect(chipClusterPtr, callback, effectIdentifier, effectVariant, null); } public void offWithEffect( DefaultClusterCallback callback, - Integer effectId, + Integer effectIdentifier, Integer effectVariant, int timedInvokeTimeoutMs) { - offWithEffect(chipClusterPtr, callback, effectId, effectVariant, timedInvokeTimeoutMs); + offWithEffect( + chipClusterPtr, callback, effectIdentifier, effectVariant, timedInvokeTimeoutMs); } public void onWithRecallGlobalScene(DefaultClusterCallback callback) { @@ -1096,7 +1097,7 @@ private native void toggle( private native void offWithEffect( long chipClusterPtr, DefaultClusterCallback Callback, - Integer effectId, + Integer effectIdentifier, Integer effectVariant, @Nullable Integer timedInvokeTimeoutMs); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index b44dafacce0f17..6434d4d249f139 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -7927,9 +7927,10 @@ public Map> getCommandMap() { onOffClusterInteractionInfoMap.put("toggle", onOfftoggleInteractionInfo); Map onOffoffWithEffectCommandParams = new LinkedHashMap(); - CommandParameterInfo onOffoffWithEffecteffectIdCommandParameterInfo = - new CommandParameterInfo("effectId", Integer.class, Integer.class); - onOffoffWithEffectCommandParams.put("effectId", onOffoffWithEffecteffectIdCommandParameterInfo); + CommandParameterInfo onOffoffWithEffecteffectIdentifierCommandParameterInfo = + new CommandParameterInfo("effectIdentifier", Integer.class, Integer.class); + onOffoffWithEffectCommandParams.put( + "effectIdentifier", onOffoffWithEffecteffectIdentifierCommandParameterInfo); CommandParameterInfo onOffoffWithEffecteffectVariantCommandParameterInfo = new CommandParameterInfo("effectVariant", Integer.class, Integer.class); @@ -7942,7 +7943,7 @@ public Map> getCommandMap() { ((ChipClusters.OnOffCluster) cluster) .offWithEffect( (DefaultClusterCallback) callback, - (Integer) commandArguments.get("effectId"), + (Integer) commandArguments.get("effectIdentifier"), (Integer) commandArguments.get("effectVariant")); }, () -> new DelegatedDefaultClusterCallback(), diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index a205e0fba26899..4698b39f7bd6f5 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -333,7 +333,7 @@ class ChipClusters: "commandId": 0x00000040, "commandName": "OffWithEffect", "args": { - "effectId": "int", + "effectIdentifier": "int", "effectVariant": "int", }, }, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index e3b6ed5cd44e46..2f76dbf25eb71d 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -1265,11 +1265,11 @@ class OffWithEffect(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="effectId", Tag=0, Type=OnOff.Enums.OnOffEffectIdentifier), + ClusterObjectFieldDescriptor(Label="effectIdentifier", Tag=0, Type=OnOff.Enums.OnOffEffectIdentifier), ClusterObjectFieldDescriptor(Label="effectVariant", Tag=1, Type=OnOff.Enums.OnOffDelayedAllOffEffectVariant), ]) - effectId: 'OnOff.Enums.OnOffEffectIdentifier' = 0 + effectIdentifier: 'OnOff.Enums.OnOffEffectIdentifier' = 0 effectVariant: 'OnOff.Enums.OnOffDelayedAllOffEffectVariant' = 0 @dataclass diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index fd77a490b63610..e82619dd00ec5f 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -4932,6 +4932,9 @@ - groupID ViewGroupResponse: - groupID + OnOff: + OffWithEffect: + - effectIdentifier structs: OTASoftwareUpdateRequestor: - ProviderLocation @@ -5184,6 +5187,9 @@ - groupId ViewGroupResponse: - groupId + OnOff: + OffWithEffect: + - effectId structs: Descriptor: - DeviceType @@ -5228,11 +5234,6 @@ AnnounceOTAProvider: providerNodeID: providerNodeId vendorID: vendorId - event fields: - Switch: - MultiPressComplete: - previousPosition: newPosition - command fields: Groups: AddGroup: groupID: groupId @@ -5248,3 +5249,10 @@ groupID: groupId ViewGroupResponse: groupID: groupId + OnOff: + OffWithEffect: + effectIdentifier: effectId + event fields: + Switch: + MultiPressComplete: + previousPosition: newPosition diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 488006a1bde394..8837452b248562 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -3226,7 +3226,8 @@ - (void)offWithEffectWithParams:(MTROnOffClusterOffWithEffectParams *)params com timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue); } } - request.effectId = static_cast>(params.effectId.unsignedCharValue); + request.effectIdentifier = static_cast>( + params.effectIdentifier.unsignedCharValue); request.effectVariant = static_cast>(params.effectVariant.unsignedCharValue); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 2cc3860db1f5d5..218565e36c7bdc 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -2074,8 +2074,8 @@ - (void)offWithEffectWithParams:(MTROnOffClusterOffWithEffectParams *)params if (timedInvokeTimeoutMsParam != nil) { timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue); } - request.effectId - = static_cast>(params.effectId.unsignedCharValue); + request.effectIdentifier = static_cast>( + params.effectIdentifier.unsignedCharValue); request.effectVariant = static_cast>(params.effectVariant.unsignedCharValue); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index a225897c00b0ef..333de93093941f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -884,7 +884,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTROnOffClusterOffWithEffectParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull effectId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull effectIdentifier MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull effectVariant API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); /** @@ -904,6 +904,12 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; @end +@interface MTROnOffClusterOffWithEffectParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull effectId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use effectIdentifier"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTROnOffClusterOnWithRecallGlobalSceneParams : NSObject /** diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 2a6e17339783e0..66db340cb5044f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -1235,7 +1235,7 @@ - (instancetype)init { if (self = [super init]) { - _effectId = @(0); + _effectIdentifier = @(0); _effectVariant = @(0); _timedInvokeTimeoutMs = nil; @@ -1247,7 +1247,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTROnOffClusterOffWithEffectParams alloc] init]; - other.effectId = self.effectId; + other.effectIdentifier = self.effectIdentifier; other.effectVariant = self.effectVariant; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; @@ -1256,11 +1256,24 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString - stringWithFormat:@"<%@: effectId:%@; effectVariant:%@; >", NSStringFromClass([self class]), _effectId, _effectVariant]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: effectIdentifier:%@; effectVariant:%@; >", + NSStringFromClass([self class]), _effectIdentifier, _effectVariant]; return descriptionString; } +@end + +@implementation MTROnOffClusterOffWithEffectParams (Deprecated) + +- (void)setEffectId:(NSNumber * _Nonnull)effectId +{ + self.effectIdentifier = effectId; +} + +- (NSNumber * _Nonnull)effectId +{ + return self.effectIdentifier; +} @end @implementation MTROnOffClusterOnWithRecallGlobalSceneParams - (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 d1be6b40eb150b..e84869f18199d0 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 @@ -1756,7 +1756,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEffectId)), effectId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEffectIdentifier)), effectIdentifier)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEffectVariant)), effectVariant)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; @@ -1776,8 +1776,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kEffectId): - ReturnErrorOnFailure(DataModel::Decode(reader, effectId)); + case to_underlying(Fields::kEffectIdentifier): + ReturnErrorOnFailure(DataModel::Decode(reader, effectIdentifier)); break; case to_underlying(Fields::kEffectVariant): ReturnErrorOnFailure(DataModel::Decode(reader, effectVariant)); 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 f3b8b509ae77b9..db6d28c4afa7a5 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 @@ -1911,8 +1911,8 @@ struct DecodableType namespace OffWithEffect { enum class Fields { - kEffectId = 0, - kEffectVariant = 1, + kEffectIdentifier = 0, + kEffectVariant = 1, }; struct Type @@ -1922,7 +1922,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::OffWithEffect::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - OnOffEffectIdentifier effectId = static_cast(0); + OnOffEffectIdentifier effectIdentifier = static_cast(0); OnOffDelayedAllOffEffectVariant effectVariant = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1938,7 +1938,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::OffWithEffect::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - OnOffEffectIdentifier effectId = static_cast(0); + OnOffEffectIdentifier effectIdentifier = static_cast(0); OnOffDelayedAllOffEffectVariant effectVariant = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index d06f504753b5c6..d91d4523f3636b 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -870,7 +870,7 @@ class OnOffOffWithEffect : public ClusterCommand public: OnOffOffWithEffect(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("off-with-effect", credsIssuerConfig) { - AddArgument("EffectId", 0, UINT8_MAX, &mRequest.effectId); + AddArgument("EffectIdentifier", 0, UINT8_MAX, &mRequest.effectIdentifier); AddArgument("EffectVariant", 0, UINT8_MAX, &mRequest.effectVariant); ClusterCommand::AddArguments(); } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 5d141df9c648e4..7cc1640812f99d 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -102274,8 +102274,8 @@ class Test_TC_OO_2_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("OO.S.C40.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::OnOff::Commands::OffWithEffect::Type value; - value.effectId = static_cast(0); - value.effectVariant = static_cast(0); + value.effectIdentifier = static_cast(0); + value.effectVariant = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::OffWithEffect::Id, value, chip::NullOptional @@ -102332,8 +102332,8 @@ class Test_TC_OO_2_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("OO.S.C40.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::OnOff::Commands::OffWithEffect::Type value; - value.effectId = static_cast(0); - value.effectVariant = static_cast(0); + value.effectIdentifier = static_cast(0); + value.effectVariant = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::OffWithEffect::Id, value, chip::NullOptional @@ -102389,8 +102389,8 @@ class Test_TC_OO_2_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("OO.S.C40.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::OnOff::Commands::OffWithEffect::Type value; - value.effectId = static_cast(1); - value.effectVariant = static_cast(0); + value.effectIdentifier = static_cast(1); + value.effectVariant = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::OffWithEffect::Id, value, chip::NullOptional @@ -102613,8 +102613,8 @@ class Test_TC_OO_2_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("OO.S.C40.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::OnOff::Commands::OffWithEffect::Type value; - value.effectId = static_cast(0); - value.effectVariant = static_cast(0); + value.effectIdentifier = static_cast(0); + value.effectVariant = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::OffWithEffect::Id, value, chip::NullOptional 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 bc2d99c42d3d9b..2a0512d1df295e 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -2908,7 +2908,7 @@ class OnOffOffWithEffect : public ClusterCommand { OnOffOffWithEffect() : ClusterCommand("off-with-effect") { - AddArgument("EffectId", 0, UINT8_MAX, &mRequest.effectId); + AddArgument("EffectIdentifier", 0, UINT8_MAX, &mRequest.effectIdentifier); AddArgument("EffectVariant", 0, UINT8_MAX, &mRequest.effectVariant); ClusterCommand::AddArguments(); } @@ -2922,7 +2922,7 @@ class OnOffOffWithEffect : public ClusterCommand { __auto_type * params = [[MTROnOffClusterOffWithEffectParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.effectId = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.effectId)]; + params.effectIdentifier = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.effectIdentifier)]; params.effectVariant = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.effectVariant)]; uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount;