Pause hibernate when editing and resetting; Logs

AppCore.cpp

@@ -55,7 +55,6 @@ BoilerTankMenuActivity g_menuHeaterActivity(&g_homeActivity, &g_menuWaterActivit
                                             "", &g_appState.tanks[1]);
 MenuItemActivity g_menuVersionActivity(&g_homeActivity, nullptr, &g_menuHeaterActivity, &g_menuWaterActivity, "Version",
                                        xstr(APP_CORE_VERSION) " - " xstr(APP_CORE_COMMIT));
-IActivity* g_currentActivity = nullptr;
 
 
 int freeRam()
@@ -65,6 +64,11 @@ int freeRam()
     return (int) &v - (__brkval == 0 ? (int) &__heap_start : (int) __brkval);
 }
 
+AppCore::AppCore()
+        : m_currentActivity(nullptr)
+{
+}
+
 void AppCore::begin()
 {
     Serial.begin(9600);
@@ -128,9 +132,9 @@ void AppCore::loop()
 
     g_hibernateService.loop();
 
-    if (g_currentActivity)
+    if (m_currentActivity)
     {
-        g_currentActivity->loop();
+        m_currentActivity->loop();
     }
 
     LOG_FN_END(50);
@@ -138,6 +142,11 @@ void AppCore::loop()
 
 void AppCore::setActivity(IActivity* activity)
 {
-    g_currentActivity = activity;
-    g_currentActivity->begin();
+    m_currentActivity = activity;
+    m_currentActivity->begin();
+}
+
+IActivity* AppCore::getCurrentActivity() const
+{
+    return m_currentActivity;
 }

AppCore.h

@@ -1,12 +1,5 @@
 #pragma once
 
-#include <LiquidCrystal.h>
-#include <JC_Button.h>
-#include <OneWire.h>
-#include <DallasTemperature.h>
-#include "Boiler.h"
-#include "Storage.h"
-#include "IInput.h"
 #include "ILifeCycle.h"
 #include "IActivity.h"
 
@@ -14,9 +7,16 @@ class AppCore
         : public ILifeCycle
 {
 public:
+    AppCore();
+
     void begin() override;
 
     void loop() override;
 
     void setActivity(IActivity* activity);
+
+    IActivity* getCurrentActivity() const;
+
+protected:
+    IActivity* m_currentActivity;
 };

BaseActivity.cpp

@@ -1,6 +1,7 @@
 #include "BaseActivity.h"
 #include "globals.h"
 #include "Helpers.h"
+#include "Logs.h"
 
 BaseActivity::BaseActivity(
         IActivity* mParentActivity
@@ -25,18 +26,22 @@ void BaseActivity::loop()
     {
         if (g_btnCancel.wasReleased())
         {
+            LOG(1, "BaseActivity: Cancel pressed");
             onButtonReleased(Cancel);
         }
         else if (g_btnOk.wasReleased())
         {
+            LOG(1, "BaseActivity: Ok pressed");
             onButtonReleased(Ok);
         }
         else if (g_btnMinus.wasReleased())
         {
+            LOG(1, "BaseActivity: Minus pressed");
             onButtonReleased(Minus);
         }
         else if (g_btnPlus.wasReleased())
         {
+            LOG(1, "BaseActivity: Plus pressed");
             onButtonReleased(Plus);
         }
     }
@@ -49,6 +54,7 @@ void BaseActivity::loop()
 
 void BaseActivity::updateLcd()
 {
+    LOG(1, "BaseActivity: Updating LCD");
     char lines[2][17];
     lines[0][0] = 0;
     lines[1][0] = 0;

Boiler.h

@@ -14,15 +14,14 @@ struct BoilerTankState
 {
     enum Mode
     {
-        Auto,
-        On,
-        Off
+        Auto = 1,
+        On = 2,
+        Off = 3
     };
 
     Mode mode;
     temp_t setting;
     temp_t tempTrigger;
-//    uint8_t sensorAddress[8];
     TempInput* input;
     DigitalOutput* relay;
 };

BoilerTankModeEditorActivity.cpp

@@ -52,12 +52,14 @@ void BoilerTankModeEditorActivity::onButtonReleased(BaseActivity::Button button)
         {
             m_tmpValue = *m_value;
             m_isEditMode = false;
+            g_hibernateService.setPaused(false);
         }
         else if (button == Ok)
         {
             *m_value = m_tmpValue;
             g_storage.save();
             m_isEditMode = false;
+            g_hibernateService.setPaused(false);
         }
         else if (button == Minus)
         {
@@ -99,6 +101,7 @@ void BoilerTankModeEditorActivity::onButtonReleased(BaseActivity::Button button)
         {
             m_isEditMode = true;
             m_lcdUpdateNeeded = true;
+            g_hibernateService.setPaused(true);
         }
         else
         {

HibernateService.cpp

@@ -13,6 +13,7 @@ HibernateService::HibernateService()
         nullptr
 }
           , m_lastEventMs(0)
+          , m_paused(false)
 {
 }
 
@@ -37,7 +38,7 @@ void HibernateService::loop()
             break;
         }
     }
-    if (!m_lastValue && currentMs - m_lastEventMs > HIBERNATE_DELAY)
+    if (!m_lastValue && !m_paused && currentMs - m_lastEventMs > HIBERNATE_DELAY)
     {
         shouldHibernate = true;
     }
@@ -48,5 +49,14 @@ void HibernateService::loop()
     {
         LOG(1, "Hibernate event");
         g_lcdLed.setEnabled(!m_lastValue);
+        if (m_lastValue && g_appCore.getCurrentActivity() != &g_homeActivity)
+        {
+            g_appCore.setActivity(&g_homeActivity);
+        }
     }
 }
+
+void HibernateService::setPaused(bool paused)
+{
+    m_paused = paused;
+}

HibernateService.h

@@ -15,8 +15,12 @@ public:
 
     void loop() override;
 
+    void setPaused(bool paused);
+
 protected:
     Button* m_buttons[5];
 
     timestamp_t m_lastEventMs;
+
+    bool m_paused;
 };

HomeActivity.cpp

@@ -35,6 +35,7 @@ void HomeActivity::loop()
 {
     if (g_appState.tanks[0].input->hasChanged() || g_appState.tanks[1].input->hasChanged())
     {
+        LOG(1, "HomeActivity: Input has changed");
         m_lcdUpdateNeeded = true;
     }
     BaseActivity::loop();

LoaderActivity.cpp

@@ -11,6 +11,7 @@ void LoaderActivity::begin()
     }
     else
     {
+        g_hibernateService.setPaused(true);
         BaseActivity::begin();
     }
 }
@@ -26,6 +27,7 @@ void LoaderActivity::reset()
 {
     LOG(1, "%s: Resetting settings", __FUNCTION__);
     g_storage.save();
+    g_hibernateService.setPaused(false);
     g_appCore.setActivity(&g_homeActivity);
 }
 

TempEditorActivity.cpp

@@ -42,12 +42,14 @@ void TempEditorActivity::onButtonReleased(BaseActivity::Button button)
         {
             m_tmpValue = *m_value;
             m_isEditMode = false;
+            g_hibernateService.setPaused(false);
         }
         else if (button == Ok)
         {
             *m_value = m_tmpValue;
             g_storage.save();
             m_isEditMode = false;
+            g_hibernateService.setPaused(false);
         }
         else if (button == Minus)
         {
@@ -65,6 +67,7 @@ void TempEditorActivity::onButtonReleased(BaseActivity::Button button)
         {
             m_isEditMode = true;
             m_lcdUpdateNeeded = true;
+            g_hibernateService.setPaused(true);
         }
         else
         {

TempInput.cpp

@@ -1,6 +1,7 @@
 #include "TempInput.h"
 #include "globals.h"
 #include "defines.h"
+#include "Logs.h"
 
 TempInput::TempInput(uint8_t index)
         : m_address{0}
@@ -22,6 +23,7 @@ void TempInput::loop()
 
     if (currentMs - m_lastSensorRequestMs >= SENSORS_CHECK_INTERVAL)
     {
+        LOG(5, "TempInput: requesting value");
         m_lastSensorRequestMs = currentMs;
         m_hasReadSensor = false;
         g_dallasTemperature.requestTemperaturesByAddress(m_address);
@@ -29,6 +31,7 @@ void TempInput::loop()
     if (currentMs - m_lastSensorRequestMs >= SENSORS_REQUEST_DELAY &&
         !m_hasReadSensor)
     {
+        LOG(5, "TempInput: reading value");
         m_hasReadSensor = true;
         auto raw = g_dallasTemperature.getTempC(m_address);
         temp_t temp = TEMP_T_INVALID;
@@ -38,4 +41,8 @@ void TempInput::loop()
         }
         setValue(temp);
     }
+    else
+    {
+        setValue(m_lastValue);
+    }
 }