From 8947b636fcaf3ade402cc3ff70ff977da8a299ba Mon Sep 17 00:00:00 2001 From: DeFiDude <59237470+DeFiDude@users.noreply.github.com> Date: Sun, 8 Mar 2026 03:45:33 -0600 Subject: [PATCH] Fix LoRa presets: true max range BW 62.5kHz/22dBm, shift balanced and fast down MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Long Range: SF12, 62.5 kHz, CR 4/8, 22 dBm (~37 bps) Balanced: SF9, 125 kHz, CR 4/5, 17 dBm (~1.8 Kbps) Fast: SF7, 250 kHz, CR 4/5, 14 dBm (~11 Kbps) Previous Long Range used 125 kHz (3rd highest BW) and 17 dBm — not actually max range. SX1262 supports 62.5 kHz BW and 22 dBm TX power. --- src/config/BoardConfig.h | 4 ++-- src/ui/screens/LvSettingsScreen.cpp | 6 +++--- src/ui/screens/SettingsScreen.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/config/BoardConfig.h b/src/config/BoardConfig.h index f99f2f1..7fcbaa6 100644 --- a/src/config/BoardConfig.h +++ b/src/config/BoardConfig.h @@ -22,10 +22,10 @@ // TCXO voltage: 1.8V for T-Deck Plus integrated SX1262 (Ratputer Cap LoRa uses 3.0V/0x06) #define LORA_TCXO_VOLTAGE 0x02 // MODE_TCXO_1_8V_6X #define LORA_DEFAULT_FREQ 915000000 -#define LORA_DEFAULT_BW 250000 // Balanced preset +#define LORA_DEFAULT_BW 125000 // Balanced preset #define LORA_DEFAULT_SF 9 #define LORA_DEFAULT_CR 5 -#define LORA_DEFAULT_TX_POWER 14 // Balanced preset +#define LORA_DEFAULT_TX_POWER 17 // Balanced preset #define LORA_DEFAULT_PREAMBLE 18 // --- Shared SPI Bus (display + LoRa + SD) --- diff --git a/src/ui/screens/LvSettingsScreen.cpp b/src/ui/screens/LvSettingsScreen.cpp index f90c866..a4be9df 100644 --- a/src/ui/screens/LvSettingsScreen.cpp +++ b/src/ui/screens/LvSettingsScreen.cpp @@ -23,9 +23,9 @@ struct RadioPresetLv { uint8_t sf; uint32_t bw; uint8_t cr; int8_t txPower; long preamble; }; static const RadioPresetLv LV_PRESETS[] = { - {"Balanced", 9, 250000, 5, 14, 18}, - {"Long Range", 12, 125000, 8, 17, 18}, - {"Fast", 7, 500000, 5, 10, 18}, + {"Balanced", 9, 125000, 5, 17, 18}, + {"Long Range", 12, 62500, 8, 22, 18}, + {"Fast", 7, 250000, 5, 14, 18}, }; static constexpr int LV_NUM_PRESETS = 3; diff --git a/src/ui/screens/SettingsScreen.cpp b/src/ui/screens/SettingsScreen.cpp index a824aec..f4e82c6 100644 --- a/src/ui/screens/SettingsScreen.cpp +++ b/src/ui/screens/SettingsScreen.cpp @@ -26,9 +26,9 @@ struct RadioPreset { }; static const RadioPreset PRESETS[] = { - {"Balanced", 9, 250000, 5, 14, 18}, - {"Long Range", 12, 125000, 8, 17, 18}, - {"Fast", 7, 500000, 5, 10, 18}, + {"Balanced", 9, 125000, 5, 17, 18}, + {"Long Range", 12, 62500, 8, 22, 18}, + {"Fast", 7, 250000, 5, 14, 18}, }; static constexpr int NUM_PRESETS = 3;