From a922d0711d3b45ae36adec120678a79e4576daf7 Mon Sep 17 00:00:00 2001 From: Scott Powell Date: Fri, 14 Feb 2025 09:35:15 +1100 Subject: [PATCH] * ver bumps * companion radio, USB: onSendTimeout() bug fix --- examples/companion_radio/main.cpp | 1 - examples/simple_repeater/main.cpp | 2 +- examples/simple_room_server/main.cpp | 2 +- src/helpers/BaseChatMesh.cpp | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/companion_radio/main.cpp b/examples/companion_radio/main.cpp index b91831eb..30c3c0fd 100644 --- a/examples/companion_radio/main.cpp +++ b/examples/companion_radio/main.cpp @@ -396,7 +396,6 @@ protected: } void onSendTimeout() override { - Serial.println(" ERROR: timed out, no ACK."); } public: diff --git a/examples/simple_repeater/main.cpp b/examples/simple_repeater/main.cpp index 23e5ad62..5a138484 100644 --- a/examples/simple_repeater/main.cpp +++ b/examples/simple_repeater/main.cpp @@ -19,7 +19,7 @@ /* ------------------------------ Config -------------------------------- */ -#define FIRMWARE_VER_TEXT "v3 (build: 8 Feb 2025)" +#define FIRMWARE_VER_TEXT "v4 (build: 14 Feb 2025)" #ifndef LORA_FREQ #define LORA_FREQ 915.0 diff --git a/examples/simple_room_server/main.cpp b/examples/simple_room_server/main.cpp index 5c35abfd..1eadda45 100644 --- a/examples/simple_room_server/main.cpp +++ b/examples/simple_room_server/main.cpp @@ -19,7 +19,7 @@ /* ------------------------------ Config -------------------------------- */ -#define FIRMWARE_VER_TEXT "v4 (build: 8 Feb 2025)" +#define FIRMWARE_VER_TEXT "v4 (build: 14 Feb 2025)" #ifndef LORA_FREQ #define LORA_FREQ 915.0 diff --git a/src/helpers/BaseChatMesh.cpp b/src/helpers/BaseChatMesh.cpp index cf61768c..51f1353f 100644 --- a/src/helpers/BaseChatMesh.cpp +++ b/src/helpers/BaseChatMesh.cpp @@ -270,10 +270,10 @@ bool BaseChatMesh::sendLogin(const ContactInfo& recipient, const char* password, uint32_t t = _radio->getEstAirtimeFor(pkt->payload_len + pkt->path_len + 2); if (recipient.out_path_len < 0) { sendFlood(pkt); - txt_send_timeout = futureMillis(est_timeout = calcFloodTimeoutMillisFor(t)); + est_timeout = calcFloodTimeoutMillisFor(t); } else { sendDirect(pkt, recipient.out_path, recipient.out_path_len); - txt_send_timeout = futureMillis(est_timeout = calcDirectTimeoutMillisFor(t, recipient.out_path_len)); + est_timeout = calcDirectTimeoutMillisFor(t, recipient.out_path_len); } } else { return false; // failed