From 90baf9d8a025f18869acdbbf4e1f091a1998628e Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Tue, 21 Jun 2022 19:23:07 -0700 Subject: [PATCH] Fix typo in the modem presets --- src/graphics/Screen.cpp | 18 +++++++++--------- src/mesh/Channels.cpp | 18 +++++++++--------- src/mesh/RadioInterface.cpp | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index dc1b0108a..c5e06c85d 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -1520,25 +1520,25 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat switch (config.lora.modem_preset) { case Config_LoRaConfig_ModemPreset_ShortSlow: - mode = "ShortSlow"; + mode = "ShortS"; break; case Config_LoRaConfig_ModemPreset_ShortFast: - mode = "ShortFast"; + mode = "ShortF"; break; - case Config_LoRaConfig_ModemPreset_MidSlow: - mode = "MediumSlow"; + case Config_LoRaConfig_ModemPreset_MedSlow: + mode = "MedS"; break; - case Config_LoRaConfig_ModemPreset_MidFast: - mode = "MediumFast"; + case Config_LoRaConfig_ModemPreset_MedFast: + mode = "MedF"; break; case Config_LoRaConfig_ModemPreset_LongFast: - mode = "LongFast"; + mode = "LongS"; break; case Config_LoRaConfig_ModemPreset_LongSlow: - mode = "LongSlow"; + mode = "LongF"; break; case Config_LoRaConfig_ModemPreset_VLongSlow: - mode = "VLongSlow"; + mode = "VeryL"; break; default: mode = "Custom"; diff --git a/src/mesh/Channels.cpp b/src/mesh/Channels.cpp index c48dbd079..01e7e0f41 100644 --- a/src/mesh/Channels.cpp +++ b/src/mesh/Channels.cpp @@ -215,25 +215,25 @@ const char *Channels::getName(size_t chIndex) else switch (config.lora.modem_preset) { case Config_LoRaConfig_ModemPreset_ShortSlow: - channelName = "ShortSlow"; + channelName = "ShortS"; break; case Config_LoRaConfig_ModemPreset_ShortFast: - channelName = "ShortFast"; + channelName = "ShortF"; break; - case Config_LoRaConfig_ModemPreset_MidSlow: - channelName = "MediumSlow"; + case Config_LoRaConfig_ModemPreset_MedSlow: + channelName = "MedS"; break; - case Config_LoRaConfig_ModemPreset_MidFast: - channelName = "MediumFast"; + case Config_LoRaConfig_ModemPreset_MedFast: + channelName = "MedF"; break; case Config_LoRaConfig_ModemPreset_LongFast: - channelName = "LongFast"; + channelName = "LongS"; break; case Config_LoRaConfig_ModemPreset_LongSlow: - channelName = "LongSlow"; + channelName = "LongF"; break; case Config_LoRaConfig_ModemPreset_VLongSlow: - channelName = "VLongSlow"; + channelName = "VeryL"; break; default: channelName = "Invalid"; diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp index 12de75086..09a0e3a90 100644 --- a/src/mesh/RadioInterface.cpp +++ b/src/mesh/RadioInterface.cpp @@ -360,12 +360,12 @@ void RadioInterface::applyModemConfig() cr = 8; sf = 8; break; - case Config_LoRaConfig_ModemPreset_MidFast: + case Config_LoRaConfig_ModemPreset_MedFast: bw = 250; cr = 8; sf = 9; break; - case Config_LoRaConfig_ModemPreset_MidSlow: + case Config_LoRaConfig_ModemPreset_MedSlow: bw = 250; cr = 8; sf = 10;