Merge pull request #1529 from mc-hamster/master

Fix typo in the modem presets

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";

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";

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;