pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-30 19:29:17 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #1531 from meshtastic/patch-1

Browse Source 
Small fixes and inprovements
This commit is contained in:
Thomas Göttgens 2022-06-22 12:36:46 +02:00 committed by GitHub
commit 41d5ccc29f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/configuration.h
View File

@ -142,10 +142,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Disable use of the NTP library and related features // Disable use of the NTP library and related features
//#define DISABLE_NTP // #define DISABLE_NTP
// Disable the welcome screen and allow // Disable the welcome screen and allow
#define DISABLE_WELCOME_UNSET // #define DISABLE_WELCOME_UNSET
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// OLED & Input // OLED & Input

4
src/graphics/Screen.cpp
View File

@ -1531,10 +1531,10 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
case Config_LoRaConfig_ModemPreset_MedFast: case Config_LoRaConfig_ModemPreset_MedFast:
mode = "MedF"; mode = "MedF";
break; break;
case Config_LoRaConfig_ModemPreset_LongFast: case Config_LoRaConfig_ModemPreset_LongSlow:
mode = "LongS"; mode = "LongS";
break; break;
case Config_LoRaConfig_ModemPreset_LongSlow: case Config_LoRaConfig_ModemPreset_LongFast:
mode = "LongF"; mode = "LongF";
break; break;
case Config_LoRaConfig_ModemPreset_VLongSlow: case Config_LoRaConfig_ModemPreset_VLongSlow:

6
src/mesh/Channels.cpp
View File

@ -211,7 +211,7 @@ const char *Channels::getName(size_t chIndex)
// the app fucked up and forgot to set channelSettings.name // the app fucked up and forgot to set channelSettings.name
if (config.lora.bandwidth != 0) if (config.lora.bandwidth != 0)
channelName = "Unset"; channelName = "Custom";
else else
switch (config.lora.modem_preset) { switch (config.lora.modem_preset) {
case Config_LoRaConfig_ModemPreset_ShortSlow: case Config_LoRaConfig_ModemPreset_ShortSlow:
@ -226,10 +226,10 @@ const char *Channels::getName(size_t chIndex)
case Config_LoRaConfig_ModemPreset_MedFast: case Config_LoRaConfig_ModemPreset_MedFast:
channelName = "MedF"; channelName = "MedF";
break; break;
case Config_LoRaConfig_ModemPreset_LongFast: case Config_LoRaConfig_ModemPreset_LongSlow:
channelName = "LongS"; channelName = "LongS";
break; break;
case Config_LoRaConfig_ModemPreset_LongSlow: case Config_LoRaConfig_ModemPreset_LongFast:
channelName = "LongF"; channelName = "LongF";
break; break;
case Config_LoRaConfig_ModemPreset_VLongSlow: case Config_LoRaConfig_ModemPreset_VLongSlow: