From aead7a23f9ee47c30ea0c6bbcd1c45f3ecb2bbf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 22 Jun 2022 09:52:08 +0200 Subject: [PATCH] - Put Modemconfig in logical order and fix typo - non-zero config.lora.bandwidth means a custom radio config, not 'Unknown' - Enable 'this is a new device, set region' screen again now we can actually set region. --- src/configuration.h | 4 ++-- src/graphics/Screen.cpp | 4 ++-- src/mesh/Channels.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/configuration.h b/src/configuration.h index f0d44a3e..f932d301 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -142,10 +142,10 @@ along with this program. If not, see . // ----------------------------------------------------------------------------- // Disable use of the NTP library and related features -//#define DISABLE_NTP +// #define DISABLE_NTP // Disable the welcome screen and allow -#define DISABLE_WELCOME_UNSET +// #define DISABLE_WELCOME_UNSET // ----------------------------------------------------------------------------- // OLED & Input diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index c5e06c85..b8eb7917 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -1531,10 +1531,10 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat case Config_LoRaConfig_ModemPreset_MedFast: mode = "MedF"; break; - case Config_LoRaConfig_ModemPreset_LongFast: + case Config_LoRaConfig_ModemPreset_LongSlow: mode = "LongS"; break; - case Config_LoRaConfig_ModemPreset_LongSlow: + case Config_LoRaConfig_ModemPreset_LongFast: mode = "LongF"; break; case Config_LoRaConfig_ModemPreset_VLongSlow: diff --git a/src/mesh/Channels.cpp b/src/mesh/Channels.cpp index 01e7e0f4..2385da77 100644 --- a/src/mesh/Channels.cpp +++ b/src/mesh/Channels.cpp @@ -211,7 +211,7 @@ const char *Channels::getName(size_t chIndex) // the app fucked up and forgot to set channelSettings.name if (config.lora.bandwidth != 0) - channelName = "Unset"; + channelName = "Custom"; else switch (config.lora.modem_preset) { case Config_LoRaConfig_ModemPreset_ShortSlow: @@ -226,10 +226,10 @@ const char *Channels::getName(size_t chIndex) case Config_LoRaConfig_ModemPreset_MedFast: channelName = "MedF"; break; - case Config_LoRaConfig_ModemPreset_LongFast: + case Config_LoRaConfig_ModemPreset_LongSlow: channelName = "LongS"; break; - case Config_LoRaConfig_ModemPreset_LongSlow: + case Config_LoRaConfig_ModemPreset_LongFast: channelName = "LongF"; break; case Config_LoRaConfig_ModemPreset_VLongSlow: