meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

* refactored BaseChatMesh::sendMessage(), added timestamp param

Browse source
This commit is contained in:
Scott Powell 2025-01-29 02:11:46 +11:00
parent fe306a311e
commit e53f0d0725
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/companion_radio/main.cpp
View file

@ -378,13 +378,15 @@ public:
} else if (cmd_frame[0] == CMD_SEND_TXT_MSG && len >= 9) {
int i = 1;
uint8_t attempt_and_flags = cmd_frame[i++];
uint32_t msg_timestamp;
memcpy(&msg_timestamp, &cmd_frame[i], 4); i += 4;
uint8_t* pub_key_prefix = &cmd_frame[i]; i += 6;
ContactInfo* recipient = lookupContactByPubKey(pub_key_prefix, 6);
if (recipient && (attempt_and_flags >> 2) == TXT_TYPE_PLAIN) {
char *text = (char *) &cmd_frame[i];
int tlen = len - i;
text[tlen] = 0; // ensure null
int result = sendMessage(*recipient, attempt_and_flags, text, expected_ack_crc);
int result = sendMessage(*recipient, msg_timestamp, attempt_and_flags, text, expected_ack_crc);
// TODO: add expected ACK to table
if (result == MSG_SEND_FAILED) {
writeErrFrame();

2
examples/simple_secure_chat/main.cpp
View file

@ -276,7 +276,7 @@ public:
if (memcmp(command, "send ", 5) == 0) {
if (curr_recipient) {
const char *text = &command[5];
int result = sendMessage(*curr_recipient, 0, text, expected_ack_crc);
int result = sendMessage(*curr_recipient, getRTCClock()->getCurrentTime(), 0, text, expected_ack_crc);
if (result == MSG_SEND_FAILED) {
Serial.println(" ERROR: unable to send.");
} else {