Skip to content

Peek & pop separately when pushing messages to BLE client #1902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
weebl2000 wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Peek & pop separately when pushing messages to BLE client #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
782118d
Peek & pop separately when pushing messages to BLE client
weebl2000 Mar 2, 2026
ef73ffe
>= out_len
weebl2000 Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions examples/companion_radio/MyMesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,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;
}
Expand Down Expand Up @@ -1228,11 +1246,13 @@ 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 ((out_len = peekOfflineQueue(out_frame)) > 0) {
if (_serial->writeFrame(out_frame, out_len) >= out_len) {
popOfflineQueue();
#ifdef DISPLAY_CLASS
if (_ui) _ui->msgRead(offline_queue_len);
if (_ui) _ui->msgRead(offline_queue_len);
#endif
}
} else {
out_frame[0] = RESP_CODE_NO_MORE_MESSAGES;
_serial->writeFrame(out_frame, 1);
Expand Down
2 changes: 2 additions & 0 deletions examples/companion_radio/MyMesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,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);
}
Expand Down