pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-27 18:31:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1529 from mc-hamster/master

Browse Source 
Fix typo in the modem presets
This commit is contained in:
Jm Casler 2022-06-21 19:34:37 -07:00 committed by GitHub
commit 45b2c169aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/graphics/Screen.cpp
View File

@ -1520,25 +1520,25 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
switch (config.lora.modem_preset) { switch (config.lora.modem_preset) {
case Config_LoRaConfig_ModemPreset_ShortSlow: case Config_LoRaConfig_ModemPreset_ShortSlow:
mode = "ShortSlow"; mode = "ShortS";
break; break;
case Config_LoRaConfig_ModemPreset_ShortFast: case Config_LoRaConfig_ModemPreset_ShortFast:
mode = "ShortFast"; mode = "ShortF";
break; break;
case Config_LoRaConfig_ModemPreset_MidSlow: case Config_LoRaConfig_ModemPreset_MedSlow:
mode = "MediumSlow"; mode = "MedS";
break; break;
case Config_LoRaConfig_ModemPreset_MidFast: case Config_LoRaConfig_ModemPreset_MedFast:
mode = "MediumFast"; mode = "MedF";
break; break;
case Config_LoRaConfig_ModemPreset_LongFast: case Config_LoRaConfig_ModemPreset_LongFast:
mode = "LongFast"; mode = "LongS";
break; break;
case Config_LoRaConfig_ModemPreset_LongSlow: case Config_LoRaConfig_ModemPreset_LongSlow:
mode = "LongSlow"; mode = "LongF";
break; break;
case Config_LoRaConfig_ModemPreset_VLongSlow: case Config_LoRaConfig_ModemPreset_VLongSlow:
mode = "VLongSlow"; mode = "VeryL";
break; break;
default: default:
mode = "Custom"; mode = "Custom";

18
src/mesh/Channels.cpp
View File

@ -215,25 +215,25 @@ const char *Channels::getName(size_t chIndex)
else else
switch (config.lora.modem_preset) { switch (config.lora.modem_preset) {
case Config_LoRaConfig_ModemPreset_ShortSlow: case Config_LoRaConfig_ModemPreset_ShortSlow:
channelName = "ShortSlow"; channelName = "ShortS";
break; break;
case Config_LoRaConfig_ModemPreset_ShortFast: case Config_LoRaConfig_ModemPreset_ShortFast:
channelName = "ShortFast"; channelName = "ShortF";
break; break;
case Config_LoRaConfig_ModemPreset_MidSlow: case Config_LoRaConfig_ModemPreset_MedSlow:
channelName = "MediumSlow"; channelName = "MedS";
break; break;
case Config_LoRaConfig_ModemPreset_MidFast: case Config_LoRaConfig_ModemPreset_MedFast:
channelName = "MediumFast"; channelName = "MedF";
break; break;
case Config_LoRaConfig_ModemPreset_LongFast: case Config_LoRaConfig_ModemPreset_LongFast:
channelName = "LongFast"; channelName = "LongS";
break; break;
case Config_LoRaConfig_ModemPreset_LongSlow: case Config_LoRaConfig_ModemPreset_LongSlow:
channelName = "LongSlow"; channelName = "LongF";
break; break;
case Config_LoRaConfig_ModemPreset_VLongSlow: case Config_LoRaConfig_ModemPreset_VLongSlow:
channelName = "VLongSlow"; channelName = "VeryL";
break; break;
default: default:
channelName = "Invalid"; channelName = "Invalid";

4
src/mesh/RadioInterface.cpp
View File

@ -360,12 +360,12 @@ void RadioInterface::applyModemConfig()
cr = 8; cr = 8;
sf = 8; sf = 8;
break; break;
case Config_LoRaConfig_ModemPreset_MidFast: case Config_LoRaConfig_ModemPreset_MedFast:
bw = 250; bw = 250;
cr = 8; cr = 8;
sf = 9; sf = 9;
break; break;
case Config_LoRaConfig_ModemPreset_MidSlow: case Config_LoRaConfig_ModemPreset_MedSlow:
bw = 250; bw = 250;
cr = 8; cr = 8;
sf = 10; sf = 10;