From ef95462345ae48e2a75d6f51f23aee2ca5eb43ab Mon Sep 17 00:00:00 2001 From: Scott Powell Date: Mon, 17 Feb 2025 10:56:41 +1100 Subject: [PATCH] * repeater, room server and terminal chat: default to rxdelay off --- examples/simple_repeater/main.cpp | 6 +++--- examples/simple_room_server/main.cpp | 6 +++--- examples/simple_secure_chat/main.cpp | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/simple_repeater/main.cpp b/examples/simple_repeater/main.cpp index 5a138484..d670b55a 100644 --- a/examples/simple_repeater/main.cpp +++ b/examples/simple_repeater/main.cpp @@ -19,7 +19,7 @@ /* ------------------------------ Config -------------------------------- */ -#define FIRMWARE_VER_TEXT "v4 (build: 14 Feb 2025)" +#define FIRMWARE_VER_TEXT "v4 (build: 17 Feb 2025)" #ifndef LORA_FREQ #define LORA_FREQ 915.0 @@ -423,8 +423,8 @@ public: // defaults memset(&_prefs, 0, sizeof(_prefs)); _prefs.airtime_factor = 1.0; // one half - _prefs.rx_delay_base = 10.0; - _prefs.tx_delay_factor = 0.25f; + _prefs.rx_delay_base = 0.0f; // turn off by default, was 10.0; + _prefs.tx_delay_factor = 0.5f; // was 0.25f strncpy(_prefs.node_name, ADVERT_NAME, sizeof(_prefs.node_name)-1); _prefs.node_name[sizeof(_prefs.node_name)-1] = 0; // truncate if necessary _prefs.node_lat = ADVERT_LAT; diff --git a/examples/simple_room_server/main.cpp b/examples/simple_room_server/main.cpp index 28538726..118da9e4 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: 14 Feb 2025)" +#define FIRMWARE_VER_TEXT "v4 (build: 17 Feb 2025)" #ifndef LORA_FREQ #define LORA_FREQ 915.0 @@ -527,8 +527,8 @@ public: // defaults memset(&_prefs, 0, sizeof(_prefs)); _prefs.airtime_factor = 1.0; // one half - _prefs.rx_delay_base = 10.0; - _prefs.tx_delay_factor = 0.25f; + _prefs.rx_delay_base = 0.0f; // off by default, was 10.0 + _prefs.tx_delay_factor = 0.5f; // was 0.25f; strncpy(_prefs.node_name, ADVERT_NAME, sizeof(_prefs.node_name)-1); _prefs.node_name[sizeof(_prefs.node_name)-1] = 0; // truncate if necessary _prefs.node_lat = ADVERT_LAT; diff --git a/examples/simple_secure_chat/main.cpp b/examples/simple_secure_chat/main.cpp index fa3e104f..7d589828 100644 --- a/examples/simple_secure_chat/main.cpp +++ b/examples/simple_secure_chat/main.cpp @@ -213,6 +213,10 @@ protected: return _prefs.airtime_factor; } + int calcRxDelay(float score, uint32_t air_time) const override { + return 0; // disable rxdelay + } + void onDiscoveredContact(ContactInfo& contact, bool is_new) override { // TODO: if not in favs, prompt to add as fav(?)