From 8b2139d0175828dfbb6ab0186ec4f111bd662f1c Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Fri, 6 May 2022 20:14:59 +0200
Subject: [PATCH] Multiply old baudrate to new baudrate

---
 src/log/hasp_debug.cpp | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/log/hasp_debug.cpp b/src/log/hasp_debug.cpp
index 6b382188..5cc88bb6 100644
--- a/src/log/hasp_debug.cpp
+++ b/src/log/hasp_debug.cpp
@@ -97,6 +97,22 @@ extern dispatch_conf_t dispatch_setings;
 // }
 // #endif
 
+// TODO: Remove old compatibility options
+static int32_t multiply_legacy_baudrate(int32_t baud)
+{
+    switch(baud) {
+        case 960:
+        case 1920:
+        case 3840:
+        case 5760:
+        case 7488:
+        case 11520:
+            baud *= 10; // multiply old values
+            break;
+    }
+    return baud;
+}
+
 void debugStartSyslog()
 {
 
@@ -181,16 +197,7 @@ bool debugSetConfig(const JsonObject& settings)
     /* Serial Settings */
     changed |= configSet(debugSerialBaud, settings[FPSTR(FP_CONFIG_BAUD)], F("debugSerialBaud"));
     if(changed) { // baudrate was changed
-        switch(debugSerialBaud) {
-            case 960:
-            case 1920:
-            case 3840:
-            case 5760:
-            case 7488:
-            case 11520:
-                debugSerialBaud *= 10; // multiply old values
-                break;
-        }
+        debugSerialBaud = multiply_legacy_baudrate(debugSerialBaud);
     }
 
     /* Ansi Code Settings */
@@ -396,7 +403,7 @@ void debugSetup(JsonObject settings)
 
 #if HASP_USE_CONFIG > 0
     if(!settings[FPSTR(FP_CONFIG_BAUD)].isNull()) {
-        debugSerialBaud = settings[FPSTR(FP_CONFIG_BAUD)].as<int32_t>();
+        debugSerialBaud = multiply_legacy_baudrate(settings[FPSTR(FP_CONFIG_BAUD)].as<int32_t>());
     }
 #endif
 }