logSetup

src/patrix/log.cpp

@@ -1,13 +1,53 @@
 #include "log.h"
 
-#include <cstdio>
-#include <cstdarg>
-
 #include "clock.h"
 
+void doLog(LogLevel level, const char *format, va_list args);
+
 auto logLevel = DEBUG;
 
-void log(const LogLevel level, const char *format, const va_list args) {
+void logSetup() {
+  delay(500);
+  Serial.begin(115200);
+  info("Startup");
+}
+
+void log(const LogLevel level, const char *format, ...) {
+  va_list args;
+  va_start(args, format);
+  doLog(level, format, args);
+  va_end(args);
+}
+
+void error(const char *format, ...) {
+  va_list args;
+  va_start(args, format);
+  doLog(ERROR, format, args);
+  va_end(args);
+}
+
+void warn(const char *format, ...) {
+  va_list args;
+  va_start(args, format);
+  doLog(WARN, format, args);
+  va_end(args);
+}
+
+void info(const char *format, ...) {
+  va_list args;
+  va_start(args, format);
+  doLog(INFO, format, args);
+  va_end(args);
+}
+
+void debug(const char *format, ...) {
+  va_list args;
+  va_start(args, format);
+  doLog(DEBUG, format, args);
+  va_end(args);
+}
+
+void doLog(const LogLevel level, const char *format, const va_list args) {
   if (level > logLevel) {
     return;
   }
@@ -34,38 +74,3 @@ void log(const LogLevel level, const char *format, const va_list args) {
 
   yield();
 }
-
-void log(const LogLevel level, const char *format, ...) {
-  va_list args;
-  va_start(args, format);
-  log(level, format, args);
-  va_end(args);
-}
-
-void error(const char *format, ...) {
-  va_list args;
-  va_start(args, format);
-  log(ERROR, format, args);
-  va_end(args);
-}
-
-void warn(const char *format, ...) {
-  va_list args;
-  va_start(args, format);
-  log(WARN, format, args);
-  va_end(args);
-}
-
-void info(const char *format, ...) {
-  va_list args;
-  va_start(args, format);
-  log(INFO, format, args);
-  va_end(args);
-}
-
-void debug(const char *format, ...) {
-  va_list args;
-  va_start(args, format);
-  log(DEBUG, format, args);
-  va_end(args);
-}

src/patrix/log.h

@@ -8,7 +8,7 @@ enum LogLevel {
   DEBUG = 3
 };
 
-void log(LogLevel level, const char *format, ...);
+void logSetup();
 
 void error(const char *format, ...);
 
@@ -18,4 +18,6 @@ void info(const char *format, ...);
 
 void debug(const char *format, ...);
 
+void log(LogLevel level, const char *format, ...);
+
 #endif

src/patrix/main.cpp

@@ -2,9 +2,10 @@
 
 #include "main.h"
 #include "boot.h"
-#include "wifi.h"
 #include "http.h"
+#include "log.h"
 #include "mqtt.h"
+#include "wifi.h"
 
 #include "sensor/DallasSensor.h"
 #include "sensor/DHT22.h"
@@ -19,9 +20,7 @@ NodeHeizung node = NodeHeizung();
 #endif
 
 void setup() {
-  Serial.begin(115200);
+  logSetup();
-  delay(500);
-  Serial.print("Startup\n");
   bootDelay();
   node.setup();
   httpSetup();