Replace all Serial by MessageOutput

src/main.cpp

@@ -3,6 +3,7 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "Configuration.h"
+#include "MessageOutput.h"
 #include "MqttHandleDtu.h"
 #include "MqttHandleHass.h"
 #include "MqttHandleInverter.h"
@@ -22,98 +23,99 @@ void setup()
     Serial.begin(SERIAL_BAUDRATE);
     while (!Serial)
         yield();
-    Serial.println();
-    Serial.println(F("Starting OpenDTU"));
+    MessageOutput.println();
+    MessageOutput.println(F("Starting OpenDTU"));
 
     // Initialize file system
-    Serial.print(F("Initialize FS... "));
+    MessageOutput.print(F("Initialize FS... "));
     if (!LittleFS.begin(false)) { // Do not format if mount failed
-        Serial.print(F("failed... trying to format..."));
+        MessageOutput.print(F("failed... trying to format..."));
         if (!LittleFS.begin(true)) {
-            Serial.print("success");
+            MessageOutput.print("success");
         } else {
-            Serial.print("failed");
+            MessageOutput.print("failed");
         }
     } else {
-        Serial.println(F("done"));
+        MessageOutput.println(F("done"));
     }
 
     // Read configuration values
-    Serial.print(F("Reading configuration... "));
+    MessageOutput.print(F("Reading configuration... "));
     if (!Configuration.read()) {
-        Serial.print(F("initializing... "));
+        MessageOutput.print(F("initializing... "));
         Configuration.init();
         if (Configuration.write()) {
-            Serial.print(F("written... "));
+            MessageOutput.print(F("written... "));
         } else {
-            Serial.print(F("failed... "));
+            MessageOutput.print(F("failed... "));
         }
     }
     if (Configuration.get().Cfg_Version != CONFIG_VERSION) {
-        Serial.print(F("migrated... "));
+        MessageOutput.print(F("migrated... "));
         Configuration.migrate();
     }
-    Serial.println(F("done"));
+    MessageOutput.println(F("done"));
 
     // Initialize WiFi
-    Serial.print(F("Initialize Network... "));
+    MessageOutput.print(F("Initialize Network... "));
     NetworkSettings.init();
-    Serial.println(F("done"));
+    MessageOutput.println(F("done"));
     NetworkSettings.applyConfig();
 
     // Initialize NTP
-    Serial.print(F("Initialize NTP... "));
+    MessageOutput.print(F("Initialize NTP... "));
     NtpSettings.init();
-    Serial.println(F("done"));
+    MessageOutput.println(F("done"));
 
     // Initialize MqTT
-    Serial.print(F("Initialize MqTT... "));
+    MessageOutput.print(F("Initialize MqTT... "));
     MqttSettings.init();
     MqttHandleDtu.init();
     MqttHandleInverter.init();
     MqttHandleHass.init();
-    Serial.println(F("done"));
+    MessageOutput.println(F("done"));
 
     // Initialize WebApi
-    Serial.print(F("Initialize WebApi... "));
+    MessageOutput.print(F("Initialize WebApi... "));
     WebApi.init();
-    Serial.println(F("done"));
+    MessageOutput.println(F("done"));
 
     // Check for default DTU serial
-    Serial.print(F("Check for default DTU serial... "));
+    MessageOutput.print(F("Check for default DTU serial... "));
     CONFIG_T& config = Configuration.get();
     if (config.Dtu_Serial == DTU_SERIAL) {
-        Serial.print(F("generate serial based on ESP chip id: "));
+        MessageOutput.print(F("generate serial based on ESP chip id: "));
         uint64_t dtuId = Utils::generateDtuSerial();
-        Serial.printf("%0x%08x... ",
+        MessageOutput.printf("%0x%08x... ",
             ((uint32_t)((dtuId >> 32) & 0xFFFFFFFF)),
             ((uint32_t)(dtuId & 0xFFFFFFFF)));
         config.Dtu_Serial = dtuId;
         Configuration.write();
     }
-    Serial.println(F("done"));
+    MessageOutput.println(F("done"));
 
     // Initialize inverter communication
-    Serial.print(F("Initialize Hoymiles interface... "));
+    MessageOutput.print(F("Initialize Hoymiles interface... "));
     SPIClass* spiClass = new SPIClass(HSPI);
     spiClass->begin(HOYMILES_PIN_SCLK, HOYMILES_PIN_MISO, HOYMILES_PIN_MOSI, HOYMILES_PIN_CS);
+    Hoymiles.setMessageOutput(&MessageOutput);
     Hoymiles.init(spiClass, HOYMILES_PIN_CE, HOYMILES_PIN_IRQ);
 
-    Serial.println(F("  Setting radio PA level... "));
+    MessageOutput.println(F("  Setting radio PA level... "));
     Hoymiles.getRadio()->setPALevel((rf24_pa_dbm_e)config.Dtu_PaLevel);
 
-    Serial.println(F("  Setting DTU serial... "));
+    MessageOutput.println(F("  Setting DTU serial... "));
     Hoymiles.getRadio()->setDtuSerial(config.Dtu_Serial);
 
-    Serial.println(F("  Setting poll interval... "));
+    MessageOutput.println(F("  Setting poll interval... "));
     Hoymiles.setPollInterval(config.Dtu_PollInterval);
 
     for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
         if (config.Inverter[i].Serial > 0) {
-            Serial.print(F("  Adding inverter: "));
-            Serial.print(config.Inverter[i].Serial, HEX);
-            Serial.print(F(" - "));
-            Serial.print(config.Inverter[i].Name);
+            MessageOutput.print(F("  Adding inverter: "));
+            MessageOutput.print(config.Inverter[i].Serial, HEX);
+            MessageOutput.print(F(" - "));
+            MessageOutput.print(config.Inverter[i].Name);
             auto inv = Hoymiles.addInverter(
                 config.Inverter[i].Name,
                 config.Inverter[i].Serial);
@@ -123,10 +125,10 @@ void setup()
                     inv->Statistics()->setChannelMaxPower(c, config.Inverter[i].channel[c].MaxChannelPower);
                 }
             }
-            Serial.println(F(" done"));
+            MessageOutput.println(F(" done"));
         }
     }
-    Serial.println(F("done"));
+    MessageOutput.println(F("done"));
 }
 
 void loop()
@@ -143,4 +145,6 @@ void loop()
     yield();
     WebApi.loop();
     yield();
+    MessageOutput.loop();
+    yield();
 }