Added new menu

AppCore.cpp

@@ -1,6 +1,9 @@
 #include "AppCore.h"
 #include "Logs.h"
 
+#define xstr(s) str(s)
+#define str(s) #s
+
 #define HIBERNATE_DELAY 5000
 #define SENSORS_CHECK_INTERVAL 2000
 #define SENSORS_REQUEST_DELAY 750
@@ -9,8 +12,8 @@
 #define LCD_CHAR_SENSOR 1
 
 #define PIN_ONEWIRE A0
-#define PIN_RELAY1 A1
-#define PIN_RELAY2 A2
+#define PIN_RELAY2 A1
+#define PIN_RELAY1 A2
 #define PIN_BTN_CANCEL 9
 #define PIN_BTN_OK 10
 #define PIN_BTN_MINUS 11
@@ -23,8 +26,7 @@
 #define PIN_LCD_D6 4
 #define PIN_LCD_D7 3
 
-#define BUTTONS_COUNT (sizeof(g_buttons) / sizeof(*g_buttons))
-#define MODE_SEQUENCE_COUNT (sizeof(m_modeSequence) / sizeof(*m_modeSequence))
+UiStateEnum AppCore::s_menuSequence[4]{MenuWaterSetting, MenuHeaterSetting, MenuTempTrigger, MenuVersion};
 
 AppCore::AppCore()
         : m_appCoreState(new AppCoreState{
@@ -42,16 +44,17 @@ AppCore::AppCore()
                         .setting = 0,
                         .isActive = false,
                         .pinNo = PIN_RELAY2
-                }
+                },
+                .tempTrigger = TEMP_TRIGGER,
+                .pCurrentSettingEdit = nullptr,
+                .currentSettingEditTmp = 0
         },
         .uiState = {
-                .state = Lighting,
+                .state = HomeLighting,
                 .lastOpMs = 0,
-                .modeSequenceIndex = MODE_SEQUENCE_COUNT - 1,
                 .isUpdateNeeded = true
         }
 })
-          , m_modeSequence{WaterSetting, HeaterSetting, Lighting}
           , m_pBtnCancel(new Button{PIN_BTN_CANCEL})
           , m_pBtnOk(new Button{PIN_BTN_OK})
           , m_pBtnMinus(new Button{PIN_BTN_MINUS})
@@ -171,13 +174,13 @@ void AppCore::loop()
     }
 
 
-    if (m_appCoreState->uiState.state == Hibernate)
+    if (m_appCoreState->uiState.state == HomeHibernate)
     {
         for (auto& pButton : m_pButtons)
         {
             if (pButton->wasReleased())
             {
-                setState(Lighting);
+                setState(HomeLighting);
                 break;
             }
         }
@@ -186,39 +189,85 @@ void AppCore::loop()
     {
         if (currentMs - m_appCoreState->uiState.lastOpMs >= HIBERNATE_DELAY)
         {
-            setState(Hibernate);
+            setState(HomeHibernate);
         }
         else
         {
-            if (m_pBtnOk->wasReleased())
+            if (m_appCoreState->uiState.state == HomeLighting)
             {
-                m_appCoreState->uiState.modeSequenceIndex =
-                        (m_appCoreState->uiState.modeSequenceIndex + 1) % MODE_SEQUENCE_COUNT;
-                setState(m_modeSequence[m_appCoreState->uiState.modeSequenceIndex]);
+                if (m_pBtnCancel->wasReleased())
+                {
+                    setState(HomeHibernate);
+                }
+                else if (m_pBtnOk->wasReleased())
+                {
+                    setState(s_menuSequence[0]);
+                }
             }
-            else if (m_pBtnMinus->wasReleased() || m_pBtnPlus->wasReleased())
+            else if (m_appCoreState->uiState.state == MenuWaterSetting || m_appCoreState->uiState.state == MenuHeaterSetting || m_appCoreState->uiState.state == MenuTempTrigger || m_appCoreState->uiState.state == MenuVersion)
             {
-                BoilerItemState* itemState = nullptr;
-                if (m_appCoreState->uiState.state == WaterSetting)
+                if (m_pBtnCancel->wasReleased())
                 {
-                    itemState = &m_appCoreState->appState.water;
+                    setState(HomeLighting);
+                }
+                else if (m_pBtnOk->wasReleased())
+                {
+                    UiStateEnum nextState = m_appCoreState->uiState.state;
+                    if (m_appCoreState->uiState.state == MenuWaterSetting)
+                    {
+                        nextState = MenuWaterSettingEdit;
+                    }
+                    else if (m_appCoreState->uiState.state == MenuHeaterSetting)
+                    {
+                        nextState = MenuHeaterSettingEdit;
+                    }
+                    else if (m_appCoreState->uiState.state == MenuTempTrigger)
+                    {
+                        nextState = MenuTempTriggerEdit;
+                    }
+                    setState(nextState);
                 }
-                else if (m_appCoreState->uiState.state == HeaterSetting)
+                else if (m_pBtnMinus->wasReleased() || m_pBtnPlus->wasReleased())
                 {
-                    itemState = &m_appCoreState->appState.heater;
+                    int idx = 0;
+                    while (m_appCoreState->uiState.state != s_menuSequence[idx])
+                    {
+                        ++idx;
+                    }
+                    auto shift = m_pBtnMinus->wasReleased() ? (-1) : 1;
+                    setState(s_menuSequence[(idx + shift) % ((sizeof(s_menuSequence) / sizeof(*s_menuSequence)))]);
                 }
-
-                if (itemState)
+            }
+            else if (m_appCoreState->uiState.state == MenuWaterSettingEdit || m_appCoreState->uiState.state == MenuHeaterSettingEdit || m_appCoreState->uiState.state == MenuTempTriggerEdit)
+            {
+                if (m_pBtnCancel->wasReleased() || m_pBtnOk->wasReleased())
                 {
-                    if (m_pBtnMinus->wasReleased())
+                    UiStateEnum nextState = m_appCoreState->uiState.state;
+                    if (m_appCoreState->uiState.state == MenuWaterSettingEdit)
                     {
-                        itemState->setting -= TEMP_INTERVAL;
+                        nextState = MenuWaterSetting;
                     }
-                    else if (m_pBtnPlus->wasReleased())
+                    else if (m_appCoreState->uiState.state == MenuHeaterSettingEdit)
                     {
-                        itemState->setting += TEMP_INTERVAL;
+                        nextState = MenuHeaterSetting;
                     }
-                    LOG(1, "Setting temp to %i (%i)", itemState->setting, TEMP_INTERVAL);
+                    else if (m_appCoreState->uiState.state == MenuTempTriggerEdit)
+                    {
+                        nextState = MenuTempTrigger;
+                    }
+
+                    if (m_pBtnOk->wasReleased())
+                    {
+                        *m_appCoreState->appState.pCurrentSettingEdit = m_appCoreState->appState.currentSettingEditTmp;
+                    }
+
+                    m_appCoreState->appState.currentSettingEditTmp = 0;
+                    m_appCoreState->appState.pCurrentSettingEdit = nullptr;
+                    setState(nextState);
+                }
+                else if (m_pBtnMinus->wasReleased() || m_pBtnPlus->wasReleased())
+                {
+                    m_appCoreState->appState.currentSettingEditTmp += (m_pBtnMinus->wasReleased() ? -1 : 1) * TEMP_INTERVAL;
                     m_appCoreState->uiState.isUpdateNeeded = true;
                 }
             }
@@ -240,16 +289,30 @@ void AppCore::setState(
     LOG_FN_BEGIN(1);
     LOG(5, "Changing state %i => %i", m_appCoreState->uiState.state, state);
 
-    if (state == Lighting)
+    if (state == HomeLighting)
     {
         digitalWrite(PIN_LCD_LED, 1);
     }
-    else if (state == Hibernate)
+    else if (state == HomeHibernate)
     {
         digitalWrite(PIN_LCD_LED, 0);
-        m_appCoreState->uiState.modeSequenceIndex = MODE_SEQUENCE_COUNT - 1;
         m_storage.save(*m_appCoreState);
     }
+    else if (state == MenuWaterSettingEdit)
+    {
+        m_appCoreState->appState.currentSettingEditTmp = m_appCoreState->appState.water.setting;
+        m_appCoreState->appState.pCurrentSettingEdit = &m_appCoreState->appState.water.setting;
+    }
+    else if (state == MenuHeaterSettingEdit)
+    {
+        m_appCoreState->appState.currentSettingEditTmp = m_appCoreState->appState.heater.setting;
+        m_appCoreState->appState.pCurrentSettingEdit = &m_appCoreState->appState.heater.setting;
+    }
+    else if (state == MenuTempTriggerEdit)
+    {
+        m_appCoreState->appState.currentSettingEditTmp = m_appCoreState->appState.tempTrigger;
+        m_appCoreState->appState.pCurrentSettingEdit = &m_appCoreState->appState.tempTrigger;
+    }
     m_appCoreState->uiState.state = state;
     m_appCoreState->uiState.isUpdateNeeded = true;
 
@@ -263,7 +326,7 @@ void AppCore::checkBoilerItem(
     LOG_FN_BEGIN(2);
 
     if (!boilerItemState->isActive && boilerItemState->current != TEMP_T_INVALID &&
-        boilerItemState->current <= boilerItemState->setting - TEMP_TRIGGER)
+        boilerItemState->current <= boilerItemState->setting - m_appCoreState->appState.tempTrigger)
     {
         boilerItemState->isActive = true;
         digitalWrite(boilerItemState->pinNo, HIGH);
@@ -307,12 +370,63 @@ void AppCore::printState()
 {
     LOG_FN_BEGIN(2);
 
-    m_pLcd->setCursor(0, 0);
-    printStateLine('S', &m_appCoreState->appState.water, m_appCoreState->uiState.state == WaterSetting,
-                   m_appCoreState->appState.water.isActive);
-    m_pLcd->setCursor(0, 1);
-    printStateLine('C', &m_appCoreState->appState.heater, m_appCoreState->uiState.state == HeaterSetting,
-                   m_appCoreState->appState.heater.isActive);
+    if (m_appCoreState->uiState.state == HomeLighting || m_appCoreState->uiState.state == HomeHibernate)
+    {
+        m_pLcd->setCursor(0, 0);
+        printStateLine('S', &m_appCoreState->appState.water);
+        m_pLcd->setCursor(0, 1);
+        printStateLine('C', &m_appCoreState->appState.heater);
+    }
+    else if (m_appCoreState->uiState.state == MenuWaterSetting || m_appCoreState->uiState.state == MenuHeaterSetting || m_appCoreState->uiState.state == MenuTempTrigger ||
+            m_appCoreState->uiState.state == MenuWaterSettingEdit || m_appCoreState->uiState.state == MenuHeaterSettingEdit || m_appCoreState->uiState.state == MenuTempTriggerEdit)
+    {
+        const auto isEdit = m_appCoreState->uiState.state == MenuWaterSettingEdit || m_appCoreState->uiState.state == MenuHeaterSettingEdit || m_appCoreState->uiState.state == MenuTempTriggerEdit;
+        const char* pTitle = nullptr;
+        temp_t* pTemp = nullptr;
+        if (isEdit)
+        {
+            pTemp = &m_appCoreState->appState.currentSettingEditTmp;
+        }
+        else
+        {
+            if (m_appCoreState->uiState.state == MenuWaterSetting ||
+                m_appCoreState->uiState.state == MenuWaterSettingEdit)
+            {
+                pTitle = "Sanitaire";
+                pTemp = &m_appCoreState->appState.water.setting;
+            }
+            else if (m_appCoreState->uiState.state == MenuHeaterSetting ||
+                     m_appCoreState->uiState.state == MenuHeaterSettingEdit)
+            {
+                pTitle = "Chauffage";
+                pTemp = &m_appCoreState->appState.heater.setting;
+            }
+            else if (m_appCoreState->uiState.state == MenuTempTrigger ||
+                     m_appCoreState->uiState.state == MenuTempTriggerEdit)
+            {
+                pTitle = "Delta";
+                pTemp = &m_appCoreState->appState.tempTrigger;
+            }
+        }
+        char tmpStr[17], tmpTemp[7];
+        m_pLcd->setCursor(0, 0);
+        snprintf(tmpStr, sizeof(tmpStr), "%s :                ", pTitle);
+        m_pLcd->print(tmpStr);
+        m_pLcd->setCursor(0, 1);
+        tempToStr(tmpTemp, *pTemp, 4);
+        snprintf(tmpStr, sizeof(tmpStr), "%s%s C                ", isEdit ? "> " : "  ", tmpTemp);
+        m_pLcd->print(tmpStr);
+    }
+    else if (m_appCoreState->uiState.state == MenuVersion)
+    {
+        char tmpStr[17];
+        m_pLcd->setCursor(0, 0);
+        snprintf(tmpStr, sizeof(tmpStr), "%s :                ", "Version");
+        m_pLcd->print(tmpStr);
+        m_pLcd->setCursor(0, 1);
+        snprintf(tmpStr, sizeof(tmpStr), "%s - %s                ", xstr(APP_CORE_VERSION), xstr(APP_CORE_COMMIT));
+        m_pLcd->print(tmpStr);
+    }
     m_appCoreState->uiState.isUpdateNeeded = false;
 
     LOG_FN_END(2);
@@ -322,8 +436,6 @@ void
 AppCore::printStateLine(
         char prefix
         , const BoilerItemState* boilerItemState
-        , bool isModifying
-        , bool isActive
 )
 {
     LOG_FN_BEGIN(2);
@@ -331,8 +443,7 @@ AppCore::printStateLine(
     char curTmp[7], setTmp[7], tmp[17];
     tempToStr(curTmp, boilerItemState->current, 5);
     tempToStr(setTmp, boilerItemState->setting, 4);
-    int count = snprintf(tmp, sizeof(tmp), "%c:%s [%s]%c%c", prefix, curTmp, setTmp, isModifying ? '<' : ' ',
-                         isActive ? LCD_CHAR_SENSOR : ' ');
+    int count = snprintf(tmp, sizeof(tmp), "%c:%s [%s] %c", prefix, curTmp, setTmp, boilerItemState->isActive ? LCD_CHAR_SENSOR : ' ');
     for (; count < 17; ++count)
     {
         tmp[count] = ' ';

AppCore.h

@@ -10,6 +10,8 @@
 class AppCore
 {
 public:
+    static UiStateEnum s_menuSequence[4];
+
     AppCore();
 
     void setup();
@@ -28,8 +30,6 @@ protected:
     void printStateLine(
             char prefix
             , const BoilerItemState* boilerItemState
-            , bool isModifying
-            , bool isActive
     );
 
     void tempToStr(
@@ -42,8 +42,6 @@ private:
     AppCoreState* m_appCoreState;
     Storage m_storage;
 
-    UiStateEnum m_modeSequence[3];
-
     Button* m_pBtnCancel;
     Button* m_pBtnOk;
     Button* m_pBtnMinus;

Boiler.h

@@ -6,10 +6,15 @@ typedef unsigned long timestamp_t;
 
 enum UiStateEnum
 {
-    Hibernate,
-    Lighting,
-    WaterSetting,
-    HeaterSetting
+    HomeHibernate,
+    HomeLighting,
+    MenuWaterSetting,
+    MenuWaterSettingEdit,
+    MenuHeaterSetting,
+    MenuHeaterSettingEdit,
+    MenuTempTrigger,
+    MenuTempTriggerEdit,
+    MenuVersion
 };
 
 struct BoilerItemState
@@ -26,13 +31,15 @@ struct AppState
     bool hasReadSensors;
     BoilerItemState water;
     BoilerItemState heater;
+    temp_t tempTrigger;
+    temp_t* pCurrentSettingEdit;
+    temp_t currentSettingEditTmp;
 };
 
 struct UiState
 {
     UiStateEnum state;
     timestamp_t lastOpMs;
-    unsigned modeSequenceIndex;
     bool isUpdateNeeded;
 };