Update serial handling

lbussy · Nov 28, 2020 · 91279e7 · 91279e7
1 parent 212da62
commit 91279e7
Show file tree

Hide file tree

Showing 7 changed files with 380 additions and 102 deletions.
diff --git a/src/main.h b/src/main.h
@@ -23,7 +23,7 @@ SOFTWARE. */
 #ifndef _MAIN_H
 #define _MAIN_H
 
-#include "serial_setup.h"
+#include "serialhandler.h"
 #include "config.h"
 #include "execota.h"
 #include "jsonconfig.h"

diff --git a/src/ntp.cpp b/src/ntp.cpp
@@ -41,27 +41,21 @@ void setClock()
                 ESP.restart();
             }
 #ifdef LOG_LEVEL
-            // TODO:
-            //myPrintln();
-            Serial.println();
+            myPrintln();
 #endif
             Log.verbose(F("Re-requesting time hack."));
             startSecs = time(nullptr);
             cycle++;
         }
 #ifdef LOG_LEVEL
-        // TODO:
-        //myPrint(F("."));
-        Serial.print(F("."));
+        myPrint(F("."));
 #endif
         delay(1000);
         yield();
     }
     blinker.detach();
 #ifdef LOG_LEVEL
-    // TODO:
-    //myPrintln();
-    Serial.println();
+    myPrintln();
 #endif
     lastNTPUpdate = millis();
     Log.notice(F("NTP time set." CR));

diff --git a/src/ntp.h b/src/ntp.h
@@ -31,9 +31,7 @@ SOFTWARE. */
 
 #include "config.h"
 #include "tools.h"
-#include "serial_setup.h"
-// TODO:
-// #include "serialhandler.h"
+#include "serialhandler.h"
 #include <Ticker.h>
 #include <ArduinoLog.h>
 

diff --git a/src/serial_setup.cpp b/src/serial_setup.cpp
diff --git a/src/serial_setup.h b/src/serial_setup.h