Switched to pointers

AppCore.cpp

@@ -56,10 +56,10 @@ AppCore::AppCore()
           , 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}
+          , m_pButtons{m_pBtnOk, m_pBtnMinus, m_pBtnPlus}
+          , m_pLcd(new LiquidCrystal{PIN_LCD_RS, PIN_LCD_ENABLE, PIN_LCD_D4, PIN_LCD_D5, PIN_LCD_D6, PIN_LCD_D7})
+          , m_pOneWire(new OneWire{PIN_ONEWIRE})
+          , m_pSensors(new DallasTemperature{m_pOneWire})
           , m_sensor1{0}
           , m_sensor2{0}
 {
@@ -70,13 +70,13 @@ void AppCore::setup()
     Serial.begin(9600);
     LOG_FN_BEGIN(1);
 
-    m_sensors.begin();
-    LOG(5, "Found %i sensors", m_sensors.getDeviceCount());
-    m_sensors.getAddress(m_sensor1, 0);
-    m_sensors.getAddress(m_sensor2, 1);
-    m_sensors.setWaitForConversion(false);
+    m_pSensors->begin();
+    LOG(5, "Found %i sensors", m_pSensors->getDeviceCount());
+    m_pSensors->getAddress(m_sensor1, 0);
+    m_pSensors->getAddress(m_sensor2, 1);
+    m_pSensors->setWaitForConversion(false);
 
-    for (auto& g_button : m_buttons)
+    for (auto& g_button : m_pButtons)
     {
         g_button->begin();
     }
@@ -90,7 +90,7 @@ void AppCore::setup()
     pinMode(PIN_LCD_LED, OUTPUT);
     digitalWrite(PIN_LCD_LED, 1);
 
-    m_lcd.begin(16, 2);
+    m_pLcd->begin(16, 2);
     byte sensorChar[8] = {
             B00100,
             B01110,
@@ -101,11 +101,11 @@ void AppCore::setup()
             B11111,
             B01110,
     };
-    m_lcd.createChar(LCD_CHAR_SENSOR, sensorChar);
+    m_pLcd->createChar(LCD_CHAR_SENSOR, sensorChar);
 
 
     bool allButtonsPressed = true;
-    for (auto& g_button : m_buttons)
+    for (auto& g_button : m_pButtons)
     {
         g_button->read();
         allButtonsPressed = allButtonsPressed && g_button->isPressed();
@@ -119,13 +119,13 @@ void AppCore::setup()
     {
         LOG(5, "%s: Resetting settings", __FUNCTION__);
         m_storage.save(*m_appCoreState);
-        m_lcd.clear();
-        m_lcd.setCursor(6, 0);
-        m_lcd.print("Reset");
+        m_pLcd->clear();
+        m_pLcd->setCursor(6, 0);
+        m_pLcd->print("Reset");
         bool allButtonsPressed = true;
         while (allButtonsPressed)
         {
-            for (auto& g_button : m_buttons)
+            for (auto& g_button : m_pButtons)
             {
                 g_button->read();
                 allButtonsPressed = allButtonsPressed && g_button->isPressed();
@@ -146,8 +146,8 @@ void AppCore::loop()
     {
         m_appCoreState->appState.lastSensorRequestMs = currentMs;
         m_appCoreState->appState.hasReadSensors = false;
-        m_sensors.requestTemperaturesByAddress(m_sensor1);
-        m_sensors.requestTemperaturesByAddress(m_sensor2);
+        m_pSensors->requestTemperaturesByAddress(m_sensor1);
+        m_pSensors->requestTemperaturesByAddress(m_sensor2);
     }
     if (currentMs - m_appCoreState->appState.lastSensorRequestMs >= SENSORS_REQUEST_DELAY &&
         !m_appCoreState->appState.hasReadSensors)
@@ -160,7 +160,7 @@ void AppCore::loop()
     }
 
 
-    for (auto& pButton : m_buttons)
+    for (auto& pButton : m_pButtons)
     {
         pButton->read();
         if (pButton->isPressed())
@@ -173,7 +173,7 @@ void AppCore::loop()
 
     if (m_appCoreState->uiState.state == Hibernate)
     {
-        for (auto& pButton : m_buttons)
+        for (auto& pButton : m_pButtons)
         {
             if (pButton->wasReleased())
             {
@@ -287,7 +287,7 @@ void AppCore::readAndUpdateSensors(
 {
     LOG_FN_BEGIN(2);
 
-    auto raw = m_sensors.getTempC(sensor);
+    auto raw = m_pSensors->getTempC(sensor);
     temp_t temp = TEMP_T_INVALID;
     if (raw != DEVICE_DISCONNECTED_C)
     {
@@ -307,10 +307,10 @@ void AppCore::printState()
 {
     LOG_FN_BEGIN(2);
 
-    m_lcd.setCursor(0, 0);
+    m_pLcd->setCursor(0, 0);
     printStateLine('S', &m_appCoreState->appState.water, m_appCoreState->uiState.state == WaterSetting,
                    m_appCoreState->appState.water.isActive);
-    m_lcd.setCursor(0, 1);
+    m_pLcd->setCursor(0, 1);
     printStateLine('C', &m_appCoreState->appState.heater, m_appCoreState->uiState.state == HeaterSetting,
                    m_appCoreState->appState.heater.isActive);
     m_appCoreState->uiState.isUpdateNeeded = false;
@@ -338,7 +338,7 @@ AppCore::printStateLine(
         tmp[count] = ' ';
     }
     tmp[count] = 0;
-    m_lcd.print(tmp);
+    m_pLcd->print(tmp);
 
     LOG_FN_END(2);
 }

AppCore.h

@@ -48,12 +48,12 @@ private:
     Button* m_pBtnOk;
     Button* m_pBtnMinus;
     Button* m_pBtnPlus;
-    Button* m_buttons[3];
+    Button* m_pButtons[3];
 
-    LiquidCrystal m_lcd;
+    LiquidCrystal* m_pLcd;
 
-    OneWire m_oneWire;
-    DallasTemperature m_sensors;
+    OneWire* m_pOneWire;
+    DallasTemperature* m_pSensors;
     DeviceAddress m_sensor1;
     DeviceAddress m_sensor2;
 };