Skip to content

Commit 7ba98fb

Browse files
hastyhasty
authored
[Messages] Change message duration to uint64 (#32248)
* Change message duration to uint64 * Fixes to Java build * Missed a HandlePresentMessagesRequest signature
1 parent 3903f6c commit 7ba98fb

File tree

27 files changed

+59
-60
lines changed

27 files changed

+59
-60
lines changed

‎data_model/clusters/Messages.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Davis, CA 95616, USA
216216
<quality nullable="true"/>
217217
<mandatoryConform/>
218218
</field>
219-
<field id="4" name="Duration" type="uint16" default="0">
219+
<field id="4" name="Duration" type="uint64" default="0">
220220
<access fabricSensitive="true"/>
221221
<quality nullable="true"/>
222222
<mandatoryConform/>

‎examples/tv-app/android/include/messages/MessagesManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ using namespace chip::app::Clusters::Messages;
2525
void MessagesManager::HandlePresentMessagesRequest(
2626
const chip::ByteSpan & messageId, const MessagePriorityEnum & priority,
2727
const chip::BitMask<MessageControlBitmap> & messageControl, const chip::app::DataModel::Nullable<uint32_t> & startTime,
28-
const chip::app::DataModel::Nullable<uint16_t> & duration, const chip::CharSpan & messageText,
28+
const chip::app::DataModel::Nullable<uint64_t> & duration, const chip::CharSpan & messageText,
2929
const chip::Optional<chip::app::DataModel::DecodableList<MessageResponseOption>> & responses)
3030
{
3131
// TODO: Present Message

‎examples/tv-app/android/include/messages/MessagesManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class MessagesManager : public chip::app::Clusters::Messages::Delegate
2727
void HandlePresentMessagesRequest(
2828
const chip::ByteSpan & messageId, const chip::app::Clusters::Messages::MessagePriorityEnum & priority,
2929
const chip::BitMask<chip::app::Clusters::Messages::MessageControlBitmap> & messageControl,
30-
const chip::app::DataModel::Nullable<uint32_t> & startTime, const chip::app::DataModel::Nullable<uint16_t> & duration,
30+
const chip::app::DataModel::Nullable<uint32_t> & startTime, const chip::app::DataModel::Nullable<uint64_t> & duration,
3131
const chip::CharSpan & messageText,
3232
const chip::Optional<chip::app::DataModel::DecodableList<
3333
chip::app::Clusters::Messages::Structs::MessageResponseOptionStruct::DecodableType>> & responses) override;

‎examples/tv-app/android/java/MessagesManager.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ CHIP_ERROR MessagesManager::HandleGetMessages(AttributeValueEncoder & aEncoder)
183183
}
184184

185185
jfieldID durationField = env->GetFieldID(messageClass, "duration", "I");
186-
jint jduration = env->GetIntField(messageObject, durationField);
186+
jlong jduration = env->GetLongField(messageObject, durationField);
187187
if (jduration >= 0)
188188
{
189-
message.duration = DataModel::Nullable<uint16_t>(static_cast<uint16_t>(jduration));
189+
message.duration = DataModel::Nullable<uint64_t>(static_cast<uint64_t>(jduration));
190190
}
191191

192192
jfieldID getResponseOptionsField =
@@ -301,7 +301,7 @@ CHIP_ERROR MessagesManager::HandleGetActiveMessageIds(AttributeValueEncoder & aE
301301

302302
CHIP_ERROR MessagesManager::HandlePresentMessagesRequest(
303303
const ByteSpan & messageId, const MessagePriorityEnum & priority, const BitMask<MessageControlBitmap> & messageControl,
304-
const DataModel::Nullable<uint32_t> & startTime, const DataModel::Nullable<uint16_t> & duration, const CharSpan & messageText,
304+
const DataModel::Nullable<uint32_t> & startTime, const DataModel::Nullable<uint64_t> & duration, const CharSpan & messageText,
305305
const Optional<DataModel::DecodableList<MessageResponseOption>> & responses)
306306
{
307307
DeviceLayer::StackUnlock unlock;
@@ -336,11 +336,11 @@ CHIP_ERROR MessagesManager::HandlePresentMessagesRequest(
336336
return CHIP_ERROR_INTERNAL;
337337
}
338338

339-
jint jcontrol = static_cast<jint>(messageControl.Raw());
340-
jint jduration = -1;
339+
jint jcontrol = static_cast<jint>(messageControl.Raw());
340+
jlong jduration = -1;
341341
if (!duration.IsNull())
342342
{
343-
jduration = static_cast<jint>(duration.Value());
343+
jduration = static_cast<jlong>(duration.Value());
344344
}
345345
jlong jstartTime = -1;
346346
if (!startTime.IsNull())

‎examples/tv-app/android/java/MessagesManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class MessagesManager : public chip::app::Clusters::Messages::Delegate
3535
CHIP_ERROR HandlePresentMessagesRequest(
3636
const chip::ByteSpan & messageId, const chip::app::Clusters::Messages::MessagePriorityEnum & priority,
3737
const chip::BitMask<chip::app::Clusters::Messages::MessageControlBitmap> & messageControl,
38-
const chip::app::DataModel::Nullable<uint32_t> & startTime, const chip::app::DataModel::Nullable<uint16_t> & duration,
38+
const chip::app::DataModel::Nullable<uint32_t> & startTime, const chip::app::DataModel::Nullable<uint64_t> & duration,
3939
const chip::CharSpan & messageText,
4040
const chip::Optional<
4141
chip::app::DataModel::DecodableList<chip::app::Clusters::Messages::Structs::MessageResponseOptionStruct::Type>> &

‎examples/tv-app/android/java/src/com/matter/tv/server/tvapp/Message.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class Message {
2323
public int priority;
2424
public int messageControl;
2525
public long startTime;
26-
public int duration;
26+
public long duration;
2727
public String messageText;
2828
public MessageResponseOption responseOptions[];
2929

@@ -32,7 +32,7 @@ public Message(
3232
int priority,
3333
int messageControl,
3434
long startTime,
35-
int duration,
35+
long duration,
3636
String messageText,
3737
MessageResponseOption responseOptions[]) {
3838
this.messageId = messageId;

‎examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MessagesManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ boolean presentMessages(
2828
int priority,
2929
int messageControl,
3030
long startTime,
31-
int duration,
31+
long duration,
3232
String messageText,
3333
HashMap<Long, String> responseOptions);
3434

‎examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MessagesManagerStub.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public boolean presentMessages(
5252
int priority,
5353
int messageControl,
5454
long startTime,
55-
int duration,
55+
long duration,
5656
String messageText,
5757
HashMap<Long, String> responseOptions) {
5858
Log.d(

‎examples/tv-app/tv-common/clusters/messages/MessagesManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ using MessageResponseOption = chip::app::Clusters::Messages::Structs::MessageRes
3030
// Commands
3131
CHIP_ERROR MessagesManager::HandlePresentMessagesRequest(
3232
const ByteSpan & messageId, const MessagePriorityEnum & priority, const BitMask<MessageControlBitmap> & messageControl,
33-
const DataModel::Nullable<uint32_t> & startTime, const DataModel::Nullable<uint16_t> & duration, const CharSpan & messageText,
33+
const DataModel::Nullable<uint32_t> & startTime, const DataModel::Nullable<uint64_t> & duration, const CharSpan & messageText,
3434
const Optional<DataModel::DecodableList<MessageResponseOption>> & responses)
3535
{
3636
ChipLogProgress(Zcl, "HandlePresentMessagesRequest message:%s", std::string(messageText.data(), messageText.size()).c_str());

‎examples/tv-app/tv-common/clusters/messages/MessagesManager.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ struct CachedMessage
6464
CachedMessage(const chip::ByteSpan & messageId, const chip::app::Clusters::Messages::MessagePriorityEnum & priority,
6565
const chip::BitMask<chip::app::Clusters::Messages::MessageControlBitmap> & messageControl,
6666
const chip::app::DataModel::Nullable<uint32_t> & startTime,
67-
const chip::app::DataModel::Nullable<uint16_t> & duration, std::string messageText) :
67+
const chip::app::DataModel::Nullable<uint64_t> & duration, std::string messageText) :
6868
mPriority(priority),
6969
mMessageControl(messageControl), mStartTime(startTime), mDuration(duration), mMessageText(messageText)
7070
{
@@ -110,7 +110,7 @@ struct CachedMessage
110110
const chip::app::Clusters::Messages::MessagePriorityEnum mPriority;
111111
const chip::BitMask<chip::app::Clusters::Messages::MessageControlBitmap> mMessageControl;
112112
const chip::app::DataModel::Nullable<uint32_t> mStartTime;
113-
const chip::app::DataModel::Nullable<uint16_t> mDuration;
113+
const chip::app::DataModel::Nullable<uint64_t> mDuration;
114114

115115
std::string mMessageText;
116116
uint8_t mMessageIdBuffer[chip::app::Clusters::Messages::kMessageIdLength];
@@ -126,7 +126,7 @@ class MessagesManager : public chip::app::Clusters::Messages::Delegate
126126
CHIP_ERROR HandlePresentMessagesRequest(
127127
const chip::ByteSpan & messageId, const chip::app::Clusters::Messages::MessagePriorityEnum & priority,
128128
const chip::BitMask<chip::app::Clusters::Messages::MessageControlBitmap> & messageControl,
129-
const chip::app::DataModel::Nullable<uint32_t> & startTime, const chip::app::DataModel::Nullable<uint16_t> & duration,
129+
const chip::app::DataModel::Nullable<uint32_t> & startTime, const chip::app::DataModel::Nullable<uint64_t> & duration,
130130
const chip::CharSpan & messageText,
131131
const chip::Optional<
132132
chip::app::DataModel::DecodableList<chip::app::Clusters::Messages::Structs::MessageResponseOptionStruct::Type>> &

‎examples/tv-app/tv-common/tv-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -2067,7 +2067,7 @@ provisional cluster Messages = 151 {
20672067
MessagePriorityEnum priority = 1;
20682068
MessageControlBitmap messageControl = 2;
20692069
nullable epoch_s startTime = 3;
2070-
nullable int16u duration = 4;
2070+
nullable int64u duration = 4;
20712071
char_string<256> messageText = 5;
20722072
optional MessageResponseOptionStruct responses[] = 6;
20732073
}
@@ -2101,7 +2101,7 @@ provisional cluster Messages = 151 {
21012101
MessagePriorityEnum priority = 1;
21022102
MessageControlBitmap messageControl = 2;
21032103
nullable epoch_s startTime = 3;
2104-
nullable int16u duration = 4;
2104+
nullable int64u duration = 4;
21052105
char_string<256> messageText = 5;
21062106
optional MessageResponseOptionStruct responses[] = 6;
21072107
}

‎examples/tv-casting-app/tv-casting-common/tv-casting-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1545,7 +1545,7 @@ provisional cluster Messages = 151 {
15451545
MessagePriorityEnum priority = 1;
15461546
MessageControlBitmap messageControl = 2;
15471547
nullable epoch_s startTime = 3;
1548-
nullable int16u duration = 4;
1548+
nullable int64u duration = 4;
15491549
char_string<256> messageText = 5;
15501550
optional MessageResponseOptionStruct responses[] = 6;
15511551
}
@@ -1579,7 +1579,7 @@ provisional cluster Messages = 151 {
15791579
MessagePriorityEnum priority = 1;
15801580
MessageControlBitmap messageControl = 2;
15811581
nullable epoch_s startTime = 3;
1582-
nullable int16u duration = 4;
1582+
nullable int64u duration = 4;
15831583
char_string<256> messageText = 5;
15841584
optional MessageResponseOptionStruct responses[] = 6;
15851585
}

‎src/app/clusters/messages-server/messages-delegate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Delegate
4242
virtual CHIP_ERROR HandlePresentMessagesRequest(
4343
const ByteSpan & messageId, const MessagePriorityEnum & priority,
4444
const chip::BitMask<MessageControlBitmap> & messageControl, const DataModel::Nullable<uint32_t> & startTime,
45-
const DataModel::Nullable<uint16_t> & duration, const CharSpan & messageText,
45+
const DataModel::Nullable<uint64_t> & duration, const CharSpan & messageText,
4646
const chip::Optional<DataModel::DecodableList<chip::app::Clusters::Messages::Structs::MessageResponseOptionStruct::Type>> &
4747
responses) = 0;
4848
virtual CHIP_ERROR HandleCancelMessagesRequest(const DataModel::DecodableList<chip::ByteSpan> & messageIds) = 0;

‎src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ limitations under the License.
5858
<item fieldId="1" name="Priority" type="MessagePriorityEnum" optional="false"/>
5959
<item fieldId="2" name="MessageControl" type="MessageControlBitmap" default="0" optional="false"/>
6060
<item fieldId="3" name="StartTime" type="epoch_s" default="0" optional="false" isNullable="true"/>
61-
<item fieldId="4" name="Duration" type="int16u" default="0" optional="false" isNullable="true"/>
61+
<item fieldId="4" name="Duration" type="int64u" default="0" optional="false" isNullable="true"/>
6262
<item fieldId="5" name="MessageText" type="char_string" length="256" optional="false"/>
6363
<item fieldId="6" name="Responses" type="MessageResponseOptionStruct" array="true" length="4" optional="true"/>
6464
</struct>
@@ -88,7 +88,7 @@ limitations under the License.
8888
<arg name="Priority" type="MessagePriorityEnum" optional="false"/>
8989
<arg name="MessageControl" type="MessageControlBitmap" default="0" optional="false"/>
9090
<arg name="StartTime" type="epoch_s" default="0" optional="false" isNullable="true"/>
91-
<arg name="Duration" type="int16u" default="0" optional="false" isNullable="true"/>
91+
<arg name="Duration" type="int64u" default="0" optional="false" isNullable="true"/>
9292
<arg name="MessageText" type="char_string" length="256" optional="false"/>
9393
<arg name="Responses" type="MessageResponseOptionStruct" array="true" length="4" optional="true"/>
9494
</command>

‎src/controller/data_model/controller-clusters.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -4539,7 +4539,7 @@ provisional cluster Messages = 151 {
45394539
MessagePriorityEnum priority = 1;
45404540
MessageControlBitmap messageControl = 2;
45414541
nullable epoch_s startTime = 3;
4542-
nullable int16u duration = 4;
4542+
nullable int64u duration = 4;
45434543
char_string<256> messageText = 5;
45444544
optional MessageResponseOptionStruct responses[] = 6;
45454545
}
@@ -4573,7 +4573,7 @@ provisional cluster Messages = 151 {
45734573
MessagePriorityEnum priority = 1;
45744574
MessageControlBitmap messageControl = 2;
45754575
nullable epoch_s startTime = 3;
4576-
nullable int16u duration = 4;
4576+
nullable int64u duration = 4;
45774577
char_string<256> messageText = 5;
45784578
optional MessageResponseOptionStruct responses[] = 6;
45794579
}

‎src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29906,11 +29906,11 @@ public long initWithDevice(long devicePtr, int endpointId) {
2990629906
return 0L;
2990729907
}
2990829908

29909-
public void presentMessagesRequest(DefaultClusterCallback callback, byte[] messageID, Integer priority, Integer messageControl, @Nullable Long startTime, @Nullable Integer duration, String messageText, Optional<ArrayList<ChipStructs.MessagesClusterMessageResponseOptionStruct>> responses) {
29909+
public void presentMessagesRequest(DefaultClusterCallback callback, byte[] messageID, Integer priority, Integer messageControl, @Nullable Long startTime, @Nullable Long duration, String messageText, Optional<ArrayList<ChipStructs.MessagesClusterMessageResponseOptionStruct>> responses) {
2991029910
presentMessagesRequest(callback, messageID, priority, messageControl, startTime, duration, messageText, responses, 0);
2991129911
}
2991229912

29913-
public void presentMessagesRequest(DefaultClusterCallback callback, byte[] messageID, Integer priority, Integer messageControl, @Nullable Long startTime, @Nullable Integer duration, String messageText, Optional<ArrayList<ChipStructs.MessagesClusterMessageResponseOptionStruct>> responses, int timedInvokeTimeoutMs) {
29913+
public void presentMessagesRequest(DefaultClusterCallback callback, byte[] messageID, Integer priority, Integer messageControl, @Nullable Long startTime, @Nullable Long duration, String messageText, Optional<ArrayList<ChipStructs.MessagesClusterMessageResponseOptionStruct>> responses, int timedInvokeTimeoutMs) {
2991429914
final long commandId = 0L;
2991529915

2991629916
ArrayList<StructElement> elements = new ArrayList<>();

‎src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -7130,7 +7130,7 @@ public static class MessagesClusterMessageStruct {
71307130
public Integer priority;
71317131
public Integer messageControl;
71327132
public @Nullable Long startTime;
7133-
public @Nullable Integer duration;
7133+
public @Nullable Long duration;
71347134
public String messageText;
71357135
public Optional<ArrayList<ChipStructs.MessagesClusterMessageResponseOptionStruct>> responses;
71367136
private static final long MESSAGE_I_D_ID = 0L;
@@ -7146,7 +7146,7 @@ public MessagesClusterMessageStruct(
71467146
Integer priority,
71477147
Integer messageControl,
71487148
@Nullable Long startTime,
7149-
@Nullable Integer duration,
7149+
@Nullable Long duration,
71507150
String messageText,
71517151
Optional<ArrayList<ChipStructs.MessagesClusterMessageResponseOptionStruct>> responses
71527152
) {
@@ -7180,7 +7180,7 @@ public static MessagesClusterMessageStruct decodeTlv(BaseTLVType tlvValue) {
71807180
Integer priority = null;
71817181
Integer messageControl = null;
71827182
@Nullable Long startTime = null;
7183-
@Nullable Integer duration = null;
7183+
@Nullable Long duration = null;
71847184
String messageText = null;
71857185
Optional<ArrayList<ChipStructs.MessagesClusterMessageResponseOptionStruct>> responses = Optional.empty();
71867186
for (StructElement element: ((StructType)tlvValue).value()) {
@@ -7207,7 +7207,7 @@ public static MessagesClusterMessageStruct decodeTlv(BaseTLVType tlvValue) {
72077207
} else if (element.contextTagNum() == DURATION_ID) {
72087208
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
72097209
UIntType castingValue = element.value(UIntType.class);
7210-
duration = castingValue.value(Integer.class);
7210+
duration = castingValue.value(Long.class);
72117211
}
72127212
} else if (element.contextTagNum() == MESSAGE_TEXT_ID) {
72137213
if (element.value(BaseTLVType.class).type() == TLVType.String) {

‎src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24325,7 +24325,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
2432524325
CommandParameterInfo messagespresentMessagesRequeststartTimeCommandParameterInfo = new CommandParameterInfo("startTime", Long.class, Long.class);
2432624326
messagespresentMessagesRequestCommandParams.put("startTime",messagespresentMessagesRequeststartTimeCommandParameterInfo);
2432724327

24328-
CommandParameterInfo messagespresentMessagesRequestdurationCommandParameterInfo = new CommandParameterInfo("duration", Integer.class, Integer.class);
24328+
CommandParameterInfo messagespresentMessagesRequestdurationCommandParameterInfo = new CommandParameterInfo("duration", Long.class, Long.class);
2432924329
messagespresentMessagesRequestCommandParams.put("duration",messagespresentMessagesRequestdurationCommandParameterInfo);
2433024330

2433124331
CommandParameterInfo messagespresentMessagesRequestmessageTextCommandParameterInfo = new CommandParameterInfo("messageText", String.class, String.class);
@@ -24343,7 +24343,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
2434324343
commandArguments.get("messageControl")
2434424344
, (Long)
2434524345
commandArguments.get("startTime")
24346-
, (Integer)
24346+
, (Long)
2434724347
commandArguments.get("duration")
2434824348
, (String)
2434924349
commandArguments.get("messageText")

‎src/controller/java/generated/java/chip/devicecontroller/cluster/structs/MessagesClusterMessageStruct.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class MessagesClusterMessageStruct(
2929
val priority: UInt,
3030
val messageControl: UInt,
3131
val startTime: ULong?,
32-
val duration: UInt?,
32+
val duration: ULong?,
3333
val messageText: String,
3434
val responses: Optional<List<MessagesClusterMessageResponseOptionStruct>>
3535
) {
@@ -97,7 +97,7 @@ class MessagesClusterMessageStruct(
9797
}
9898
val duration =
9999
if (!tlvReader.isNull()) {
100-
tlvReader.getUInt(ContextSpecificTag(TAG_DURATION))
100+
tlvReader.getULong(ContextSpecificTag(TAG_DURATION))
101101
} else {
102102
tlvReader.getNull(ContextSpecificTag(TAG_DURATION))
103103
null

‎src/controller/java/generated/java/matter/controller/cluster/clusters/MessagesCluster.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class MessagesCluster(private val controller: MatterController, private val endp
106106
priority: UByte,
107107
messageControl: UByte,
108108
startTime: UInt?,
109-
duration: UShort?,
109+
duration: ULong?,
110110
messageText: String,
111111
responses: List<MessagesClusterMessageResponseOptionStruct>?,
112112
timedInvokeTimeout: Duration? = null

‎src/controller/java/generated/java/matter/controller/cluster/structs/MessagesClusterMessageStruct.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class MessagesClusterMessageStruct(
2929
val priority: UByte,
3030
val messageControl: UByte,
3131
val startTime: UInt?,
32-
val duration: UShort?,
32+
val duration: ULong?,
3333
val messageText: String,
3434
val responses: Optional<List<MessagesClusterMessageResponseOptionStruct>>
3535
) {
@@ -97,7 +97,7 @@ class MessagesClusterMessageStruct(
9797
}
9898
val duration =
9999
if (!tlvReader.isNull()) {
100-
tlvReader.getUShort(ContextSpecificTag(TAG_DURATION))
100+
tlvReader.getULong(ContextSpecificTag(TAG_DURATION))
101101
} else {
102102
tlvReader.getNull(ContextSpecificTag(TAG_DURATION))
103103
null

0 commit comments

Comments
 (0)