Draw and update status bar, show splash

Author: brentru

src/Wippersnapper.cpp

@@ -2914,5 +2914,9 @@ ws_status_t Wippersnapper::run() {
   WS._uartComponent->update();
   WS.feedWDT();
 
+  // Process display controller events, if initialized
+  WS._displayController->update();
+  WS.feedWDT();
+
   return WS_NET_CONNECTED; // TODO: Make this funcn void!
 }

src/components/display/assets/icons.h

@@ -0,0 +1,24 @@
+#ifndef _ICONS_H_
+#define _ICONS_H_
+#include <Arduino.h>
+
+const unsigned char epd_bmp_cloud [] PROGMEM = {
+	// 'cloud-thin-full, 16x16px
+	0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x0d, 0xc0, 0x18, 0x78, 0x10, 0x0c, 0x30, 0x04, 0x70, 0x0c, 
+	0xc0, 0x06, 0xc0, 0x03, 0xc0, 0x03, 0x40, 0x03, 0x70, 0x06, 0x3f, 0xfc, 0x00, 0x00, 0x00, 0x00
+};
+
+const unsigned char epd_bmp_wifi [] PROGMEM = {
+	// 'wifi-thin-full, 16x16px
+	0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x3c, 0x3c, 0x70, 0x0e, 0xc0, 0x03, 0x03, 0xc0, 0x0f, 0xf0, 
+	0x1c, 0x38, 0x18, 0x18, 0x00, 0x00, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x00, 0x00, 0x00, 0x00
+};
+
+
+const unsigned char epd_bmp_bat_full [] PROGMEM = {
+	// 'battery-full-thin-full, 16x16px
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfe, 0xc0, 0x06, 0xff, 0xfa, 0xf0, 0x0b, 0xf0, 0x0b, 
+	0xf0, 0x0b, 0xf0, 0x0b, 0xff, 0xfa, 0xc0, 0x06, 0x7f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+#endif // _ICONS_H_

src/components/display/assets/splash.h

@@ -129,4 +129,16 @@ bool DisplayController::Handle_Display_Write(
   WS_DEBUG_PRINTLN(msgWrite->message);
   display->writeMessage(msgWrite->message);
   return true;
+}
+
+void DisplayController::update() {
+  // if _hw_instances is empty, early out
+  if (_hw_instances.size() == 0)
+    return;
+
+  // Get the driver instance for the display
+  DisplayHardware *display = nullptr;
+  for (auto &hw_instance : _hw_instances) {
+    hw_instance->updateStatusBar(WS.getRSSI(), 100, WS.networkStatus());
+  }
 }

src/components/display/controller.cpp

@@ -35,6 +35,7 @@ class DisplayController {
       wippersnapper_display_v1_DisplayAddOrReplace *msgAdd);
   bool Handle_Display_Remove(wippersnapper_display_v1_DisplayRemove *msgRemove);
   bool Handle_Display_Write(wippersnapper_display_v1_DisplayWrite *msgWrite);
+  void update();
 
 private:
   std::vector<DisplayHardware *>

src/components/display/controller.h

@@ -15,9 +15,10 @@
 #ifndef WS_DISP_DRV_BASE_H
 #define WS_DISP_DRV_BASE_H
 
+#include "../assets/icons.h"
+#include "../assets/splash.h"
 #include "Adafruit_ThinkInk.h"
 #include "Wippersnapper.h"
-#include "../assets/splash.h"
 
 /*!
     @brief  Abstract base class for display drivers.
@@ -125,32 +126,54 @@ class dispDrvBase {
   */
   virtual void setTextSize(uint8_t s) { _text_sz = s; }
 
-
   /*!
       @brief  Displays a splash screen on the display.
       @note   This method can be overridden by derived classes to provide
               specific functionality.
   */
-  virtual void showSplash() { // No-op for base class 
+  virtual void showSplash() { // No-op for base class
+  }
+
+  /*!
+    @brief  Draws a status bar at the top of the display.
+    @param io_username
+            The username to display on the status bar.
+    @note   This method can be overridden by derived classes to provide
+            specific functionality.
+  */
+  virtual void drawStatusBar(const char *io_username) {
+    // No-op for base class
   }
 
-  virtual void drawStatusBar() {
+  /*!
+    @brief  Updates the status bar with current information (battery level,
+    connectivity status, etc).
+    @note   This method can be overridden by derived classes to provide
+            specific functionality.
+  */
+  virtual void updateStatusBar(int8_t rssi, uint8_t bat,
+                               ws_status_t mqtt_connected) {
     // No-op for base class
   }
 
 protected:
-  int16_t _pin_dc;      ///< Data/Command pin
-  int16_t _pin_rst;     ///< Reset pin
-  int16_t _pin_cs;      ///< Chip Select pin
-  int16_t _pin_busy;    ///< Optional Busy pin
-  int16_t _pin_sram_cs; ///< Optional EPD SRAM chip select pin
-  uint16_t _pin_mosi;   ///< Optional MOSI pin for SPI TFT displays
-  uint16_t _pin_miso;   ///< Optional MISO pin for SPI TFT displays
-  uint16_t _pin_sck;    ///< Optional SCK pin for SPI TFT displays
-  uint8_t _text_sz = 1; ///< Text size for displaying a message
-  int16_t _height;      ///< Height of the display
-  int16_t _width;       ///< Width of the display
-  uint8_t _rotation;    ///< Rotation of the display
+  int16_t _pin_dc;        ///< Data/Command pin
+  int16_t _pin_rst;       ///< Reset pin
+  int16_t _pin_cs;        ///< Chip Select pin
+  int16_t _pin_busy;      ///< Optional Busy pin
+  int16_t _pin_sram_cs;   ///< Optional EPD SRAM chip select pin
+  uint16_t _pin_mosi;     ///< Optional MOSI pin for SPI TFT displays
+  uint16_t _pin_miso;     ///< Optional MISO pin for SPI TFT displays
+  uint16_t _pin_sck;      ///< Optional SCK pin for SPI TFT displays
+  uint8_t _text_sz = 1;   ///< Text size for displaying a message
+  int16_t _height;        ///< Height of the display
+  int16_t _width;         ///< Width of the display
+  uint8_t _rotation;      ///< Rotation of the display
+  int8_t _statusbar_rssi; ///< RSSI value for status bar
+  uint8_t
+      _statusbar_bat; ///< Battery level, as a percentage, for the status bar
+  ws_status_t
+      _statusbar_mqtt_connected; ///< MQTT connection status for the status bar
 };
 
 #endif // WS_DISP_DRV_BASE_H

src/components/display/drivers/dispDrvBase.h

@@ -79,8 +79,8 @@ class drvDispThinkInkGrayscale4Eaamfgn : public dispDrvBase {
   /*!
       @brief  Displays a splash screen
   */
- virtual void showSplash() override {
-    if (! _display)
+  virtual void showSplash() override {
+    if (!_display)
       return;
     _display->drawBitmap(0, 0, epd_bitmap_ws_logo_296128, 296, 128, EPD_BLACK);
     _display->display();
@@ -90,32 +90,68 @@ class drvDispThinkInkGrayscale4Eaamfgn : public dispDrvBase {
   /*!
       @brief  Draws a status bar at the top of the display.
   */
-  virtual void drawStatusBar() override {
+  virtual void drawStatusBar(const char *io_username) override {
     if (!_display)
       return;
-    _display->clearBuffer();
-    _display->fillScreen(EPD_WHITE);
-    
-    int barHeight = 15;
+
+    // Draw status bar
+    int barHeight = 20; // Assumes 16x16 icons
     int borderWidth = 1;
-    // Black rect outline
-    _display->fillRect(0, 0, _width, barHeight, EPD_BLACK);
-    // White rect inside for icons/text
-    _display->fillRect(borderWidth, borderWidth, 
-                      _width - (2 * borderWidth), 
-                      barHeight - (2 * borderWidth), 
-                      EPD_WHITE);
-
-    // Vertically center text in the bar
-    _display->setTextSize(1);  // Text size 1 = 8 pixels tall
-    int textHeight = 8;
-    int usableHeight = barHeight - (2 * borderWidth);  // 13px usable
-    int textY = borderWidth + (usableHeight - textHeight) / 2;  // = 1 + (13-8)/2 = 3
-    // Draw status text
+    _display->fillRect(0, 0, _display->width(), barHeight, EPD_BLACK);
+    _display->fillRect(borderWidth, borderWidth,
+                       _display->width() - (2 * borderWidth),
+                       barHeight - (2 * borderWidth), EPD_WHITE);
+
+    // Draw username on left side of the status bar
+    _display->setTextSize(1);
     _display->setTextColor(EPD_BLACK);
-    _display->setCursor(5, textY);
-    _display->print("[IO] OK|[WiFi] OK|[Bat] 100%");
-    _display->display();
+    _display->setCursor(5, 6);
+    _display->print(io_username);
+
+    // Calculate icon positions and center vertically
+    int iconSize = 16;
+    int iconSpacing = 4;
+    int rightMargin = 5;
+    int iconY = borderWidth + ((barHeight - 2 * borderWidth - iconSize) / 2);
+    int batteryX = _display->width() - iconSize - rightMargin;
+    int wifiX = batteryX - iconSize - iconSpacing;
+    int cloudX = wifiX - iconSize - iconSpacing;
+    // Draw icons on right side of the status bar
+    _display->drawBitmap(cloudX, iconY, epd_bmp_cloud, iconSize, iconSize,
+                         EPD_BLACK);
+    _display->drawBitmap(wifiX, iconY, epd_bmp_wifi, iconSize, iconSize,
+                         EPD_BLACK);
+    _display->drawBitmap(batteryX, iconY, epd_bmp_bat_full, iconSize, iconSize,
+                         EPD_BLACK);
+  }
+
+  /*!
+    @brief  Updates the status bar with current information (battery level,
+    connectivity status, etc).
+    @param  rssi
+            The current RSSI value to display.
+    @param  bat
+            The current battery level (0-100) to display.
+    @param  mqtt_connected
+            The current MQTT connection status to display.
+  */
+  void updateStatusBar(int8_t rssi, uint8_t bat,
+                       ws_status_t mqtt_connected) override {
+    if (!_display)
+      return;
+
+    if (bat != _statusbar_bat) {
+      // Update battery icon
+      _statusbar_bat = bat;
+    }
+    if (rssi != _statusbar_rssi) {
+      // Update WiFi icon
+      _statusbar_rssi = rssi;
+    }
+    if (mqtt_connected != _statusbar_mqtt_connected) {
+      // Update cloud icon
+      _statusbar_mqtt_connected = mqtt_connected;
+    }
   }
 
   /*!

src/components/display/drivers/dispDrvThinkInkGrayscale4Eaamfgn.h

@@ -262,14 +262,22 @@ bool DisplayHardware::beginEPD(
 
 void DisplayHardware::showSplash() {
   if (!_drvDisp)
-    return; 
+    return;
   _drvDisp->showSplash();
 }
 
-void DisplayHardware::drawStatusBar() {
-  _drvDisp->drawStatusBar();
+void DisplayHardware::drawStatusBar(const char *io_username) {
+  if (!_drvDisp)
+    return;
+  _drvDisp->drawStatusBar(const char *io_username);
 }
 
+void DisplayHardware::updateStatusBar(int8_t rssi, uint8_t bat,
+                                      ws_status_t mqtt_connected) {
+  if (!_drvDisp)
+    return;
+  _drvDisp->updateStatusBar(rssi, bat, mqtt_connected);
+}
 
 /*!
     @brief  Removes a suffix from the hardware instance name, if it exists.

src/components/display/hardware.cpp

@@ -44,9 +44,9 @@ class DisplayHardware {
   bool beginTft(wippersnapper_display_v1_TftConfig *config,
                 wippersnapper_display_v1_TftSpiConfig *spi_config);
 
-
   void showSplash();
-  void drawStatusBar();
+  void drawStatusBar(const char *io_username);
+  void updateStatusBar(int8_t rssi, uint8_t bat, ws_status_t mqtt_connected);
   //
   // API for Adafruit_GFX that abstracts hardware functionality
   // NOTE: These methods are meant to be implemented within dispDrvBase and

src/components/display/hardware.h

@@ -8,7 +8,7 @@
  * please support Adafruit and open-source hardware by purchasing
  * products from Adafruit!
  *
- * Copyright (c) Brent Rubell 2020-2024 for Adafruit Industries.
+ * Copyright (c) Brent Rubell 2020-2025 for Adafruit Industries.
  *
  * MIT license, all text here must be included in any redistribution.
  *