Issue-ID: yalfixes: minor fixes and crashes

Signed-off-by: Alexander Mohr <[email protected]>

Author: alexmohr

platformio.ini

@@ -26,7 +26,6 @@ build_flags =
     -DVERSION=0.1.0
     -DMONITOR_SPEED=115200
     -O3
-    -DTEMP_SENSOR=BM280
     -std=c++17
     -std=gnu++17
     -DCMAKE_C_STANDARD=c99

src/hardware/ESP8266.h

@@ -28,7 +28,6 @@ static constexpr uint8_t LED_ON = HIGH;
 static constexpr uint8_t LED_OFF = LOW;
 
 // Filesystem
-#include <LittleFS.h>
 
 #define FileFS LittleFS
 #define FS_Name "LittleFS"

src/heating/RadiatorValve.cpp

@@ -230,7 +230,7 @@ void open_heat::heating::RadiatorValve::closeValve(unsigned int rotateTime)
 
   m_logger.log(
     yal::Level::DEBUG,
-    "Closing valve for %ims, currentRotateTime: %ims, vin: %i, ground: %i",
+    "Closing valve for %ms, currentRotateTime: %, vin: %, ground: %",
     rotateTime,
     rtc::read().currentRotateTime,
     config.Vin,

src/main.cpp

@@ -95,12 +95,12 @@ void setupTemperatureSensor()
 
   open_heat::sensors::Sensor* sensor;
   if (config.TempSensor == BME) {
-    auto bme = new open_heat::sensors::BME280();
+    auto *bme = new open_heat::sensors::BME280();
     g_humidSensor = bme;
     g_tempSensor = bme;
     sensor = reinterpret_cast<open_heat::sensors::Sensor*>(bme);
   } else {
-    auto bmp = new open_heat::sensors::BMP280();
+    auto* bmp = new open_heat::sensors::BMP280();
     g_humidSensor = nullptr;
     g_tempSensor = bmp;
     sensor = reinterpret_cast<open_heat::sensors::Sensor*>(bmp);
@@ -119,11 +119,11 @@ void setupTemperatureSensor()
 
 bool isDoubleReset()
 {
-  if (ESP.getResetInfoPtr()->reason != REASON_EXT_SYS_RST) {
+  if (EspClass::getResetInfoPtr()->reason != REASON_EXT_SYS_RST) {
     g_logger.log(
       yal::Level::DEBUG,
       "no double reset, resetInfo: %s",
-      ESP.getResetInfo().c_str());
+      EspClass::getResetInfo().c_str());
     open_heat::rtc::setDrdDisabled(true);
     return false;
   }
@@ -137,7 +137,7 @@ bool isDoubleReset()
 
   g_logger.log(
     yal::Level::DEBUG,
-    "millis since reset: %lu, last reset time %lu, offset millis: %lu",
+    "millis since reset: %l, last reset time %, offset millis: %",
     millisSinceReset,
     open_heat::rtc::read().lastResetTime,
     open_heat::rtc::offsetMillis());
@@ -172,7 +172,7 @@ void setup()
 
   const auto offsetMillis = open_heat::rtc::offsetMillis();
   g_logger.log(
-    yal::Level::DEBUG, "Set last reset time to %lu", offsetMillis);
+    yal::Level::DEBUG, "Set last reset time to %", offsetMillis);
   open_heat::rtc::setLastResetTime(offsetMillis);
 
   setupPins();
@@ -186,7 +186,7 @@ void setup()
     g_wifiManager.setup(doubleReset);
     g_mqtt.setup();
   }
-
+  g_mqtt.enableDebug(true);
   if (!configValid) {
     g_mqtt.enableDebug(true);
   }
@@ -226,8 +226,8 @@ void loop()
   g_logger.log(yal::Level::DEBUG, msg.c_str());
 
   const auto minSleepTime = 10000UL;
-  unsigned long idleTime;
-  unsigned long nextCheckMillis;
+  uint32_t idleTime;
+  uint32_t nextCheckMillis;
   bool enableWifi = false;
   if (valveSleep < mqttSleep) {
     nextCheckMillis = valveSleep;

src/network/MQTT.cpp

@@ -15,15 +15,21 @@ void open_heat::network::MQTT::setup()
   });
 
   m_valve.registerModeChangedHandler([this](OperationMode mode) {
-    m_mqttAppender.queue().push({m_getModeTopic, heating::RadiatorValve::modeToCharArray(mode)});
+    if (m_mqttAppender != nullptr) {
+      m_mqttAppender->queue().push({m_getModeTopic, heating::RadiatorValve::modeToCharArray(mode)});
+}
   });
 
   m_valve.registerSetTempChangedHandler([this](float temp) {
-    m_mqttAppender.queue().push({m_getConfiguredTempTopic, String(temp)});
+    if (m_mqttAppender != nullptr) {
+    m_mqttAppender->queue().push({m_getConfiguredTempTopic, String(temp)});
+}
   });
 
   m_valve.registerWindowChangeHandler([this](bool state) {
-    m_mqttAppender.queue().push({m_windowStateTopic, String(static_cast<int>(state))});
+    if (m_mqttAppender != nullptr) {
+      m_mqttAppender->queue().push({m_windowStateTopic, String(static_cast<int>(state))});
+}
   });
 }
 
@@ -205,10 +211,13 @@ void open_heat::network::MQTT::connect()
       config.MQTT.Server,
       config.MQTT.Username,
       config.MQTT.Password);
+    enableDebug(true);
     return;
   }
 
   setTopic(config.MQTT.Topic, "log", m_logTopic);
+  delete m_mqttAppender;
+  m_mqttAppender = new yal::appender::ArduinoMQTT<MQTTClient>(&m_logger, &m_mqttClient, m_logTopic.c_str());
 
   m_logger.log(yal::Level::INFO,
     "MQTT topic: %, topic len: %",
@@ -266,16 +275,19 @@ void open_heat::network::MQTT::enableDebug(bool value)
 
 void open_heat::network::MQTT::sendMessageQueue()
 {
-  while (!m_mqttAppender.queue().empty()) {
-    const auto msg = m_mqttAppender.queue().front();
+  if (m_mqttAppender == nullptr) {
+    return;
+  }
+  while (!m_mqttAppender->queue().empty()) {
+    const auto msg = m_mqttAppender->queue().front();
     if (msg.topic == m_logTopic) {
       // do not log again
       m_mqttClient.publish(msg.topic, msg.message);
     } else {
       publish(msg.topic, msg.message);
     }
 
-    m_mqttAppender.queue().pop();
+    m_mqttAppender->queue().pop();
   }
 }
 

src/network/MQTT.hpp

@@ -24,8 +24,8 @@ class MQTT {
   MQTT(
     Filesystem& filesystem,
     WifiManager& wifi,
-    sensors::Temperature* tempSensor,
-    sensors::Humidity* humiditySensor,
+    sensors::Temperature*& tempSensor,
+    sensors::Humidity*& humiditySensor,
     heating::RadiatorValve& valve,
     sensors::Battery& battery) :
       m_wifi(wifi),
@@ -35,7 +35,7 @@ class MQTT {
       m_filesystem(filesystem),
       m_valve(valve),
       m_logger(yal::Logger("MQTT")),
-      m_mqttAppender(yal::appender::ArduinoMQTT<MQTTClient>(&m_logger, &m_mqttClient, s_logTopic.c_str()))
+      m_mqttAppender(nullptr)
   {
   }
 
@@ -67,8 +67,8 @@ class MQTT {
 
   WifiManager& m_wifi;
 
-  sensors::Temperature* m_tempSensor;
-  sensors::Humidity* m_humiditySensor;
+  sensors::Temperature*& m_tempSensor;
+  sensors::Humidity*& m_humiditySensor;
   sensors::Battery& m_battery;
   Filesystem& m_filesystem;
   heating::RadiatorValve& m_valve;
@@ -106,9 +106,7 @@ class MQTT {
   bool m_configValid{true};
 
   yal::Logger m_logger;
-  yal::appender::ArduinoMQTT<MQTTClient> m_mqttAppender;
-
-  static inline String s_logTopic = "log";
+  yal::appender::ArduinoMQTT<MQTTClient>* m_mqttAppender = nullptr;
 };
 } // namespace open_heat::network
 

src/network/WifiManager.cpp

@@ -164,14 +164,14 @@ wl_status_t WifiManager::connectMultiWiFi()
    m_logger.log(
       yal::Level::INFO,
       "Wifi connected:\n"
-      "\ttime: %llu\n"
-      "\tSSID: %s\n"
-      "\tRSSI=%i\n"
-      "\tChannel: %i\n"
-      "\tIP address: %s",
+      "\ttime: %\n"
+      "\tSSID: %\n"
+      "\tRSSI=%\n"
+      "\tChannel: %\n"
+      "\tIP address: %",
       connectTime,
       WiFi.SSID().c_str(),
-      WiFi.RSSI(),
+      static_cast<int>(WiFi.RSSI()),
       WiFi.channel(),
       WiFi.localIP().toString().c_str());
     //@formatter:on