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

* tidy and minor fix for offline queue deletion

Browse source
This commit is contained in:
Scott Powell 2025-09-22 15:01:28 +10:00
parent 28d673ee15
commit 52d5cc6068
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
examples/companion_radio/MyMesh.cpp
View file

@ -175,14 +175,17 @@ void MyMesh::updateContactFromFrame(ContactInfo &contact, uint32_t& last_mod, co
} }
} }
bool MyMesh::Frame::isChannelMsg() const {
return buf[0] == RESP_CODE_CHANNEL_MSG_RECV || buf[0] == RESP_CODE_CHANNEL_MSG_RECV_V3;
}
void MyMesh::addToOfflineQueue(const uint8_t frame[], int len) { void MyMesh::addToOfflineQueue(const uint8_t frame[], int len) {
if (offline_queue_len >= OFFLINE_QUEUE_SIZE) { if (offline_queue_len >= OFFLINE_QUEUE_SIZE) {
MESH_DEBUG_PRINTLN("WARN: offline_queue is full!"); MESH_DEBUG_PRINTLN("WARN: offline_queue is full!");
int pos = 0; int pos = 0;
while (pos < offline_queue_len) { while (pos < offline_queue_len) {
if ((offline_queue[pos].buf[0] == RESP_CODE_CHANNEL_MSG_RECV) || if (offline_queue[pos].isChannelMsg()) {
offline_queue[pos].buf[0] == RESP_CODE_CHANNEL_MSG_RECV_V3) { for (int i = pos; i < offline_queue_len - 1; i++) { // delete oldest channel msg from queue
for (int i = pos; i < offline_queue_len; i++) { // delete oldest channel msg from queue
offline_queue[i] = offline_queue[i + 1]; offline_queue[i] = offline_queue[i + 1];
} }
MESH_DEBUG_PRINTLN("INFO: removed oldest channel message from queue."); MESH_DEBUG_PRINTLN("INFO: removed oldest channel message from queue.");

2
examples/companion_radio/MyMesh.h
View file

@ -198,6 +198,8 @@ private:
struct Frame { struct Frame {
uint8_t len; uint8_t len;
uint8_t buf[MAX_FRAME_SIZE]; uint8_t buf[MAX_FRAME_SIZE];
bool isChannelMsg() const;
}; };
int offline_queue_len; int offline_queue_len;
Frame offline_queue[OFFLINE_QUEUE_SIZE]; Frame offline_queue[OFFLINE_QUEUE_SIZE];