From 5274cdbff3f15b276cd309841b5f2871ee856cd8 Mon Sep 17 00:00:00 2001 From: Bryan Mayland Date: Fri, 31 Jan 2025 14:59:56 -0500 Subject: [PATCH] Reduce to 72Hz / 14 bit preamble --- src/include/common.h | 6 +++--- src/lib/LUA/tx_devLUA.cpp | 4 ++-- src/src/common.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/include/common.h b/src/include/common.h index 7902a018a0..1a0e217d94 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -96,7 +96,7 @@ typedef enum : uint8_t RATE_FSK_900_1000HZ_8CH, RATE_LORA_2G4_25HZ = 20, - RATE_LORA_2G4_85HZ, + RATE_LORA_2G4_72HZ, RATE_LORA_2G4_100HZ, RATE_LORA_2G4_100HZ_8CH, RATE_LORA_2G4_150HZ, @@ -300,13 +300,13 @@ extern SX127xDriver Radio; #elif defined(RADIO_LR1121) #define RATE_MAX 20 #define RATE_BINDING RATE_LORA_900_50HZ -#define RATE_DUALBAND_BINDING RATE_LORA_2G4_85HZ +#define RATE_DUALBAND_BINDING RATE_LORA_2G4_72HZ extern LR1121Driver Radio; #elif defined(RADIO_SX128X) #define RATE_MAX 10 // 2xFLRC + 2xDVDA + 4xLoRa + 2xFullRes -#define RATE_BINDING RATE_LORA_2G4_85HZ +#define RATE_BINDING RATE_LORA_2G4_72HZ extern SX1280Driver Radio; #endif diff --git a/src/lib/LUA/tx_devLUA.cpp b/src/lib/LUA/tx_devLUA.cpp index 0a36141fc2..e4ba5663d7 100644 --- a/src/lib/LUA/tx_devLUA.cpp +++ b/src/lib/LUA/tx_devLUA.cpp @@ -21,13 +21,13 @@ #elif defined(RADIO_LR1121) #define STR_LUA_PACKETRATES \ "100Hz Full(-112dBm);150Hz(-112dBm);" \ - "85Hz(-115dBm);100Hz Full(-112dBm);150Hz(-112dBm);250Hz(-108dBm);333Hz Full(-105dBm);500Hz(-105dBm);" \ + "72Hz(-115dBm);100Hz Full(-112dBm);150Hz(-112dBm);250Hz(-108dBm);333Hz Full(-105dBm);500Hz(-105dBm);" \ "DK250(-103dBm);DK500(-103dBm);K1000(-103dBm);" \ "D50Hz(-112dBm);25Hz(-123dBm);50Hz(-120dBm);100Hz(-117dBm);100Hz Full(-112dBm);200Hz(-112dBm);200Hz Full(-111dBm);250Hz(-111dBm);" \ "K1000 Full(-101dBm)" #elif defined(RADIO_SX128X) #define STR_LUA_PACKETRATES \ - "85Hz(-115dBm);100Hz Full(-112dBm);150Hz(-112dBm);250Hz(-108dBm);333Hz Full(-105dBm);500Hz(-105dBm);" \ + "72Hz(-115dBm);100Hz Full(-112dBm);150Hz(-112dBm);250Hz(-108dBm);333Hz Full(-105dBm);500Hz(-105dBm);" \ "D250(-104dBm);D500(-104dBm);F500(-104dBm);F1000(-104dBm)" #else #error Invalid radio configuration! diff --git a/src/src/common.cpp b/src/src/common.cpp index a71ab42a41..677005d4d0 100644 --- a/src/src/common.cpp +++ b/src/src/common.cpp @@ -46,7 +46,7 @@ expresslrs_mod_settings_s ExpressLRS_AirRateConfig[RATE_MAX] = { {14, RADIO_TYPE_LR1121_LORA_2G4, RATE_LORA_2G4_250HZ, LR11XX_RADIO_LORA_BW_800, LR11XX_RADIO_LORA_SF6, LR11XX_RADIO_LORA_CR_LI_4_8, 14, LR11XX_RADIO_LORA_BW_800, LR11XX_RADIO_LORA_SF6, LR11XX_RADIO_LORA_CR_LI_4_8, 14, TLM_RATIO_1_64, 4, 4000, OTA4_PACKET_SIZE, 1}, {15, RADIO_TYPE_LR1121_LORA_2G4, RATE_LORA_2G4_150HZ, LR11XX_RADIO_LORA_BW_800, LR11XX_RADIO_LORA_SF7, LR11XX_RADIO_LORA_CR_LI_4_8, 12, LR11XX_RADIO_LORA_BW_800, LR11XX_RADIO_LORA_SF7, LR11XX_RADIO_LORA_CR_LI_4_8, 12, TLM_RATIO_1_32, 4, 6666, OTA4_PACKET_SIZE, 1}, {16, RADIO_TYPE_LR1121_LORA_2G4, RATE_LORA_2G4_100HZ_8CH, LR11XX_RADIO_LORA_BW_800, LR11XX_RADIO_LORA_SF7, LR11XX_RADIO_LORA_CR_LI_4_8, 12, LR11XX_RADIO_LORA_BW_800, LR11XX_RADIO_LORA_SF7, LR11XX_RADIO_LORA_CR_LI_4_8, 12, TLM_RATIO_1_32, 4, 10000, OTA8_PACKET_SIZE, 1}, - {17, RADIO_TYPE_LR1121_LORA_2G4, RATE_LORA_2G4_85HZ, LR11XX_RADIO_LORA_BW_800, LR11XX_RADIO_LORA_SF8, LR11XX_RADIO_LORA_CR_LI_4_8, 12, LR11XX_RADIO_LORA_BW_800, LR11XX_RADIO_LORA_SF8, LR11XX_RADIO_LORA_CR_LI_4_8, 12, TLM_RATIO_1_16, 2, 11764, OTA4_PACKET_SIZE, 1}, + {17, RADIO_TYPE_LR1121_LORA_2G4, RATE_LORA_2G4_72HZ, LR11XX_RADIO_LORA_BW_800, LR11XX_RADIO_LORA_SF8, LR11XX_RADIO_LORA_CR_LI_4_8, 14, LR11XX_RADIO_LORA_BW_800, LR11XX_RADIO_LORA_SF8, LR11XX_RADIO_LORA_CR_LI_4_8, 14, TLM_RATIO_1_16, 2, 13888, OTA4_PACKET_SIZE, 1}, {18, RADIO_TYPE_LR1121_LORA_DUAL, RATE_LORA_DUAL_150HZ, LR11XX_RADIO_LORA_BW_500, LR11XX_RADIO_LORA_SF6, LR11XX_RADIO_LORA_CR_4_8, 12, LR11XX_RADIO_LORA_BW_800, LR11XX_RADIO_LORA_SF7, LR11XX_RADIO_LORA_CR_LI_4_6, 12, TLM_RATIO_1_32, 4, 6666, OTA4_PACKET_SIZE, 1}, {19, RADIO_TYPE_LR1121_LORA_DUAL, RATE_LORA_DUAL_100HZ_8CH, LR11XX_RADIO_LORA_BW_500, LR11XX_RADIO_LORA_SF6, LR11XX_RADIO_LORA_CR_4_8, 18, LR11XX_RADIO_LORA_BW_800, LR11XX_RADIO_LORA_SF7, LR11XX_RADIO_LORA_CR_LI_4_8, 14, TLM_RATIO_1_32, 4, 10000, OTA8_PACKET_SIZE, 1}}; @@ -88,7 +88,7 @@ expresslrs_mod_settings_s ExpressLRS_AirRateConfig[RATE_MAX] = { {6, RADIO_TYPE_SX128x_LORA, RATE_LORA_2G4_250HZ, SX1280_LORA_BW_0800, SX1280_LORA_SF6, SX1280_LORA_CR_LI_4_8, 14, TLM_RATIO_1_64, 4, 4000, OTA4_PACKET_SIZE, 1}, {7, RADIO_TYPE_SX128x_LORA, RATE_LORA_2G4_150HZ, SX1280_LORA_BW_0800, SX1280_LORA_SF7, SX1280_LORA_CR_LI_4_8, 12, TLM_RATIO_1_32, 4, 6666, OTA4_PACKET_SIZE, 1}, {8, RADIO_TYPE_SX128x_LORA, RATE_LORA_2G4_100HZ_8CH, SX1280_LORA_BW_0800, SX1280_LORA_SF7, SX1280_LORA_CR_LI_4_8, 12, TLM_RATIO_1_32, 4, 10000, OTA8_PACKET_SIZE, 1}, - {9, RADIO_TYPE_SX128x_LORA, RATE_LORA_2G4_85HZ, SX1280_LORA_BW_0800, SX1280_LORA_SF8, SX1280_LORA_CR_LI_4_8, 12, TLM_RATIO_1_16, 2, 11764, OTA4_PACKET_SIZE, 1}}; + {9, RADIO_TYPE_SX128x_LORA, RATE_LORA_2G4_72HZ, SX1280_LORA_BW_0800, SX1280_LORA_SF8, SX1280_LORA_CR_LI_4_8, 14, TLM_RATIO_1_16, 2, 13888, OTA4_PACKET_SIZE, 1}}; expresslrs_rf_pref_params_s ExpressLRS_AirRateRFperf[RATE_MAX] = { {0, -104, 389, 2500, 2500, 3, 5000, DYNPOWER_SNR_THRESH_NONE, DYNPOWER_SNR_THRESH_NONE},