From 00196ab7e79891265383c854f86a7016b8891577 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 29 Jan 2023 09:53:38 -0600 Subject: [PATCH] Long moderate --- src/graphics/Screen.cpp | 4 +++- src/mesh/RadioInterface.cpp | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index 45af8e415..375e08215 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -610,7 +610,6 @@ static void drawGPScoordinates(OLEDDisplay *display, int16_t x, int16_t y, const } else { display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(coordinateLine))) / 2, y, coordinateLine); } - } else { char latLine[22]; char lonLine[22]; @@ -1695,6 +1694,9 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST: mode = "LongF"; break; + case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE: + mode = "LongM"; + break; case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW: mode = "VeryL"; break; diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp index 3c59867f6..d7c1e1aec 100644 --- a/src/mesh/RadioInterface.cpp +++ b/src/mesh/RadioInterface.cpp @@ -401,13 +401,18 @@ void RadioInterface::applyModemConfig() cr = 8; sf = 11; break; + case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE: + bw = (myRegion->wideLora) ? 406.25 : 125; + cr = 8; + sf = 11; + break; case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW: bw = (myRegion->wideLora) ? 406.25 : 125; cr = 8; sf = 12; break; case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW: - bw = (myRegion->wideLora) ? 203.125 : 31.25; + bw = (myRegion->wideLora) ? 203.125 : 62.5; cr = 8; sf = 12; break;