Added relays and cancel button; Renamed mode button to ok

AppCore.cpp

@@ -9,7 +9,10 @@
 #define LCD_CHAR_SENSOR 1
 
 #define PIN_ONEWIRE A0
-#define PIN_BTN_MODE 10
+#define PIN_RELAY1 A1
+#define PIN_RELAY2 A2
+#define PIN_BTN_CANCEL 9
+#define PIN_BTN_OK 10
 #define PIN_BTN_MINUS 11
 #define PIN_BTN_PLUS 12
 #define PIN_LCD_LED 2
@@ -31,12 +34,14 @@ AppCore::AppCore()
                 .water = {
                         .current = TEMP_T_INVALID,
                         .setting = 0,
-                        .isActive = false
+                        .isActive = false,
+                        .pinNo = PIN_RELAY1
                 },
                 .heater = {
                         .current = TEMP_T_INVALID,
                         .setting = 0,
-                        .isActive = false
+                        .isActive = false,
+                        .pinNo = PIN_RELAY2
                 }
         },
         .uiState = {
@@ -47,10 +52,11 @@ AppCore::AppCore()
         }
 })
           , m_modeSequence{WaterSetting, HeaterSetting, Lighting}
-          , m_btnMode{PIN_BTN_MODE}
-          , m_btnMinus{PIN_BTN_MINUS}
-          , m_btnPlus{PIN_BTN_PLUS}
-          , m_buttons{&m_btnMode, &m_btnMinus, &m_btnPlus}
+          , m_pBtnCancel(new Button{PIN_BTN_CANCEL})
+          , m_pBtnOk(new Button{PIN_BTN_OK})
+          , m_pBtnMinus(new Button{PIN_BTN_MINUS})
+          , m_pBtnPlus(new Button{PIN_BTN_PLUS})
+          , m_buttons{m_pBtnOk, m_pBtnMinus, m_pBtnPlus}
           , m_lcd{PIN_LCD_RS, PIN_LCD_ENABLE, PIN_LCD_D4, PIN_LCD_D5, PIN_LCD_D6, PIN_LCD_D7}
           , m_oneWire{PIN_ONEWIRE}
           , m_sensors{&m_oneWire}
@@ -75,6 +81,12 @@ void AppCore::setup()
         g_button->begin();
     }
 
+    pinMode(PIN_RELAY1, OUTPUT);
+    digitalWrite(PIN_RELAY1, LOW);
+
+    pinMode(PIN_RELAY2, OUTPUT);
+    digitalWrite(PIN_RELAY2, LOW);
+
     pinMode(PIN_LCD_LED, OUTPUT);
     digitalWrite(PIN_LCD_LED, 1);
 
@@ -178,13 +190,13 @@ void AppCore::loop()
         }
         else
         {
-            if (m_btnMode.wasReleased())
+            if (m_pBtnOk->wasReleased())
             {
                 m_appCoreState->uiState.modeSequenceIndex =
                         (m_appCoreState->uiState.modeSequenceIndex + 1) % MODE_SEQUENCE_COUNT;
                 setState(m_modeSequence[m_appCoreState->uiState.modeSequenceIndex]);
             }
-            else if (m_btnMinus.wasReleased() || m_btnPlus.wasReleased())
+            else if (m_pBtnMinus->wasReleased() || m_pBtnPlus->wasReleased())
             {
                 BoilerItemState* itemState = nullptr;
                 if (m_appCoreState->uiState.state == WaterSetting)
@@ -198,11 +210,11 @@ void AppCore::loop()
 
                 if (itemState)
                 {
-                    if (m_btnMinus.wasReleased())
+                    if (m_pBtnMinus->wasReleased())
                     {
                         itemState->setting -= TEMP_INTERVAL;
                     }
-                    else if (m_btnPlus.wasReleased())
+                    else if (m_pBtnPlus->wasReleased())
                     {
                         itemState->setting += TEMP_INTERVAL;
                     }
@@ -254,12 +266,14 @@ void AppCore::checkBoilerItem(
         boilerItemState->current <= boilerItemState->setting - TEMP_TRIGGER)
     {
         boilerItemState->isActive = true;
+        digitalWrite(boilerItemState->pinNo, HIGH);
         m_appCoreState->uiState.isUpdateNeeded = true;
     }
     else if (boilerItemState->isActive &&
              (boilerItemState->current == TEMP_T_INVALID || boilerItemState->current >= boilerItemState->setting))
     {
         boilerItemState->isActive = false;
+        digitalWrite(boilerItemState->pinNo, LOW);
         m_appCoreState->uiState.isUpdateNeeded = true;
     }
 

AppCore.h

@@ -44,9 +44,10 @@ private:
 
     UiStateEnum m_modeSequence[3];
 
-    Button m_btnMode;
-    Button m_btnMinus;
-    Button m_btnPlus;
+    Button* m_pBtnCancel;
+    Button* m_pBtnOk;
+    Button* m_pBtnMinus;
+    Button* m_pBtnPlus;
     Button* m_buttons[3];
 
     LiquidCrystal m_lcd;

Boiler.h

@@ -17,6 +17,7 @@ struct BoilerItemState
     temp_t current;
     temp_t setting;
     bool isActive;
+    int pinNo;
 };
 
 struct AppState