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

* ver bumps

Browse Source 
* companion radio, USB: onSendTimeout() bug fix
This commit is contained in:
Scott Powell
2025-02-14 09:35:15 +11:00
parent b8d467fbab
commit a922d0711d
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/companion_radio/main.cpp
View File

@@ -396,7 +396,6 @@ protected:
} }
void onSendTimeout() override { void onSendTimeout() override {
Serial.println(" ERROR: timed out, no ACK.");
} }
public: public:

2
examples/simple_repeater/main.cpp
View File

@@ -19,7 +19,7 @@
/* ------------------------------ Config -------------------------------- */ /* ------------------------------ Config -------------------------------- */
#define FIRMWARE_VER_TEXT "v3 (build: 8 Feb 2025)" #define FIRMWARE_VER_TEXT "v4 (build: 14 Feb 2025)"
#ifndef LORA_FREQ #ifndef LORA_FREQ
#define LORA_FREQ 915.0 #define LORA_FREQ 915.0

2
examples/simple_room_server/main.cpp
View File

@@ -19,7 +19,7 @@
/* ------------------------------ Config -------------------------------- */ /* ------------------------------ Config -------------------------------- */
#define FIRMWARE_VER_TEXT "v4 (build: 8 Feb 2025)" #define FIRMWARE_VER_TEXT "v4 (build: 14 Feb 2025)"
#ifndef LORA_FREQ #ifndef LORA_FREQ
#define LORA_FREQ 915.0 #define LORA_FREQ 915.0

4
src/helpers/BaseChatMesh.cpp
View File

@@ -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); uint32_t t = _radio->getEstAirtimeFor(pkt->payload_len + pkt->path_len + 2);
if (recipient.out_path_len < 0) { if (recipient.out_path_len < 0) {
sendFlood(pkt); sendFlood(pkt);
txt_send_timeout = futureMillis(est_timeout = calcFloodTimeoutMillisFor(t)); est_timeout = calcFloodTimeoutMillisFor(t);
} else { } else {
sendDirect(pkt, recipient.out_path, recipient.out_path_len); 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 { } else {
return false; // failed return false; // failed