From 7888982c708e3224d9adaa7218ba1f6575c61f12 Mon Sep 17 00:00:00 2001 From: Wessel Nieboer Date: Mon, 2 Mar 2026 23:19:36 +0100 Subject: [PATCH 1/2] Peek & pop separately when pushing messages to BLE client I've noticed very often that the first few messages can get lost after reconnecting with BLE. This should fix that. --- examples/companion_radio/MyMesh.cpp | 26 +++++++++++++++++++++++--- examples/companion_radio/MyMesh.h | 2 ++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp index 755c56d14c0..fe0286e9860 100644 --- a/examples/companion_radio/MyMesh.cpp +++ b/examples/companion_radio/MyMesh.cpp @@ -259,6 +259,24 @@ int MyMesh::getFromOfflineQueue(uint8_t frame[]) { return 0; // queue is empty } +int MyMesh::peekOfflineQueue(uint8_t frame[]) { + if (offline_queue_len > 0) { + size_t len = offline_queue[0].len; + memcpy(frame, offline_queue[0].buf, len); + return len; + } + return 0; +} + +void MyMesh::popOfflineQueue() { + if (offline_queue_len > 0) { + offline_queue_len--; + for (int i = 0; i < offline_queue_len; i++) { + offline_queue[i] = offline_queue[i + 1]; + } + } +} + float MyMesh::getAirtimeBudgetFactor() const { return _prefs.airtime_factor; } @@ -1416,9 +1434,11 @@ void MyMesh::handleCmdFrame(size_t len) { } } else if (cmd_frame[0] == CMD_SYNC_NEXT_MESSAGE) { int out_len; - if ((out_len = getFromOfflineQueue(out_frame)) > 0) { - _serial->writeFrame(out_frame, out_len); - if (_listener) _listener->onQueueSizeChanged(offline_queue_len); + if ((out_len = peekOfflineQueue(out_frame)) > 0) { + if (_serial->writeFrame(out_frame, out_len) > 0) { + popOfflineQueue(); + if (_listener) _listener->onQueueSizeChanged(offline_queue_len); + } } else { out_frame[0] = RESP_CODE_NO_MORE_MESSAGES; _serial->writeFrame(out_frame, 1); diff --git a/examples/companion_radio/MyMesh.h b/examples/companion_radio/MyMesh.h index 944790df922..180e81b4aa2 100644 --- a/examples/companion_radio/MyMesh.h +++ b/examples/companion_radio/MyMesh.h @@ -223,6 +223,8 @@ class MyMesh : public BaseChatMesh, public DataStoreHost { void updateContactFromFrame(ContactInfo &contact, uint32_t& last_mod, const uint8_t *frame, int len); void addToOfflineQueue(const uint8_t frame[], int len); int getFromOfflineQueue(uint8_t frame[]); + int peekOfflineQueue(uint8_t frame[]); + void popOfflineQueue(); int getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_buf[]) override { return _store->getBlobByKey(key, key_len, dest_buf); } From 3290ed29ab3a0a8d18a8cd76f27b3434ff8ef3cd Mon Sep 17 00:00:00 2001 From: Wessel Nieboer Date: Wed, 4 Mar 2026 21:07:53 +0100 Subject: [PATCH 2/2] >= out_len It shouldn't ever happen that it's less so why not --- examples/companion_radio/MyMesh.cpp | 2 +- src/helpers/MultiSerialInterface.h | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp index fe0286e9860..74319fe6d54 100644 --- a/examples/companion_radio/MyMesh.cpp +++ b/examples/companion_radio/MyMesh.cpp @@ -1435,7 +1435,7 @@ void MyMesh::handleCmdFrame(size_t len) { } else if (cmd_frame[0] == CMD_SYNC_NEXT_MESSAGE) { int out_len; if ((out_len = peekOfflineQueue(out_frame)) > 0) { - if (_serial->writeFrame(out_frame, out_len) > 0) { + if (_serial->writeFrame(out_frame, out_len) >= out_len) { popOfflineQueue(); if (_listener) _listener->onQueueSizeChanged(offline_queue_len); } diff --git a/src/helpers/MultiSerialInterface.h b/src/helpers/MultiSerialInterface.h index f7742b24c38..a3d9a5fbc81 100644 --- a/src/helpers/MultiSerialInterface.h +++ b/src/helpers/MultiSerialInterface.h @@ -163,18 +163,22 @@ class MultiSerialInterface : public BaseSerialInterface { return 0; } - // write frame to all enabled interfaces + // write frame to all enabled interfaces that have a client connected + // (an idle interface with no client must not count as a failed write) + bool anyWritten = false; bool allSuccessful = true; for(auto iface : _interfaces){ - if(iface.instance && iface.instance->isEnabled()){ - if(iface.instance->writeFrame(src, len) != len){ + if(iface.instance && iface.instance->isEnabled() && iface.instance->isConnected()){ + if(iface.instance->writeFrame(src, len) == len){ + anyWritten = true; + } else { allSuccessful = false; } } } - // report success if all writes completed successfully - return allSuccessful ? len : 0; + // report success if all connected interfaces accepted the frame + return (anyWritten && allSuccessful) ? len : 0; } size_t checkRecvFrame(uint8_t dest[]) override {