fix: resolve all build and lint errors on main refactoring (#22)

Author: stritti

platformio.ini

@@ -34,11 +34,11 @@ lib_deps =
 build_flags =
 	${env.build_flags}
 	; FW_VERSION is auto-maintained by release-please — do not edit manually
-	'-D FW_VERSION="0.1.0"'  # x-release-please-version
-	'-D GITHUB_REPO="smart-swimmingpool/monitor"'
+	'-DFW_VERSION="0.1.0"'
+	'-DGITHUB_REPO="smart-swimmingpool/monitor"'
 	-D SERIAL_SPEED=${common.serial_speed}
 	-D LILYGO_T5_V231
-	-std=c++17
+	-std=gnu++11
 	-Wno-deprecated-declarations
 upload_speed = ${common.serial_speed}
 monitor_speed = ${common.serial_speed}

src/PoolMonitor/Config.hpp

@@ -60,7 +60,7 @@ constexpr std::uint8_t PIN_ELINK_SS{5};
 /** @brief SPI MOSI pin for display. */
 constexpr std::uint8_t PIN_SPI_MOSI{23};
 /** @brief SPI MISO pin for display (not used). */
-constexpr std::uint8_t PIN_SPI_MISO{-1};
+constexpr std::int8_t PIN_SPI_MISO{-1};
 /** @brief SPI CLK pin for display. */
 constexpr std::uint8_t PIN_SPI_CLK{18};
 
@@ -73,8 +73,10 @@ constexpr std::uint8_t PIN_LED_BUILTIN{2};
 /** @brief Device name for mDNS and MQTT client ID. */
 constexpr const char* DEVICE_NAME{"pool-monitor"};
 
-/** @brief GitHub repository for OTA updates. */
+/** @brief GitHub repository for OTA updates (provided via -D build flag). */
+#ifndef GITHUB_REPO
 constexpr const char* GITHUB_REPO{"smart-swimmingpool/monitor"};
+#endif
 
 // Serial speed - provided as build flag from platformio.ini
 #ifndef SERIAL_SPEED

src/PoolMonitor/DisplayManager.cpp

@@ -9,29 +9,20 @@
 #include "Config.hpp"
 #include "../Version.h"
 
-// Include the appropriate display driver based on board definition
-#if defined(LILYGO_T5_V231)
-#include <GxDEPG0213BN.h>
-#else
-#include <GxGDE0213B1.h>
-#endif
-
 namespace PoolMonitor {
 
 // Initialize static members
-#if defined(LILYGO_T5_V231)
-GxDEPG0213BN DisplayManager::display_(GxEPD::GxEPD_Class::GxEPD_213_BN);
-#else
-GxGDE0213B1 DisplayManager::display_(GxEPD::GxEPD_Class::GxEPD_213_B1);
-#endif
-U8G2_FOR_ADAFRUIT_GFX DisplayManager::u8g2_for_adafruit_gfx_(DisplayManager::display_);
+GxIO_Class DisplayManager::io_(SPI, PIN_ELINK_SS, PIN_ELINK_DC, PIN_SPI_CLK);
+GxEPD_Class DisplayManager::display_(DisplayManager::io_, PIN_ELINK_RESET,
+                                     PIN_ELINK_BUSY);
+U8G2_FOR_ADAFRUIT_GFX DisplayManager::u8g2_for_adafruit_gfx_;
 
 bool DisplayManager::begin() {
   Serial.println("🖥️\tInitializing display...");
-  
+
   display_.init();
   u8g2_for_adafruit_gfx_.begin(display_);
-  
+
   return true;
 }
 
@@ -48,12 +39,12 @@ void DisplayManager::displayText(const char* text, int16_t y, uint8_t align, int
       x = display_.width() / 2 + xOffset;
       break;
   }
-  
-  int16_t textWidth = 0;
-  int16_t textHeight = 0;
-  display_.getTextBounds(text, 0, 0, &x, &y, &textWidth, &textHeight);
-  
-  int16_t cursorY = y - textHeight / 2;
+
+  int16_t x1 = 0, y1 = 0;
+  uint16_t textWidth = 0, textHeight = 0;
+  display_.getTextBounds(text, 0, 0, &x1, &y1, &textWidth, &textHeight);
+
+  int16_t cursorY = y - static_cast<int16_t>(textHeight) / 2;
   display_.setCursor(x, cursorY);
   display_.print(text);
 }
@@ -73,21 +64,21 @@ void DisplayManager::initDisplay() {
   // Draw pool icon
   u8g2_for_adafruit_gfx_.setFont(u8g2_font_streamline_all_t);
   u8g2_for_adafruit_gfx_.drawGlyph(4, 50, 0x02a6); /* hex pool */
-  
+
   display_.setFont(&FreeSans12pt7b);
   displayText("     Pool:", 50, GxEPD_ALIGN_LEFT);
 
   // Draw solar icon
   u8g2_for_adafruit_gfx_.setFont(u8g2_font_streamline_ecology_t);
   u8g2_for_adafruit_gfx_.drawGlyph(4, 94, 0x003E); /* hex 3E solar panel */
-  
+
   display_.setFont(&FreeSans12pt7b);
   displayText("     Solar:", 94, GxEPD_ALIGN_LEFT);
 
   // Draw separator lines
   display_.drawLine(0, 102, display_.width(), 102, GxEPD_BLACK);
   display_.drawLine(0, 103, display_.width(), 103, GxEPD_BLACK);
-  
+
   display_.setFont(&FreeSans9pt7b);
   displayText("www.smart-swimmingpool.com", 117, GxEPD_ALIGN_LEFT);
 
@@ -100,7 +91,7 @@ void DisplayManager::initDisplay() {
   fullUpdate();
 }
 
-void DisplayManager::updateDisplay(float poolTemp, float solarTemp, bool poolPumpOn, 
+void DisplayManager::updateDisplay(float poolTemp, float solarTemp, bool poolPumpOn,
                                    bool solarPumpOn, const char* mode, const char* lastUpdate) {
   Serial.println("🖥️\tUpdating display");
 
@@ -123,7 +114,7 @@ void DisplayManager::updateDisplay(float poolTemp, float solarTemp, bool poolPum
 
   display_.setTextColor(GxEPD_BLACK);
   display_.setFont(&FreeSansBold24pt7b);
-  
+
   // Pool temperature
   snprintf(buffer, sizeof(buffer), "%2.1f C", poolTemp);
   displayText(buffer, 50, GxEPD_ALIGN_RIGHT);
@@ -176,7 +167,7 @@ uint16_t DisplayManager::getHeight() {
   return display_.height();
 }
 
-auto DisplayManager::getDisplay() -> GxEPD::GxEPD_Class& {
+auto DisplayManager::getDisplay() -> GxEPD_Class& {
   return display_;
 }
 

src/PoolMonitor/DisplayManager.hpp

@@ -11,10 +11,40 @@
 #pragma once
 
 #include <Arduino.h>
+#include <GxIO/GxIO_SPI/GxIO_SPI.h>
 #include <GxEPD.h>
+#include <SPI.h>
 #include <U8g2_for_Adafruit_GFX.h>
 #include "Config.hpp"
 
+// Include the appropriate display driver based on board definition
+#if defined(LILYGO_T5_V231)
+#include <GxDEPG0213BN/GxDEPG0213BN.h>
+#else
+#include <GxGDE0213B1/GxGDE0213B1.h>
+#endif
+
+// FreeFonts from Adafruit_GFX
+#include <Fonts/FreeMono9pt7b.h>
+#include <Fonts/FreeMonoBold9pt7b.h>
+#include <Fonts/FreeSans9pt7b.h>
+#include <Fonts/FreeSansBold9pt7b.h>
+#include <Fonts/FreeSans12pt7b.h>
+#include <Fonts/FreeSansBold12pt7b.h>
+#include <Fonts/FreeSans24pt7b.h>
+#include <Fonts/FreeSansBold24pt7b.h>
+
+// U8g2 font declarations for icons
+extern const uint8_t u8g2_font_streamline_all_t[] U8G2_FONT_SECTION("u8g2_font_streamline_all_t");
+extern const uint8_t u8g2_font_streamline_ecology_t[] U8G2_FONT_SECTION("u8g2_font_streamline_ecology_t");
+
+// Text alignment constants (replaces the anonymous enum from u8g2_display.h)
+enum {
+  GxEPD_ALIGN_RIGHT,
+  GxEPD_ALIGN_LEFT,
+  GxEPD_ALIGN_CENTER,
+};
+
 namespace PoolMonitor {
 
 /**
@@ -24,7 +54,7 @@ namespace PoolMonitor {
  * and dynamic content updates (temperatures, pump status, etc.).
  */
 class DisplayManager {
-public:
+ public:
   DisplayManager() = default;
 
   /**
@@ -47,7 +77,7 @@ class DisplayManager {
    * @param mode Operation mode string.
    * @param lastUpdate Time string for last update.
    */
-  static void updateDisplay(float poolTemp, float solarTemp, bool poolPumpOn, 
+  static void updateDisplay(float poolTemp, float solarTemp, bool poolPumpOn,
                            bool solarPumpOn, const char* mode, const char* lastUpdate);
 
   /** @brief Power down the display. */
@@ -63,30 +93,25 @@ class DisplayManager {
   static uint16_t getHeight();
 
   /** @brief Get reference to the display instance. */
-  static auto getDisplay() -> GxEPD::GxEPD_Class&;
+  static auto getDisplay() -> GxEPD_Class&;
 
   /** @brief Get reference to the u8g2 instance. */
   static auto getU8g2() -> U8G2_FOR_ADAFRUIT_GFX&;
 
-private:
-  // Display type selection based on board definition
-  #if defined(LILYGO_T5_V231)
-  static GxDEPG0213BN display_;
-  #else
-  static GxGDE0213B1 display_;
-  #endif
-
-  static U8G2_FOR_ADAFRUIT_GFX u8g2_for_adafruit_gfx_;
-
   /**
    * @brief Draw text on display with alignment.
    * @param text Text to draw.
    * @param y Y position (baseline).
    * @param align Alignment (GxEPD_ALIGN_LEFT, RIGHT, CENTER).
    * @param xOffset X offset from alignment position.
    */
-  static void displayText(const char* text, int16_t y, uint8_t align = GxEPD_ALIGN_LEFT, 
+  static void displayText(const char* text, int16_t y, uint8_t align = GxEPD_ALIGN_LEFT,
                          int16_t xOffset = 0);
+
+ private:
+  static GxIO_Class io_;
+  static GxEPD_Class display_;
+  static U8G2_FOR_ADAFRUIT_GFX u8g2_for_adafruit_gfx_;
 };
 
 }  // namespace PoolMonitor