Fix member naming for the MultiPressComplete event. (#23895)
It's called PreviousPosition, not NewPosition.
Fixes https://github.com/project-chip/connectedhomeip/issues/23872
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 4f87fd2..e3bb052 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
@@ -1514,7 +1514,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
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 65d9b42..d448d6d 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
@@ -1365,7 +1365,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index 935c1c8..e73d36d 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -1201,7 +1201,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index e7583f9..99128b2 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -1059,7 +1059,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index 0177e33..13219b5 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -794,7 +794,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index 4ef2b98..b8718a1 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -943,7 +943,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index 6a6bde9..ebd7172 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -794,7 +794,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index 6266fa4..14665ce 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -943,7 +943,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
index e750f57..9d6e2b3 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -796,7 +796,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index c3fbdaf..bfe37b5 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -807,7 +807,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index e8b1081..2d6d21c 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -936,7 +936,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index e1227bc..0095b12 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -807,7 +807,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index d74341c..becad30 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -807,7 +807,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index d266a0e..ceca13d 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -807,7 +807,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index de8ed09..2ec18df 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -943,7 +943,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index 156646c..c9fd4e9 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -886,7 +886,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index 1575d81..1da5df8 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -844,7 +844,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index 593a08e..3130725 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -812,7 +812,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index acc8ff4..b2e84bb 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -934,7 +934,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index 30796b5..4fcee16 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -807,7 +807,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index 4f58b00..04af554 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -794,7 +794,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index 602e899..e209648 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -794,7 +794,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
index 935c1c8..e73d36d 100644
--- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
+++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
@@ -1201,7 +1201,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index 16ed6bc..5a9f740 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -1249,7 +1249,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 68d7564..0c64887 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -1205,7 +1205,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index f6d04ad..6aa20f5 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -1161,7 +1161,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
@@ -1210,7 +1210,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index f6d04ad..6aa20f5 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -1161,7 +1161,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
@@ -1210,7 +1210,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index 0c992d3..172f1c4 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -1420,7 +1420,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/src/app/clusters/switch-server/switch-server.cpp b/src/app/clusters/switch-server/switch-server.cpp
index f74677e..64cce04 100644
--- a/src/app/clusters/switch-server/switch-server.cpp
+++ b/src/app/clusters/switch-server/switch-server.cpp
@@ -135,13 +135,13 @@
}
}
-void SwitchServer::OnMultiPressComplete(EndpointId endpoint, uint8_t newPosition, uint8_t count)
+void SwitchServer::OnMultiPressComplete(EndpointId endpoint, uint8_t previousPosition, uint8_t count)
{
ChipLogProgress(Zcl, "SwitchServer: OnMultiPressComplete");
// Record MultiPressComplete event
EventNumber eventNumber;
- Events::MultiPressComplete::Type event{ newPosition, count };
+ Events::MultiPressComplete::Type event{ previousPosition, count };
if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
{
diff --git a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml
index 512cf5b..8bb770d 100644
--- a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml
@@ -60,7 +60,7 @@
</event>
<event side="server" code="0x06" priority="info" name="MultiPressComplete" optional="true">
<description>MultiPress Complete</description>
- <field id="0" name="NewPosition" type="INT8U" />
+ <field id="0" name="PreviousPosition" type="INT8U" />
<field id="1" name="TotalNumberOfPressesCounted" type="INT8U" />
</event>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index f5d80fd..c8b06c6 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -1739,7 +1739,7 @@
}
info event MultiPressComplete = 6 {
- INT8U newPosition = 0;
+ INT8U previousPosition = 0;
INT8U totalNumberOfPressesCounted = 1;
}
diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
index cea5d48..eb53f82 100644
--- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
@@ -1879,12 +1879,12 @@
{
return nullptr;
}
- jobject value_newPosition;
- std::string value_newPositionClassName = "java/lang/Integer";
- std::string value_newPositionCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(value_newPositionClassName.c_str(),
- value_newPositionCtorSignature.c_str(),
- cppValue.newPosition, value_newPosition);
+ jobject value_previousPosition;
+ std::string value_previousPositionClassName = "java/lang/Integer";
+ std::string value_previousPositionCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(value_previousPositionClassName.c_str(),
+ value_previousPositionCtorSignature.c_str(),
+ cppValue.previousPosition, value_previousPosition);
jobject value_totalNumberOfPressesCounted;
std::string value_totalNumberOfPressesCountedClassName = "java/lang/Integer";
@@ -1909,7 +1909,7 @@
return nullptr;
}
- jobject value = env->NewObject(multiPressCompleteStructClass, multiPressCompleteStructCtor, value_newPosition,
+ jobject value = env->NewObject(multiPressCompleteStructClass, multiPressCompleteStructCtor, value_previousPosition,
value_totalNumberOfPressesCounted);
return value;
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
index f2cadef..c306841 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
@@ -763,12 +763,12 @@
}
public static class SwitchClusterMultiPressCompleteEvent {
- public Integer newPosition;
+ public Integer previousPosition;
public Integer totalNumberOfPressesCounted;
public SwitchClusterMultiPressCompleteEvent(
- Integer newPosition, Integer totalNumberOfPressesCounted) {
- this.newPosition = newPosition;
+ Integer previousPosition, Integer totalNumberOfPressesCounted) {
+ this.previousPosition = previousPosition;
this.totalNumberOfPressesCounted = totalNumberOfPressesCounted;
}
@@ -776,8 +776,8 @@
public String toString() {
StringBuilder output = new StringBuilder();
output.append("SwitchClusterMultiPressCompleteEvent {\n");
- output.append("\tnewPosition: ");
- output.append(newPosition);
+ output.append("\tpreviousPosition: ");
+ output.append(previousPosition);
output.append("\n");
output.append("\ttotalNumberOfPressesCounted: ");
output.append(totalNumberOfPressesCounted);
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 8490470..1f68a49 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -11142,11 +11142,11 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
- ClusterObjectFieldDescriptor(Label="newPosition", Tag=0, Type=uint),
+ ClusterObjectFieldDescriptor(Label="previousPosition", Tag=0, Type=uint),
ClusterObjectFieldDescriptor(Label="totalNumberOfPressesCounted", Tag=1, Type=uint),
])
- newPosition: 'uint' = 0
+ previousPosition: 'uint' = 0
totalNumberOfPressesCounted: 'uint' = 0
diff --git a/src/darwin/Framework/CHIP/templates/MTRStructsObjc-src.zapt b/src/darwin/Framework/CHIP/templates/MTRStructsObjc-src.zapt
index 83f1183..625859d 100644
--- a/src/darwin/Framework/CHIP/templates/MTRStructsObjc-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRStructsObjc-src.zapt
@@ -83,6 +83,21 @@
return descriptionString;
}
+{{#if (isStrEqual (asUpperCamelCase parent.name preserveAcronyms=true) "Switch")}}
+{{#if (isStrEqual (asUpperCamelCase name preserveAcronyms=true) "MultiPressComplete")}}
+{{! Workaround for the name being mis-spelled in XML previously }}
+- (void)setNewPosition:(NSNumber * _Nonnull)newPosition
+{
+ self.previousPosition = newPosition;
+}
+
+- (NSNumber * _Nonnull)newPosition
+{
+ return self.previousPosition;
+}
+
+{{/if}}
+{{/if}}
@end
{{#unless (isStrEqual (asUpperCamelCase parent.name preserveAcronyms=true) (compatClusterNameRemapping parent.name))}}
diff --git a/src/darwin/Framework/CHIP/templates/MTRStructsObjc.zapt b/src/darwin/Framework/CHIP/templates/MTRStructsObjc.zapt
index 7f26306..28ace6a 100644
--- a/src/darwin/Framework/CHIP/templates/MTRStructsObjc.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRStructsObjc.zapt
@@ -49,7 +49,17 @@
{{/unless}}
@interface MTR{{asUpperCamelCase parent.name preserveAcronyms=true}}Cluster{{asUpperCamelCase name preserveAcronyms=true}}Event : NSObject <NSCopying>
{{#zcl_event_fields}}
-@property (nonatomic, copy{{#unless (isStrEqual (asGetterName name) (asStructPropertyName name))}}, getter={{asGetterName name}}{{/unless}}) {{asObjectiveCType type parent.parent.name}} {{asStructPropertyName name}};
+@property (nonatomic, copy{{#unless (isStrEqual (asGetterName name) (asStructPropertyName name))}}, getter={{asGetterName name}}{{/unless}}) {{asObjectiveCType type parent.parent.name}} {{asStructPropertyName name}}
+{{#if (isStrEqual (asUpperCamelCase ../parent.name preserveAcronyms=true) "Switch")}}
+{{#if (isStrEqual (asUpperCamelCase ../name preserveAcronyms=true) "MultiPressComplete")}}
+{{#if (isStrEqual (asStructPropertyName name) "previousPosition")}}
+{{! Workaround for the name being mis-spelled in XML previously }}
+MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull newPosition MTR_NEWLY_DEPRECATED("Please use previousPosition")
+{{/if}}
+{{/if}}
+{{/if}}
+;
{{/zcl_event_fields}}
@end
{{#unless (isStrEqual (asUpperCamelCase parent.name preserveAcronyms=true) (compatClusterNameRemapping parent.name))}}
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
index f4c013d..165f07a 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
@@ -1240,8 +1240,8 @@
do {
NSNumber * _Nonnull memberValue;
- memberValue = [NSNumber numberWithUnsignedChar:cppValue.newPosition];
- value.newPosition = memberValue;
+ memberValue = [NSNumber numberWithUnsignedChar:cppValue.previousPosition];
+ value.previousPosition = memberValue;
} while (0);
do {
NSNumber * _Nonnull memberValue;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index 96b8ae4..397f744 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -390,7 +390,8 @@
@end
@interface MTRSwitchClusterMultiPressCompleteEvent : NSObject <NSCopying>
-@property (nonatomic, copy, getter=getNewPosition) NSNumber * _Nonnull newPosition;
+@property (nonatomic, copy) NSNumber * _Nonnull previousPosition MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull newPosition MTR_NEWLY_DEPRECATED("Please use previousPosition");
@property (nonatomic, copy) NSNumber * _Nonnull totalNumberOfPressesCounted;
@end
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index 07769ea..9b69f0d 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -2035,7 +2035,7 @@
{
if (self = [super init]) {
- _newPosition = @(0);
+ _previousPosition = @(0);
_totalNumberOfPressesCounted = @(0);
}
@@ -2046,7 +2046,7 @@
{
auto other = [[MTRSwitchClusterMultiPressCompleteEvent alloc] init];
- other.newPosition = self.newPosition;
+ other.previousPosition = self.previousPosition;
other.totalNumberOfPressesCounted = self.totalNumberOfPressesCounted;
return other;
@@ -2054,11 +2054,21 @@
- (NSString *)description
{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: newPosition:%@; totalNumberOfPressesCounted:%@; >",
- NSStringFromClass([self class]), _newPosition, _totalNumberOfPressesCounted];
+ NSString * descriptionString = [NSString stringWithFormat:@"<%@: previousPosition:%@; totalNumberOfPressesCounted:%@; >",
+ NSStringFromClass([self class]), _previousPosition, _totalNumberOfPressesCounted];
return descriptionString;
}
+- (void)setNewPosition:(NSNumber * _Nonnull)newPosition
+{
+ self.previousPosition = newPosition;
+}
+
+- (NSNumber * _Nonnull)newPosition
+{
+ return self.previousPosition;
+}
+
@end
@implementation MTROperationalCredentialsClusterFabricDescriptor
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 51873b2..b3eec2e 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
@@ -8542,7 +8542,7 @@
{
TLV::TLVType outer;
ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNewPosition)), newPosition));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPreviousPosition)), previousPosition));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTotalNumberOfPressesCounted)),
totalNumberOfPressesCounted));
ReturnErrorOnFailure(writer.EndContainer(outer));
@@ -8563,8 +8563,8 @@
}
switch (TLV::TagNumFromTag(reader.GetTag()))
{
- case to_underlying(Fields::kNewPosition):
- ReturnErrorOnFailure(DataModel::Decode(reader, newPosition));
+ case to_underlying(Fields::kPreviousPosition):
+ ReturnErrorOnFailure(DataModel::Decode(reader, previousPosition));
break;
case to_underlying(Fields::kTotalNumberOfPressesCounted):
ReturnErrorOnFailure(DataModel::Decode(reader, totalNumberOfPressesCounted));
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 c08f33b..61e97cf 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
@@ -10880,7 +10880,7 @@
enum class Fields
{
- kNewPosition = 0,
+ kPreviousPosition = 0,
kTotalNumberOfPressesCounted = 1,
};
@@ -10892,7 +10892,7 @@
static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
static constexpr bool kIsFabricScoped = false;
- uint8_t newPosition = static_cast<uint8_t>(0);
+ uint8_t previousPosition = static_cast<uint8_t>(0);
uint8_t totalNumberOfPressesCounted = static_cast<uint8_t>(0);
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -10905,7 +10905,7 @@
static constexpr EventId GetEventId() { return Events::MultiPressComplete::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
- uint8_t newPosition = static_cast<uint8_t>(0);
+ uint8_t previousPosition = static_cast<uint8_t>(0);
uint8_t totalNumberOfPressesCounted = static_cast<uint8_t>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
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 418d7df..5f6b65a 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -3134,10 +3134,10 @@
{
DataModelLogger::LogString(label, indent, "{");
{
- CHIP_ERROR err = DataModelLogger::LogValue("NewPosition", indent + 1, value.newPosition);
+ CHIP_ERROR err = DataModelLogger::LogValue("PreviousPosition", indent + 1, value.previousPosition);
if (err != CHIP_NO_ERROR)
{
- DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewPosition'");
+ DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PreviousPosition'");
return err;
}
}
