diff --git a/data_model/clusters/Messages.xml b/data_model/clusters/Messages.xml index cea28ac15f54c9..5bc3ce81fa2a0d 100644 --- a/data_model/clusters/Messages.xml +++ b/data_model/clusters/Messages.xml @@ -216,7 +216,7 @@ Davis, CA 95616, USA - + diff --git a/examples/tv-app/android/include/messages/MessagesManager.cpp b/examples/tv-app/android/include/messages/MessagesManager.cpp index dcd48f028b961e..00848c67312751 100644 --- a/examples/tv-app/android/include/messages/MessagesManager.cpp +++ b/examples/tv-app/android/include/messages/MessagesManager.cpp @@ -25,7 +25,7 @@ using namespace chip::app::Clusters::Messages; void MessagesManager::HandlePresentMessagesRequest( const chip::ByteSpan & messageId, const MessagePriorityEnum & priority, const chip::BitMask & messageControl, const chip::app::DataModel::Nullable & startTime, - const chip::app::DataModel::Nullable & duration, const chip::CharSpan & messageText, + const chip::app::DataModel::Nullable & duration, const chip::CharSpan & messageText, const chip::Optional> & responses) { // TODO: Present Message diff --git a/examples/tv-app/android/include/messages/MessagesManager.h b/examples/tv-app/android/include/messages/MessagesManager.h index 5f06d253846c4f..d6759061800621 100644 --- a/examples/tv-app/android/include/messages/MessagesManager.h +++ b/examples/tv-app/android/include/messages/MessagesManager.h @@ -27,7 +27,7 @@ class MessagesManager : public chip::app::Clusters::Messages::Delegate void HandlePresentMessagesRequest( const chip::ByteSpan & messageId, const chip::app::Clusters::Messages::MessagePriorityEnum & priority, const chip::BitMask & messageControl, - const chip::app::DataModel::Nullable & startTime, const chip::app::DataModel::Nullable & duration, + const chip::app::DataModel::Nullable & startTime, const chip::app::DataModel::Nullable & duration, const chip::CharSpan & messageText, const chip::Optional> & responses) override; diff --git a/examples/tv-app/android/java/MessagesManager.cpp b/examples/tv-app/android/java/MessagesManager.cpp index 9203d7b54510f5..dbcb5c5994504b 100644 --- a/examples/tv-app/android/java/MessagesManager.cpp +++ b/examples/tv-app/android/java/MessagesManager.cpp @@ -183,10 +183,10 @@ CHIP_ERROR MessagesManager::HandleGetMessages(AttributeValueEncoder & aEncoder) } jfieldID durationField = env->GetFieldID(messageClass, "duration", "I"); - jint jduration = env->GetIntField(messageObject, durationField); + jlong jduration = env->GetLongField(messageObject, durationField); if (jduration >= 0) { - message.duration = DataModel::Nullable(static_cast(jduration)); + message.duration = DataModel::Nullable(static_cast(jduration)); } jfieldID getResponseOptionsField = @@ -301,7 +301,7 @@ CHIP_ERROR MessagesManager::HandleGetActiveMessageIds(AttributeValueEncoder & aE CHIP_ERROR MessagesManager::HandlePresentMessagesRequest( const ByteSpan & messageId, const MessagePriorityEnum & priority, const BitMask & messageControl, - const DataModel::Nullable & startTime, const DataModel::Nullable & duration, const CharSpan & messageText, + const DataModel::Nullable & startTime, const DataModel::Nullable & duration, const CharSpan & messageText, const Optional> & responses) { DeviceLayer::StackUnlock unlock; @@ -336,11 +336,11 @@ CHIP_ERROR MessagesManager::HandlePresentMessagesRequest( return CHIP_ERROR_INTERNAL; } - jint jcontrol = static_cast(messageControl.Raw()); - jint jduration = -1; + jint jcontrol = static_cast(messageControl.Raw()); + jlong jduration = -1; if (!duration.IsNull()) { - jduration = static_cast(duration.Value()); + jduration = static_cast(duration.Value()); } jlong jstartTime = -1; if (!startTime.IsNull()) diff --git a/examples/tv-app/android/java/MessagesManager.h b/examples/tv-app/android/java/MessagesManager.h index 563192a542bdf6..089d3e4360afe0 100644 --- a/examples/tv-app/android/java/MessagesManager.h +++ b/examples/tv-app/android/java/MessagesManager.h @@ -35,7 +35,7 @@ class MessagesManager : public chip::app::Clusters::Messages::Delegate CHIP_ERROR HandlePresentMessagesRequest( const chip::ByteSpan & messageId, const chip::app::Clusters::Messages::MessagePriorityEnum & priority, const chip::BitMask & messageControl, - const chip::app::DataModel::Nullable & startTime, const chip::app::DataModel::Nullable & duration, + const chip::app::DataModel::Nullable & startTime, const chip::app::DataModel::Nullable & duration, const chip::CharSpan & messageText, const chip::Optional< chip::app::DataModel::DecodableList> & diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/Message.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/Message.java index c194ffb44f9ee1..8949ab8283b10d 100644 --- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/Message.java +++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/Message.java @@ -23,7 +23,7 @@ public class Message { public int priority; public int messageControl; public long startTime; - public int duration; + public long duration; public String messageText; public MessageResponseOption responseOptions[]; @@ -32,7 +32,7 @@ public Message( int priority, int messageControl, long startTime, - int duration, + long duration, String messageText, MessageResponseOption responseOptions[]) { this.messageId = messageId; diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MessagesManager.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MessagesManager.java index 0a5680866714c6..5d97083cafe8a4 100644 --- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MessagesManager.java +++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MessagesManager.java @@ -28,7 +28,7 @@ boolean presentMessages( int priority, int messageControl, long startTime, - int duration, + long duration, String messageText, HashMap responseOptions); diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MessagesManagerStub.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MessagesManagerStub.java index 63fef69d35c936..55d94209197559 100644 --- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MessagesManagerStub.java +++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MessagesManagerStub.java @@ -52,7 +52,7 @@ public boolean presentMessages( int priority, int messageControl, long startTime, - int duration, + long duration, String messageText, HashMap responseOptions) { Log.d( diff --git a/examples/tv-app/tv-common/clusters/messages/MessagesManager.cpp b/examples/tv-app/tv-common/clusters/messages/MessagesManager.cpp index 6ffbb9a3476258..461e35524c0736 100644 --- a/examples/tv-app/tv-common/clusters/messages/MessagesManager.cpp +++ b/examples/tv-app/tv-common/clusters/messages/MessagesManager.cpp @@ -30,7 +30,7 @@ using MessageResponseOption = chip::app::Clusters::Messages::Structs::MessageRes // Commands CHIP_ERROR MessagesManager::HandlePresentMessagesRequest( const ByteSpan & messageId, const MessagePriorityEnum & priority, const BitMask & messageControl, - const DataModel::Nullable & startTime, const DataModel::Nullable & duration, const CharSpan & messageText, + const DataModel::Nullable & startTime, const DataModel::Nullable & duration, const CharSpan & messageText, const Optional> & responses) { ChipLogProgress(Zcl, "HandlePresentMessagesRequest message:%s", std::string(messageText.data(), messageText.size()).c_str()); diff --git a/examples/tv-app/tv-common/clusters/messages/MessagesManager.h b/examples/tv-app/tv-common/clusters/messages/MessagesManager.h index 325cd56fc788af..777f202e28548a 100644 --- a/examples/tv-app/tv-common/clusters/messages/MessagesManager.h +++ b/examples/tv-app/tv-common/clusters/messages/MessagesManager.h @@ -64,7 +64,7 @@ struct CachedMessage CachedMessage(const chip::ByteSpan & messageId, const chip::app::Clusters::Messages::MessagePriorityEnum & priority, const chip::BitMask & messageControl, const chip::app::DataModel::Nullable & startTime, - const chip::app::DataModel::Nullable & duration, std::string messageText) : + const chip::app::DataModel::Nullable & duration, std::string messageText) : mPriority(priority), mMessageControl(messageControl), mStartTime(startTime), mDuration(duration), mMessageText(messageText) { @@ -110,7 +110,7 @@ struct CachedMessage const chip::app::Clusters::Messages::MessagePriorityEnum mPriority; const chip::BitMask mMessageControl; const chip::app::DataModel::Nullable mStartTime; - const chip::app::DataModel::Nullable mDuration; + const chip::app::DataModel::Nullable mDuration; std::string mMessageText; uint8_t mMessageIdBuffer[chip::app::Clusters::Messages::kMessageIdLength]; @@ -126,7 +126,7 @@ class MessagesManager : public chip::app::Clusters::Messages::Delegate CHIP_ERROR HandlePresentMessagesRequest( const chip::ByteSpan & messageId, const chip::app::Clusters::Messages::MessagePriorityEnum & priority, const chip::BitMask & messageControl, - const chip::app::DataModel::Nullable & startTime, const chip::app::DataModel::Nullable & duration, + const chip::app::DataModel::Nullable & startTime, const chip::app::DataModel::Nullable & duration, const chip::CharSpan & messageText, const chip::Optional< chip::app::DataModel::DecodableList> & diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 6effacc92c0812..37fd9cb777b98b 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -2067,7 +2067,7 @@ provisional cluster Messages = 151 { MessagePriorityEnum priority = 1; MessageControlBitmap messageControl = 2; nullable epoch_s startTime = 3; - nullable int16u duration = 4; + nullable int64u duration = 4; char_string<256> messageText = 5; optional MessageResponseOptionStruct responses[] = 6; } @@ -2101,7 +2101,7 @@ provisional cluster Messages = 151 { MessagePriorityEnum priority = 1; MessageControlBitmap messageControl = 2; nullable epoch_s startTime = 3; - nullable int16u duration = 4; + nullable int64u duration = 4; char_string<256> messageText = 5; optional MessageResponseOptionStruct responses[] = 6; } 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 4bece078774075..35a766e68307aa 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 @@ -1545,7 +1545,7 @@ provisional cluster Messages = 151 { MessagePriorityEnum priority = 1; MessageControlBitmap messageControl = 2; nullable epoch_s startTime = 3; - nullable int16u duration = 4; + nullable int64u duration = 4; char_string<256> messageText = 5; optional MessageResponseOptionStruct responses[] = 6; } @@ -1579,7 +1579,7 @@ provisional cluster Messages = 151 { MessagePriorityEnum priority = 1; MessageControlBitmap messageControl = 2; nullable epoch_s startTime = 3; - nullable int16u duration = 4; + nullable int64u duration = 4; char_string<256> messageText = 5; optional MessageResponseOptionStruct responses[] = 6; } diff --git a/src/app/clusters/messages-server/messages-delegate.h b/src/app/clusters/messages-server/messages-delegate.h index aba771aad23953..6be09de781d340 100644 --- a/src/app/clusters/messages-server/messages-delegate.h +++ b/src/app/clusters/messages-server/messages-delegate.h @@ -42,7 +42,7 @@ class Delegate virtual CHIP_ERROR HandlePresentMessagesRequest( const ByteSpan & messageId, const MessagePriorityEnum & priority, const chip::BitMask & messageControl, const DataModel::Nullable & startTime, - const DataModel::Nullable & duration, const CharSpan & messageText, + const DataModel::Nullable & duration, const CharSpan & messageText, const chip::Optional> & responses) = 0; virtual CHIP_ERROR HandleCancelMessagesRequest(const DataModel::DecodableList & messageIds) = 0; diff --git a/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml index 2da346cd49a6f7..16b1527625d320 100644 --- a/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml @@ -58,7 +58,7 @@ limitations under the License. - + @@ -88,7 +88,7 @@ limitations under the License. - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 235366f4206e78..8611f4bdcf62d8 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -4539,7 +4539,7 @@ provisional cluster Messages = 151 { MessagePriorityEnum priority = 1; MessageControlBitmap messageControl = 2; nullable epoch_s startTime = 3; - nullable int16u duration = 4; + nullable int64u duration = 4; char_string<256> messageText = 5; optional MessageResponseOptionStruct responses[] = 6; } @@ -4573,7 +4573,7 @@ provisional cluster Messages = 151 { MessagePriorityEnum priority = 1; MessageControlBitmap messageControl = 2; nullable epoch_s startTime = 3; - nullable int16u duration = 4; + nullable int64u duration = 4; char_string<256> messageText = 5; optional MessageResponseOptionStruct responses[] = 6; } diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java index fcc9154511d2b7..7025f3cde37858 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -29906,11 +29906,11 @@ public long initWithDevice(long devicePtr, int endpointId) { return 0L; } - public void presentMessagesRequest(DefaultClusterCallback callback, byte[] messageID, Integer priority, Integer messageControl, @Nullable Long startTime, @Nullable Integer duration, String messageText, Optional> responses) { + public void presentMessagesRequest(DefaultClusterCallback callback, byte[] messageID, Integer priority, Integer messageControl, @Nullable Long startTime, @Nullable Long duration, String messageText, Optional> responses) { presentMessagesRequest(callback, messageID, priority, messageControl, startTime, duration, messageText, responses, 0); } - public void presentMessagesRequest(DefaultClusterCallback callback, byte[] messageID, Integer priority, Integer messageControl, @Nullable Long startTime, @Nullable Integer duration, String messageText, Optional> responses, int timedInvokeTimeoutMs) { + public void presentMessagesRequest(DefaultClusterCallback callback, byte[] messageID, Integer priority, Integer messageControl, @Nullable Long startTime, @Nullable Long duration, String messageText, Optional> responses, int timedInvokeTimeoutMs) { final long commandId = 0L; ArrayList elements = new ArrayList<>(); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java index 6fb0469aded45c..7730f05efe734a 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java @@ -7130,7 +7130,7 @@ public static class MessagesClusterMessageStruct { public Integer priority; public Integer messageControl; public @Nullable Long startTime; - public @Nullable Integer duration; + public @Nullable Long duration; public String messageText; public Optional> responses; private static final long MESSAGE_I_D_ID = 0L; @@ -7146,7 +7146,7 @@ public MessagesClusterMessageStruct( Integer priority, Integer messageControl, @Nullable Long startTime, - @Nullable Integer duration, + @Nullable Long duration, String messageText, Optional> responses ) { @@ -7180,7 +7180,7 @@ public static MessagesClusterMessageStruct decodeTlv(BaseTLVType tlvValue) { Integer priority = null; Integer messageControl = null; @Nullable Long startTime = null; - @Nullable Integer duration = null; + @Nullable Long duration = null; String messageText = null; Optional> responses = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { @@ -7207,7 +7207,7 @@ public static MessagesClusterMessageStruct decodeTlv(BaseTLVType tlvValue) { } else if (element.contextTagNum() == DURATION_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); - duration = castingValue.value(Integer.class); + duration = castingValue.value(Long.class); } } else if (element.contextTagNum() == MESSAGE_TEXT_ID) { if (element.value(BaseTLVType.class).type() == TLVType.String) { diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java index 14b4a97284f173..5162f9766a74da 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java @@ -24325,7 +24325,7 @@ public Map> getCommandMap() { CommandParameterInfo messagespresentMessagesRequeststartTimeCommandParameterInfo = new CommandParameterInfo("startTime", Long.class, Long.class); messagespresentMessagesRequestCommandParams.put("startTime",messagespresentMessagesRequeststartTimeCommandParameterInfo); - CommandParameterInfo messagespresentMessagesRequestdurationCommandParameterInfo = new CommandParameterInfo("duration", Integer.class, Integer.class); + CommandParameterInfo messagespresentMessagesRequestdurationCommandParameterInfo = new CommandParameterInfo("duration", Long.class, Long.class); messagespresentMessagesRequestCommandParams.put("duration",messagespresentMessagesRequestdurationCommandParameterInfo); CommandParameterInfo messagespresentMessagesRequestmessageTextCommandParameterInfo = new CommandParameterInfo("messageText", String.class, String.class); @@ -24343,7 +24343,7 @@ public Map> getCommandMap() { commandArguments.get("messageControl") , (Long) commandArguments.get("startTime") - , (Integer) + , (Long) commandArguments.get("duration") , (String) commandArguments.get("messageText") diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageStruct.kt index d1749289a3b652..03a544caf41c32 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageStruct.kt @@ -29,7 +29,7 @@ class MessagesClusterMessageStruct( val priority: UInt, val messageControl: UInt, val startTime: ULong?, - val duration: UInt?, + val duration: ULong?, val messageText: String, val responses: Optional> ) { @@ -97,7 +97,7 @@ class MessagesClusterMessageStruct( } val duration = if (!tlvReader.isNull()) { - tlvReader.getUInt(ContextSpecificTag(TAG_DURATION)) + tlvReader.getULong(ContextSpecificTag(TAG_DURATION)) } else { tlvReader.getNull(ContextSpecificTag(TAG_DURATION)) null diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/MessagesCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/MessagesCluster.kt index 5ce55e2e0dd21b..3e3fcd8f02d2f8 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/MessagesCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/MessagesCluster.kt @@ -106,7 +106,7 @@ class MessagesCluster(private val controller: MatterController, private val endp priority: UByte, messageControl: UByte, startTime: UInt?, - duration: UShort?, + duration: ULong?, messageText: String, responses: List?, timedInvokeTimeout: Duration? = null diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageStruct.kt index 8560beb0a72ce1..14c573c396ca18 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageStruct.kt @@ -29,7 +29,7 @@ class MessagesClusterMessageStruct( val priority: UByte, val messageControl: UByte, val startTime: UInt?, - val duration: UShort?, + val duration: ULong?, val messageText: String, val responses: Optional> ) { @@ -97,7 +97,7 @@ class MessagesClusterMessageStruct( } val duration = if (!tlvReader.isNull()) { - tlvReader.getUShort(ContextSpecificTag(TAG_DURATION)) + tlvReader.getULong(ContextSpecificTag(TAG_DURATION)) } else { tlvReader.getNull(ContextSpecificTag(TAG_DURATION)) null diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 7a8aebe5b5c493..2400ba818c7cb9 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -23068,12 +23068,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } else { - std::string newElement_0_durationClassName = "java/lang/Integer"; - std::string newElement_0_durationCtorSignature = "(I)V"; - jint jninewElement_0_duration = static_cast(entry_0.duration.Value()); - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_durationClassName.c_str(), - newElement_0_durationCtorSignature.c_str(), - jninewElement_0_duration, newElement_0_duration); + std::string newElement_0_durationClassName = "java/lang/Long"; + std::string newElement_0_durationCtorSignature = "(J)V"; + jlong jninewElement_0_duration = static_cast(entry_0.duration.Value()); + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_durationClassName.c_str(), + newElement_0_durationCtorSignature.c_str(), + jninewElement_0_duration, newElement_0_duration); } jobject newElement_0_messageText; LogErrorOnFailure( @@ -23163,11 +23163,10 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } jmethodID messageStructStructCtor_1; - err = - chip::JniReferences::GetInstance().FindMethod(env, messageStructStructClass_1, "", - "([BLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;Ljava/" - "lang/Integer;Ljava/lang/String;Ljava/util/Optional;)V", - &messageStructStructCtor_1); + err = chip::JniReferences::GetInstance().FindMethod(env, messageStructStructClass_1, "", + "([BLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/" + "Long;Ljava/lang/Long;Ljava/lang/String;Ljava/util/Optional;)V", + &messageStructStructCtor_1); if (err != CHIP_NO_ERROR || messageStructStructCtor_1 == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$MessagesClusterMessageStruct constructor"); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 298c127feeb02d..bae1643f3beb39 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -8750,7 +8750,7 @@ static id _Nullable DecodeAttributeValueForMessagesCluster(AttributeId aAttribut if (entry_0.duration.IsNull()) { newElement_0.duration = nil; } else { - newElement_0.duration = [NSNumber numberWithUnsignedShort:entry_0.duration.Value()]; + newElement_0.duration = [NSNumber numberWithUnsignedLongLong:entry_0.duration.Value()]; } newElement_0.messageText = AsString(entry_0.messageText); if (newElement_0.messageText == nil) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index b2c13559d07aec..60757c92d0dfdb 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -15516,7 +15516,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader encodableStruct.duration.SetNull(); } else { auto & nonNullValue_0 = encodableStruct.duration.SetNonNull(); - nonNullValue_0 = self.duration.unsignedShortValue; + nonNullValue_0 = self.duration.unsignedLongLongValue; } } { 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 99e6e3bb1d63f7..dfdf2e691686f2 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 @@ -21506,7 +21506,7 @@ struct Type MessagePriorityEnum priority = static_cast(0); chip::BitMask messageControl = static_cast>(0); DataModel::Nullable startTime; - DataModel::Nullable duration; + DataModel::Nullable duration; chip::CharSpan messageText; Optional> responses; @@ -21522,7 +21522,7 @@ struct DecodableType MessagePriorityEnum priority = static_cast(0); chip::BitMask messageControl = static_cast>(0); DataModel::Nullable startTime; - DataModel::Nullable duration; + DataModel::Nullable duration; chip::CharSpan messageText; Optional> responses; @@ -21573,7 +21573,7 @@ struct Type MessagePriorityEnum priority = static_cast(0); chip::BitMask messageControl = static_cast>(0); DataModel::Nullable startTime; - DataModel::Nullable duration; + DataModel::Nullable duration; chip::CharSpan messageText; Optional> responses; @@ -21594,7 +21594,7 @@ struct DecodableType MessagePriorityEnum priority = static_cast(0); chip::BitMask messageControl = static_cast>(0); DataModel::Nullable startTime; - DataModel::Nullable duration; + DataModel::Nullable duration; chip::CharSpan messageText; Optional> responses; 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 3a7a4e981629b6..6191eb2aa3ec2d 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -6837,7 +6837,7 @@ class MessagesPresentMessagesRequest : public ClusterCommand AddArgument("Priority", 0, UINT8_MAX, &mRequest.priority); AddArgument("MessageControl", 0, UINT8_MAX, &mRequest.messageControl); AddArgument("StartTime", 0, UINT32_MAX, &mRequest.startTime); - AddArgument("Duration", 0, UINT16_MAX, &mRequest.duration); + AddArgument("Duration", 0, UINT64_MAX, &mRequest.duration); AddArgument("MessageText", &mRequest.messageText); AddArgument("Responses", &mComplex_Responses, "", Argument::kOptional); ClusterCommand::AddArguments(); 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 9a1389e416deb4..60843e78e103e7 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -81043,7 +81043,7 @@ class MessagesPresentMessagesRequest : public ClusterCommand { AddArgument("StartTime", 0, UINT32_MAX, &mRequest.startTime); #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - AddArgument("Duration", 0, UINT16_MAX, &mRequest.duration); + AddArgument("Duration", 0, UINT64_MAX, &mRequest.duration); #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL AddArgument("MessageText", &mRequest.messageText); @@ -81085,7 +81085,7 @@ class MessagesPresentMessagesRequest : public ClusterCommand { if (mRequest.duration.IsNull()) { params.duration = nil; } else { - params.duration = [NSNumber numberWithUnsignedShort:mRequest.duration.Value()]; + params.duration = [NSNumber numberWithUnsignedLongLong:mRequest.duration.Value()]; } #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL