DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* version bumps

Browse Source
This commit is contained in:
Scott Powell
2025-01-27 00:42:42 +11:00
parent 6c00653272
commit 9a9b4fca82
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/simple_repeater/main.cpp
View File

@@ -19,7 +19,7 @@
/* ------------------------------ Config -------------------------------- */ /* ------------------------------ Config -------------------------------- */
#define FIRMWARE_VER_TEXT "v1 (build: 24 Jan 2025)" #define FIRMWARE_VER_TEXT "v2 (build: 27 Jan 2025)"
#ifndef LORA_FREQ #ifndef LORA_FREQ
#define LORA_FREQ 915.0 #define LORA_FREQ 915.0

6
examples/simple_room_server/main.cpp
View File

@@ -19,7 +19,7 @@
/* ------------------------------ Config -------------------------------- */ /* ------------------------------ Config -------------------------------- */
#define FIRMWARE_VER_TEXT "v1 (build: 24 Jan 2025)" #define FIRMWARE_VER_TEXT "v2 (build: 27 Jan 2025)"
#ifndef LORA_FREQ #ifndef LORA_FREQ
#define LORA_FREQ 915.0 #define LORA_FREQ 915.0
@@ -489,15 +489,19 @@ public:
// check next Round-Robin client, and sync next new post // check next Round-Robin client, and sync next new post
auto client = &known_clients[next_client_idx]; auto client = &known_clients[next_client_idx];
if (client->pending_ack == 0 && client->last_activity != 0) { // not already waiting for ACK, AND not evicted if (client->pending_ack == 0 && client->last_activity != 0) { // not already waiting for ACK, AND not evicted
MESH_DEBUG_PRINTLN("loop - checking for client %02X", (uint32_t) client->id.pub_key[0]);
for (int k = 0, idx = next_post_idx; k < MAX_UNSYNCED_POSTS; k++) { for (int k = 0, idx = next_post_idx; k < MAX_UNSYNCED_POSTS; k++) {
if (posts[idx].post_timestamp > client->sync_since // is new post for this Client? if (posts[idx].post_timestamp > client->sync_since // is new post for this Client?
&& !posts[idx].author.matches(client->id)) { // don't push posts to the author && !posts[idx].author.matches(client->id)) { // don't push posts to the author
// push this post to Client, then wait for ACK // push this post to Client, then wait for ACK
pushPostToClient(client, posts[idx]); pushPostToClient(client, posts[idx]);
MESH_DEBUG_PRINTLN("loop - pushed to client %02X: %s", (uint32_t) client->id.pub_key[0], posts[idx].text);
break; break;
} }
idx = (idx + 1) % MAX_UNSYNCED_POSTS; // wrap to start of cyclic queue idx = (idx + 1) % MAX_UNSYNCED_POSTS; // wrap to start of cyclic queue
} }
} else {
MESH_DEBUG_PRINTLN("loop - skipping busy (or evicted) client %02X", (uint32_t) client->id.pub_key[0]);
} }
next_client_idx = (next_client_idx + 1) % num_clients; // round robin polling for each client next_client_idx = (next_client_idx + 1) % num_clients; // round robin polling for each client