Fix: Move status bar state to drvBase/drivers, 240x135 logo showing up

brentru · brentru · commit 6e5e4bcc8769 · 2025-10-02T12:03:10.000-04:00
diff --git a/src/components/display/assets/splash.h b/src/components/display/assets/splash.h
diff --git a/src/components/display/controller.cpp b/src/components/display/controller.cpp
@@ -155,24 +155,13 @@ void DisplayController::update(int32_t rssi, bool is_connected) {
       return;
   _last_bar_update = now;
 
-  // Early-out if nothing has changed
-  // and only consider WiFi changes +/-3dB
-  bool rssi_changed = abs(rssi - _statusbar_rssi) >= 3;
-  if (!rssi_changed &&  is_connected == _statusbar_mqtt_connected && 100 == _statusbar_bat) {
-      return;
-  }
-
   // Get the driver instance for the display
   for (DisplayHardware *hw_instance : _hw_instances) {
     // Note: For now, battery is always 100% as we don't have a way to read it
     // yet.
     hw_instance->updateStatusBar(rssi, 100, is_connected);
   }
 
-  // Update the cached status bar values
-  _statusbar_rssi = rssi;
-  _statusbar_mqtt_connected = is_connected;
-  _statusbar_bat = 100; // NOTE: Always 100%, for now
   WS.feedWDT();
   WS.runNetFSM();
 }
diff --git a/src/components/display/controller.h b/src/components/display/controller.h
@@ -40,9 +40,6 @@ class DisplayController {
 private:
   std::vector<DisplayHardware *>
       _hw_instances; ///< Holds pointers to DisplayHardware instances
-  int8_t _statusbar_rssi; ///< RSSI value for status bar
-  uint8_t _statusbar_bat; ///< Battery level, as a percentage, for the status bar
-  bool _statusbar_mqtt_connected; ///< MQTT connection status for the status bar
   unsigned long _last_bar_update; ///< Timestamp of last status bar update
 };
 extern Wippersnapper Ws; ///< Global WS instance
diff --git a/src/components/display/drivers/dispDrvBase.h b/src/components/display/drivers/dispDrvBase.h
@@ -175,6 +175,14 @@ class dispDrvBase {
   int16_t _height;        ///< Height of the display
   int16_t _width;         ///< Width of the display
   uint8_t _rotation;      ///< Rotation of the display
+  // statusbar properties
+  int _statusbar_icons_y; ///< Y position of status bar icons
+  int _statusbar_icon_battery_x; ///< X position of battery icon
+  int _statusbar_icon_wifi_x; ///< X position of WiFi icon
+  int _statusbar_icon_cloud_x; ///< X position of cloud icon
+  int8_t _statusbar_rssi; ///< RSSI value for status bar
+  uint8_t _statusbar_bat; ///< Battery level, as a percentage, for the status bar
+  bool _statusbar_mqtt_connected; ///< MQTT connection status for the status bar
 };
 
 #endif // WS_DISP_DRV_BASE_H
diff --git a/src/components/display/drivers/dispDrvSt7789.h b/src/components/display/drivers/dispDrvSt7789.h
@@ -18,7 +18,13 @@
 #include "dispDrvBase.h"
 #include <Adafruit_ST7789.h>
 
-#define ST7789_TEXT_SZ_DEFAULT 2 ///< Default text size for ST7789 displays
+#define ST7789_TEXT_SZ_DEFAULT 2    ///< Default text size for ST7789 displays
+#define ST7789_STATUSBAR_HEIGHT 20  ///< Default status bar height
+#define ST7789_STATUSBAR_ICON_SZ 16 ///< Default status bar icon size
+#define ST7789_STATUSBAR_ICON_SPACING                                          \
+  4 ///< Default spacing between status bar icons
+#define ST7789_STATUSBAR_ICON_MARGIN                                           \
+  5 ///< Default margin from edge of display to status bar icons
 
 /*!
     @brief  Driver for ST7789-based TFT displays.
@@ -52,8 +58,14 @@ class dispDrvSt7789 : public dispDrvBase {
       delete _display;
       _display = nullptr;
     }
+// Turn off backlight
 #if defined(ARDUINO_FUNHOUSE_ESP32S2)
     digitalWrite(TFT_BACKLIGHT, LOW);
+#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) ||                      \
+    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT) ||                           \
+    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT) ||                        \
+    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT)
+    digitalWrite(TFT_BACKLITE, LOW);
 #endif
   }
 
@@ -73,10 +85,16 @@ class dispDrvSt7789 : public dispDrvBase {
     _display->fillScreen(ST77XX_BLACK);
     _display->setTextColor(ST77XX_WHITE);
 
+    // Turn on backlight
 #if defined(ARDUINO_FUNHOUSE_ESP32S2)
-    // Turn backlight on
     pinMode(TFT_BACKLIGHT, OUTPUT);
     digitalWrite(TFT_BACKLIGHT, HIGH);
+#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) ||                      \
+    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT) ||                           \
+    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT) ||                        \
+    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT)
+    pinMode(TFT_BACKLITE, OUTPUT);
+    digitalWrite(TFT_BACKLITE, HIGH);
 #endif
 
     return true;
@@ -106,8 +124,8 @@ class dispDrvSt7789 : public dispDrvBase {
     // Display the appropriate splash screen based on resolution
     if (_width == 240 && _height == 240) {
       _display->drawBitmap(0, 0, tft_bmp_logo_240240, 240, 240, ST77XX_WHITE);
-    } else if (_width == 240 && _height == 135) {
-      _display->drawBitmap(0, 0, tft_bmp_logo_240135, 240, 135, ST77XX_BLACK);
+    } else if (_width == 135 && _height == 240) {
+      _display->drawBitmap(0, 0, tft_bmp_logo_240135, 240, 135, ST77XX_WHITE);
     } else {
       // Unsupported resolution
       return;
@@ -123,28 +141,11 @@ class dispDrvSt7789 : public dispDrvBase {
     if (!_display)
       return;
 
-    // Configure status bar parameters based on resolution
-    if (_width == 240 && _height == 240) {
-      _status_bar_height = 20;
-      _status_bar_icon_sz = 16;
-      _status_bar_icon_spacing = 4;
-      _status_bar_icon_margin = 5;
-    } else if (_width == 240 && _height == 135) {
-      // TODO: The required icons are not added/implemented for 12px icons
-      _status_bar_height = 16;
-      _status_bar_icon_sz = 12;
-      _status_bar_icon_spacing = 3;
-      _status_bar_icon_margin = 4;
-    } else {
-      // Unsupported resolution
-      return;
-    }
-
     // Clear the entire display buffer to remove splash screen
     _display->fillScreen(ST77XX_BLACK);
 
     // Draw status bar
-    _display->fillRect(0, 0, _display->width(), _status_bar_height,
+    _display->fillRect(0, 0, _display->width(), ST7789_STATUSBAR_HEIGHT,
                        ST77XX_WHITE);
 
     // Draw username on left side of the status bar
@@ -153,26 +154,23 @@ class dispDrvSt7789 : public dispDrvBase {
     _display->setCursor(5, 6);
     _display->print(io_username);
 
-    // Calculate icon positions and center vertically
-    int iconY = (_status_bar_height - _status_bar_icon_sz) / 2;
-    int batteryX =
-        _display->width() - _status_bar_icon_sz - _status_bar_icon_margin;
-    int wifiX = batteryX - _status_bar_icon_sz - _status_bar_icon_spacing;
-    int cloudX = wifiX - _status_bar_icon_sz - _status_bar_icon_spacing;
-    if (_height == 240) {
-      // Draw 16px icons on right side of the status bar
-      _display->drawBitmap(cloudX, iconY, epd_bmp_cloud_online,
-                           _status_bar_icon_sz, _status_bar_icon_sz, ST77XX_BLACK);
-      _display->drawBitmap(wifiX, iconY, epd_bmp_wifi_full, _status_bar_icon_sz,
-                           _status_bar_icon_sz, ST77XX_BLACK);
-      _display->drawBitmap(batteryX, iconY, epd_bmp_bat_full,
-                           _status_bar_icon_sz, _status_bar_icon_sz, ST77XX_BLACK);
-    } else if (_height == 135) {
-      // TODO: Draw 12px icons on right side of the status bar
-    } else {
-      // Unsupported resolution
-      return;
-    }
+    // Calculate icon positions (rightmost side of status bar), center
+    // vertically
+    _statusbar_icons_y = (ST7789_STATUSBAR_HEIGHT - ST7789_STATUSBAR_ICON_SZ) / 2;
+    _statusbar_icon_battery_x = _display->width() - ST7789_STATUSBAR_ICON_SZ -
+                   ST7789_STATUSBAR_ICON_MARGIN;
+    _statusbar_icon_wifi_x = _statusbar_icon_battery_x - ST7789_STATUSBAR_ICON_SZ - ST7789_STATUSBAR_ICON_SPACING;
+    _statusbar_icon_cloud_x = _statusbar_icon_wifi_x - ST7789_STATUSBAR_ICON_SZ - ST7789_STATUSBAR_ICON_SPACING;
+    // Draw icons
+    _display->drawBitmap(_statusbar_icon_cloud_x, _statusbar_icons_y, epd_bmp_cloud_online,
+                         ST7789_STATUSBAR_ICON_SZ, ST7789_STATUSBAR_ICON_SZ,
+                         ST77XX_BLACK);
+    _display->drawBitmap(_statusbar_icon_wifi_x, _statusbar_icons_y, epd_bmp_wifi_full,
+                         ST7789_STATUSBAR_ICON_SZ, ST7789_STATUSBAR_ICON_SZ,
+                         ST77XX_BLACK);
+    _display->drawBitmap(_statusbar_icon_battery_x, _statusbar_icons_y, epd_bmp_bat_full,
+                         ST7789_STATUSBAR_ICON_SZ, ST7789_STATUSBAR_ICON_SZ,
+                         ST77XX_BLACK);
   }
 
   /*!
@@ -189,41 +187,52 @@ class dispDrvSt7789 : public dispDrvBase {
     if (!_display)
       return;
 
-      WS_DEBUG_PRINTLN("Updating ST7789 status bar");
+    // Only update wifi icon if the RSSI has changed significantly (+/-3dB)
+    bool update_rssi = abs(rssi - _statusbar_rssi) >= 3;
+    // Only update cloud icon if MQTT status has changed
+    bool update_mqtt = mqtt_status != _statusbar_mqtt_connected;
 
-      int iconY = (_status_bar_height - _status_bar_icon_sz) / 2;
-      int batteryX = _display->width() - _status_bar_icon_sz - _status_bar_icon_margin;
-      int wifiX = batteryX - _status_bar_icon_sz - _status_bar_icon_spacing;
-      int cloudX = wifiX - _status_bar_icon_sz - _status_bar_icon_spacing;
+    // No need to update if nothing has changed
+    if (!update_rssi && !update_mqtt)
+      return;
 
+    if (update_mqtt) {
       // Clear and draw the new cloud icon, based on MQTT connection status
-      _display->fillRect(cloudX, iconY, _status_bar_icon_sz, _status_bar_icon_sz,
-                         ST77XX_WHITE);
+      _display->fillRect(_statusbar_icon_cloud_x, _statusbar_icons_y, ST7789_STATUSBAR_ICON_SZ,
+                         ST7789_STATUSBAR_ICON_SZ, ST77XX_WHITE);
       if (mqtt_status) {
-        _display->drawBitmap(cloudX, iconY, epd_bmp_cloud_online,
-                             _status_bar_icon_sz, _status_bar_icon_sz, ST77XX_BLACK);
+        _display->drawBitmap(_statusbar_icon_cloud_x, _statusbar_icons_y, epd_bmp_cloud_online,
+                             ST7789_STATUSBAR_ICON_SZ, ST7789_STATUSBAR_ICON_SZ,
+                             ST77XX_BLACK);
       } else {
-        _display->drawBitmap(cloudX, iconY, epd_bmp_cloud_offline,
-                             _status_bar_icon_sz, _status_bar_icon_sz, ST77XX_BLACK);
+        _display->drawBitmap(_statusbar_icon_cloud_x, _statusbar_icons_y, epd_bmp_cloud_offline,
+                             ST7789_STATUSBAR_ICON_SZ, ST7789_STATUSBAR_ICON_SZ,
+                             ST77XX_BLACK);
       }
+      _statusbar_mqtt_connected = mqtt_status;
+    }
 
-      // Update WiFi icon only if RSSI has changed significantly (+/-3dB)
-      const unsigned char* wifi_icon = epd_bmp_wifi_no_signal;
-        if (rssi >= -50) {
-            wifi_icon = epd_bmp_wifi_full;
-        } else if (rssi < -50 && rssi >= -60) {
-            wifi_icon = epd_bmp_wifi_fair;
-        } else if (rssi < -60 && rssi >= -70) {
-            wifi_icon = epd_bmp_wifi_weak;
-        } else if (rssi < -70 && rssi >= -80) {
-            wifi_icon = epd_bmp_wifi_no_signal;
-        } else {
-            wifi_icon = epd_bmp_wifi_no_signal;
-        }
-        // Clear and draw the new WiFi icon, based on RSSI
-        _display->fillRect(wifiX, iconY, _status_bar_icon_sz, _status_bar_icon_sz,
-                           ST77XX_WHITE);
-        _display->drawBitmap(wifiX, iconY, wifi_icon, _status_bar_icon_sz, _status_bar_icon_sz, ST77XX_BLACK);
+    // Update WiFi icon only if RSSI has changed significantly (+/-3dB)
+    if (update_rssi) {
+      const unsigned char *wifi_icon = epd_bmp_wifi_no_signal;
+      if (rssi >= -50) {
+        wifi_icon = epd_bmp_wifi_full;
+      } else if (rssi < -50 && rssi >= -60) {
+        wifi_icon = epd_bmp_wifi_fair;
+      } else if (rssi < -60 && rssi >= -70) {
+        wifi_icon = epd_bmp_wifi_weak;
+      } else if (rssi < -70 && rssi >= -80) {
+        wifi_icon = epd_bmp_wifi_no_signal;
+      } else {
+        wifi_icon = epd_bmp_wifi_no_signal;
+      }
+      // Clear and draw the new WiFi icon, based on RSSI
+      _display->fillRect(_statusbar_icon_wifi_x, _statusbar_icons_y, ST7789_STATUSBAR_ICON_SZ,
+                         ST7789_STATUSBAR_ICON_SZ, ST77XX_WHITE);
+      _display->drawBitmap(_statusbar_icon_wifi_x, _statusbar_icons_y, wifi_icon, ST7789_STATUSBAR_ICON_SZ,
+                           ST7789_STATUSBAR_ICON_SZ, ST77XX_BLACK);
+      _statusbar_rssi = rssi;
+    }
   }
 
   /*!
@@ -240,9 +249,9 @@ class dispDrvSt7789 : public dispDrvBase {
     _display->setTextColor(ST77XX_WHITE);
 
     // Clear only the area below the status bar
-    _display->fillRect(0, _status_bar_height, _width,
-                       _height - _status_bar_height, ST77XX_BLACK);
-    int16_t y_idx = _status_bar_height;
+    _display->fillRect(0, ST7789_STATUSBAR_HEIGHT, _width,
+                       _height - ST7789_STATUSBAR_HEIGHT, ST77XX_BLACK);
+    int16_t y_idx = ST7789_STATUSBAR_HEIGHT;
 
     // Calculate the line height based on the text size (NOTE: base height is
     // 8px)
@@ -285,12 +294,6 @@ class dispDrvSt7789 : public dispDrvBase {
 
 private:
   Adafruit_ST7789 *_display;
-  uint8_t _status_bar_height;  ///< Height of the status bar, in pixels
-  uint8_t _status_bar_icon_sz; ///< Size of status bar icons, in pixels
-  uint8_t
-      _status_bar_icon_spacing; ///< Spacing between status bar icons, in pixels
-  uint8_t
-      _status_bar_icon_margin; ///< Right margin for status bar icons, in pixels
 };
 
 #endif // WS_DISP_DRV_ST7789
diff --git a/src/components/display/drivers/dispDrvThinkInkGrayscale4Eaamfgn.h b/src/components/display/drivers/dispDrvThinkInkGrayscale4Eaamfgn.h
@@ -22,6 +22,8 @@
   20 ///< Height of the status bar in pixels, assumes 16px icons
 #define STATUS_BAR_BORDER 1   ///< Border around the status bar in pixels
 #define STATUS_BAR_ICON_SZ 16 ///< Size of status bar icons in pixels
+#define STATUS_BAR_ICON_SPACING 4 ///< Spacing between status bar icons in pixels
+#define STATUS_BAR_ICON_MARGIN 5 ///< Margin from edge of display to status bar icons in pixels
 
 /*!
     @brief  Driver for a ThinkInk 2.9" Grayscale 4-level EAAMFGN display.
@@ -113,21 +115,17 @@ class drvDispThinkInkGrayscale4Eaamfgn : public dispDrvBase {
     _display->setCursor(5, 6);
     _display->print(io_username);
 
-    // Calculate icon positions and center vertically
-    int iconSpacing = 4;
-    int rightMargin = 5;
-    int iconY =
-        STATUS_BAR_BORDER +
-        ((STATUS_BAR_HEIGHT - 2 * STATUS_BAR_BORDER - STATUS_BAR_ICON_SZ) / 2);
-    int batteryX = _display->width() - STATUS_BAR_ICON_SZ - rightMargin;
-    int wifiX = batteryX - STATUS_BAR_ICON_SZ - iconSpacing;
-    int cloudX = wifiX - STATUS_BAR_ICON_SZ - iconSpacing;
+    // Calculate status bar icon positions and center vertically
+    _statusbar_icons_y = STATUS_BAR_BORDER + ((STATUS_BAR_HEIGHT - 2 * STATUS_BAR_BORDER - STATUS_BAR_ICON_SZ) / 2);
+    _statusbar_icon_battery_x = _display->width() - STATUS_BAR_ICON_SZ - STATUS_BAR_ICON_MARGIN;
+    _statusbar_icon_wifi_x = _statusbar_icon_battery_x - STATUS_BAR_ICON_SZ - STATUS_BAR_ICON_SPACING;
+    _statusbar_icon_cloud_x = _statusbar_icon_wifi_x - STATUS_BAR_ICON_SZ - STATUS_BAR_ICON_SPACING;
     // Draw icons on right side of the status bar
-    _display->drawBitmap(cloudX, iconY, epd_bmp_cloud_online,
+    _display->drawBitmap(_statusbar_icon_cloud_x, _statusbar_icons_y, epd_bmp_cloud_online,
                          STATUS_BAR_ICON_SZ, STATUS_BAR_ICON_SZ, EPD_BLACK);
-    _display->drawBitmap(wifiX, iconY, epd_bmp_wifi_full, STATUS_BAR_ICON_SZ,
+    _display->drawBitmap(_statusbar_icon_wifi_x, _statusbar_icons_y, epd_bmp_wifi_full, STATUS_BAR_ICON_SZ,
                          STATUS_BAR_ICON_SZ, EPD_BLACK);
-    _display->drawBitmap(batteryX, iconY, epd_bmp_bat_full, STATUS_BAR_ICON_SZ,
+    _display->drawBitmap(_statusbar_icon_battery_x, _statusbar_icons_y, epd_bmp_bat_full, STATUS_BAR_ICON_SZ,
                          STATUS_BAR_ICON_SZ, EPD_BLACK);
 
     _display->display();
@@ -152,24 +150,14 @@ class drvDispThinkInkGrayscale4Eaamfgn : public dispDrvBase {
     // For EPD - redraws take 1-2 seconds, so only update the cloud state
 
     // Update cloud icon only if it changed state
-      int iconSpacing = 4;
-      int rightMargin = 5;
-      int iconY =
-          STATUS_BAR_BORDER +
-          ((STATUS_BAR_HEIGHT - 2 * STATUS_BAR_BORDER - STATUS_BAR_ICON_SZ) /
-           2);
-      int batteryX = _display->width() - STATUS_BAR_ICON_SZ - rightMargin;
-      int wifiX = batteryX - STATUS_BAR_ICON_SZ - iconSpacing;
-      int cloudX = wifiX - STATUS_BAR_ICON_SZ - iconSpacing;
-
       // Clear and draw the new cloud icon, based on MQTT connection status
-      _display->fillRect(cloudX, iconY, STATUS_BAR_ICON_SZ, STATUS_BAR_ICON_SZ,
+      _display->fillRect(_statusbar_icon_cloud_x, _statusbar_icons_y, STATUS_BAR_ICON_SZ, STATUS_BAR_ICON_SZ,
                          EPD_WHITE);
       if (mqtt_status == 21) {
-        _display->drawBitmap(cloudX, iconY, epd_bmp_cloud_online,
+        _display->drawBitmap(_statusbar_icon_cloud_x, _statusbar_icons_y, epd_bmp_cloud_online,
                              STATUS_BAR_ICON_SZ, STATUS_BAR_ICON_SZ, EPD_BLACK);
       } else {
-        _display->drawBitmap(cloudX, iconY, epd_bmp_cloud_offline,
+        _display->drawBitmap(_statusbar_icon_cloud_x, _statusbar_icons_y, epd_bmp_cloud_offline,
                              STATUS_BAR_ICON_SZ, STATUS_BAR_ICON_SZ, EPD_BLACK);
       }
 
diff --git a/src/components/display/hardware.cpp b/src/components/display/hardware.cpp
@@ -49,7 +49,7 @@ static const std::map<std::string, FnCreateDispDrvTft> FactoryDrvDispTft = {
         int16_t miso) -> dispDrvBase * {
        return new dispDrvSt7789(cs, dc, mosi, sck, rst, miso);
      }},
-    {"tft-154-wide-angle",
+    {"tft-114",
      [](int16_t cs, int16_t dc, int16_t mosi, int16_t sck, int16_t rst,
         int16_t miso) -> dispDrvBase * {
        return new dispDrvSt7789(cs, dc, mosi, sck, rst, miso);
@@ -341,7 +341,13 @@ bool DisplayHardware::beginTft(
 
   _drvDisp->setWidth(config->width);
   _drvDisp->setHeight(config->height);
+  WS_DEBUG_PRINT("[display] TFT Resolution: ");
+  WS_DEBUG_PRINT(config->width);
+  WS_DEBUG_PRINT("x");
+  WS_DEBUG_PRINTLN(config->height);
   _drvDisp->setRotation(config->rotation);
+  WS_DEBUG_PRINT("[display] TFT Rotation: ");
+  WS_DEBUG_PRINTLN(config->rotation);
   _drvDisp->begin();
 
   return true;
