Align naming in On/Off cluster XML with the spec. (#24237)
* Align naming in On/Off cluster XML with the spec.
* Regenerate generated files.
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 9b446d5..0c3bb7f 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 @@
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 47dfe56..02b77ed 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 @@
break;
case Clusters::OnOff::Commands::OffWithEffect::Id:
- offwitheffectCommand.effectId = static_cast<EmberAfOnOffEffectIdentifier>(data->args[0]);
- offwitheffectCommand.effectVariant = static_cast<EmberAfOnOffDelayedAllOffEffectVariant>(data->args[1]);
+ offwitheffectCommand.effectIdentifier = static_cast<EmberAfOnOffEffectIdentifier>(data->args[0]);
+ offwitheffectCommand.effectVariant = static_cast<EmberAfOnOffDelayedAllOffEffectVariant>(data->args[1]);
Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
offwitheffectCommand, onSuccess, onFailure);
break;
@@ -171,8 +171,8 @@
break;
case Clusters::OnOff::Commands::OffWithEffect::Id:
- offwitheffectCommand.effectId = static_cast<EmberAfOnOffEffectIdentifier>(data->args[0]);
- offwitheffectCommand.effectVariant = static_cast<EmberAfOnOffDelayedAllOffEffectVariant>(data->args[1]);
+ offwitheffectCommand.effectIdentifier = static_cast<EmberAfOnOffEffectIdentifier>(data->args[0]);
+ offwitheffectCommand.effectVariant = static_cast<EmberAfOnOffDelayedAllOffEffectVariant>(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 419c1c0..1e0ca44 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -154,7 +154,7 @@
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 094eb48..d122bdf 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -150,7 +150,7 @@
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 462581d..43cc20a 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 @@
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 4227875..0f0fa82 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 @@
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 8c8d610..2661754 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -247,7 +247,7 @@
readonly attribute int16u clusterRevision = 65533;
request struct OffWithEffectRequest {
- OnOffEffectIdentifier effectId = 0;
+ OnOffEffectIdentifier effectIdentifier = 0;
OnOffDelayedAllOffEffectVariant effectVariant = 1;
}
@@ -308,7 +308,7 @@
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 8c8d610..2661754 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -247,7 +247,7 @@
readonly attribute int16u clusterRevision = 65533;
request struct OffWithEffectRequest {
- OnOffEffectIdentifier effectId = 0;
+ OnOffEffectIdentifier effectIdentifier = 0;
OnOffDelayedAllOffEffectVariant effectVariant = 1;
}
@@ -308,7 +308,7 @@
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 260051d..4fa560a 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::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 c43a0ce..970d252 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 @@
PICS: OO.S.C40.Rsp
arguments:
values:
- - name: "EffectId"
+ - name: "EffectIdentifier"
value: 0
- name: "EffectVariant"
value: 0
@@ -122,7 +122,7 @@
PICS: OO.S.C40.Rsp
arguments:
values:
- - name: "EffectId"
+ - name: "EffectIdentifier"
value: 0
- name: "EffectVariant"
value: 0
@@ -180,7 +180,7 @@
PICS: OO.S.C40.Rsp
arguments:
values:
- - name: "EffectId"
+ - name: "EffectIdentifier"
value: 1
- name: "EffectVariant"
value: 0
@@ -416,7 +416,7 @@
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 e8cd3ce..7ef1790 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 @@
<command source="client" code="0x40" name="OffWithEffect" optional="true">
<description>The OffWithEffect command allows devices to be turned off using enhanced ways of fading.</description>
- <arg name="EffectId" type="OnOffEffectIdentifier"/>
+ <arg name="EffectIdentifier" type="OnOffEffectIdentifier"/>
<arg name="EffectVariant" type="OnOffDelayedAllOffEffectVariant"/>
</command>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 57579f0..50c53e9 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -270,7 +270,7 @@
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 51d696f..ce0271a 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 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 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 b44dafa..6434d4d 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 @@
onOffClusterInteractionInfoMap.put("toggle", onOfftoggleInteractionInfo);
Map<String, CommandParameterInfo> onOffoffWithEffectCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- 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 @@
((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 a205e0f..4698b39 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -333,7 +333,7 @@
"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 e3b6ed5..2f76dbf 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -1265,11 +1265,11 @@
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 fd77a49..e82619d 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 488006a..8837452 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -3226,7 +3226,8 @@
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
}
}
- request.effectId = static_cast<std::remove_reference_t<decltype(request.effectId)>>(params.effectId.unsignedCharValue);
+ request.effectIdentifier = static_cast<std::remove_reference_t<decltype(request.effectIdentifier)>>(
+ params.effectIdentifier.unsignedCharValue);
request.effectVariant
= static_cast<std::remove_reference_t<decltype(request.effectVariant)>>(params.effectVariant.unsignedCharValue);
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index 2cc3860..218565e 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -2074,8 +2074,8 @@
if (timedInvokeTimeoutMsParam != nil) {
timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue);
}
- request.effectId
- = static_cast<std::remove_reference_t<decltype(request.effectId)>>(params.effectId.unsignedCharValue);
+ request.effectIdentifier = static_cast<std::remove_reference_t<decltype(request.effectIdentifier)>>(
+ params.effectIdentifier.unsignedCharValue);
request.effectVariant
= static_cast<std::remove_reference_t<decltype(request.effectVariant)>>(params.effectVariant.unsignedCharValue);
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
index a225897..333de93 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))
@interface MTROnOffClusterOffWithEffectParams : NSObject <NSCopying>
-@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 @@
@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 <NSCopying>
/**
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
index 2a6e173..66db340 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
@@ -1235,7 +1235,7 @@
{
if (self = [super init]) {
- _effectId = @(0);
+ _effectIdentifier = @(0);
_effectVariant = @(0);
_timedInvokeTimeoutMs = nil;
@@ -1247,7 +1247,7 @@
{
auto other = [[MTROnOffClusterOffWithEffectParams alloc] init];
- other.effectId = self.effectId;
+ other.effectIdentifier = self.effectIdentifier;
other.effectVariant = self.effectVariant;
other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
@@ -1256,12 +1256,25 @@
- (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 d1be6b4..e84869f 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 @@
{
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 @@
}
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 f3b8b50..db6d28c 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 @@
namespace OffWithEffect {
enum class Fields
{
- kEffectId = 0,
- kEffectVariant = 1,
+ kEffectIdentifier = 0,
+ kEffectVariant = 1,
};
struct Type
@@ -1922,7 +1922,7 @@
static constexpr CommandId GetCommandId() { return Commands::OffWithEffect::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; }
- OnOffEffectIdentifier effectId = static_cast<OnOffEffectIdentifier>(0);
+ OnOffEffectIdentifier effectIdentifier = static_cast<OnOffEffectIdentifier>(0);
OnOffDelayedAllOffEffectVariant effectVariant = static_cast<OnOffDelayedAllOffEffectVariant>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -1938,7 +1938,7 @@
static constexpr CommandId GetCommandId() { return Commands::OffWithEffect::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; }
- OnOffEffectIdentifier effectId = static_cast<OnOffEffectIdentifier>(0);
+ OnOffEffectIdentifier effectIdentifier = static_cast<OnOffEffectIdentifier>(0);
OnOffDelayedAllOffEffectVariant effectVariant = static_cast<OnOffDelayedAllOffEffectVariant>(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 d06f504..d91d452 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 @@
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 5d141df..7cc1640 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 @@
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<chip::app::Clusters::OnOff::OnOffEffectIdentifier>(0);
- value.effectVariant = static_cast<chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant>(0);
+ value.effectIdentifier = static_cast<chip::app::Clusters::OnOff::OnOffEffectIdentifier>(0);
+ value.effectVariant = static_cast<chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant>(0);
return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::OffWithEffect::Id, value,
chip::NullOptional
@@ -102332,8 +102332,8 @@
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<chip::app::Clusters::OnOff::OnOffEffectIdentifier>(0);
- value.effectVariant = static_cast<chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant>(0);
+ value.effectIdentifier = static_cast<chip::app::Clusters::OnOff::OnOffEffectIdentifier>(0);
+ value.effectVariant = static_cast<chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant>(0);
return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::OffWithEffect::Id, value,
chip::NullOptional
@@ -102389,8 +102389,8 @@
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<chip::app::Clusters::OnOff::OnOffEffectIdentifier>(1);
- value.effectVariant = static_cast<chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant>(0);
+ value.effectIdentifier = static_cast<chip::app::Clusters::OnOff::OnOffEffectIdentifier>(1);
+ value.effectVariant = static_cast<chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant>(0);
return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::OffWithEffect::Id, value,
chip::NullOptional
@@ -102613,8 +102613,8 @@
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<chip::app::Clusters::OnOff::OnOffEffectIdentifier>(0);
- value.effectVariant = static_cast<chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant>(0);
+ value.effectIdentifier = static_cast<chip::app::Clusters::OnOff::OnOffEffectIdentifier>(0);
+ value.effectVariant = static_cast<chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant>(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 bc2d99c..2a0512d 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 @@
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 @@
__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;
