Pull status bar into controller, support on ST79x

Author: brentru

src/Wippersnapper.cpp

@@ -423,7 +423,7 @@ bool cbSignalMsg(pb_istream_t *stream, const pb_field_t *field, void **arg) {
       is_success = false;
       WS.pinCfgCompleted = false;
     }
-    // If this is the initial configuration
+    // Is this the initial configuration?
     if (!WS.pinCfgCompleted) {
       WS_DEBUG_PRINTLN("Initial Pin Configuration Complete!");
       WS.pinCfgCompleted = true;
@@ -520,10 +520,10 @@ void publishI2CResponse(wippersnapper_signal_v1_I2CResponse *msgi2cResponse) {
   size_t msgSz;
   pb_get_encoded_size(&msgSz, wippersnapper_signal_v1_I2CResponse_fields,
                       msgi2cResponse);
-  WS_DEBUG_PRINT("Publishing Message: I2CResponse...");
+  WS_DEBUG_PRINTLN("Publishing Message: I2CResponse...");
   if (!WS._mqtt->publish(WS._topic_signal_i2c_device, WS._buffer_outgoing,
-                         msgSz, 1)) {
-    WS_DEBUG_PRINTLN("ERROR: Failed to publish I2C Response!");
+                         msgSz, 0)) {
+    WS_DEBUG_PRINTLN("\tERROR: Failed to publish I2C Response!");
   } else {
     WS_DEBUG_PRINTLN("Published!");
   }
@@ -1579,10 +1579,10 @@ bool cbDecodeDisplayMsg(pb_istream_t *stream, const pb_field_t *field,
     size_t msgSz;
     pb_get_encoded_size(&msgSz, wippersnapper_signal_v1_DisplayResponse_fields,
                         &msgResp);
-    WS_DEBUG_PRINT("Publishing DisplayResponse Message...");
+    WS_DEBUG_PRINTLN("Publishing DisplayResponse Message...");
     if (!WS._mqtt->publish(WS._topic_signal_display_device, WS._buffer_outgoing,
-                           msgSz, 1)) {
-      WS_DEBUG_PRINTLN("ERROR: Failed to DisplayResponse Response!");
+                           msgSz, 0)) {
+      WS_DEBUG_PRINTLN("ERROR: Failed to Publish DisplayResponse!");
     } else {
       WS_DEBUG_PRINTLN("Published!");
     }
@@ -2826,7 +2826,6 @@ void Wippersnapper::connect() {
   WS._analogIO = new Wippersnapper_AnalogIO(5, 3.3);
 
   // Configure hardware
-  // WS.pinCfgCompleted = true;
   while (!WS.pinCfgCompleted) {
     WS_DEBUG_PRINTLN(
         "Polling for message containing hardware configuration...");
@@ -2873,8 +2872,12 @@ void Wippersnapper::publishPinConfigComplete() {
 
   // Publish message
   WS_DEBUG_PRINTLN("Publishing to pin config complete...");
-  WS.publish(WS._topic_device_pin_config_complete, _message_buffer,
-             _message_len, 1);
+  if (!WS._mqtt->publish(WS._topic_device_pin_config_complete, _message_buffer,
+                        _message_len, 0)) {
+    WS_DEBUG_PRINTLN("Failed to publish pin config complete message!");
+  } else {
+    WS_DEBUG_PRINTLN("Published pin config complete message!");
+  }
 }
 
 /**************************************************************************/
@@ -2915,7 +2918,7 @@ ws_status_t Wippersnapper::run() {
   WS.feedWDT();
 
   // Process display controller events, if initialized
-  //WS._displayController->update(getRSSI(), networkStatus() == WS_CONNECTED);
+  WS._displayController->update(getRSSI(), networkStatus() == WS_CONNECTED);
   WS.feedWDT();
 
   return WS_NET_CONNECTED; // TODO: Make this funcn void!

src/Wippersnapper_demo.ino.cpp

@@ -0,0 +1,26 @@
+# 1 "/var/folders/ff/dmzflvf52tq9kzvt6g8jglxw0000gn/T/tmpx8r34gur"
+#include <Arduino.h>
+# 1 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
+# 16 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
+#include "Wippersnapper_Networking.h"
+Wippersnapper_WiFi wipper;
+
+
+#define WS_DEBUG
+void setup();
+void loop();
+#line 22 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
+void setup() {
+
+  wipper.provision();
+
+  Serial.begin(115200);
+
+
+  wipper.connect();
+
+}
+
+void loop() {
+  wipper.run();
+}

src/components/display/controller.cpp

@@ -17,7 +17,9 @@
 /*!
     @brief  Constructs a new DisplayController object
 */
-DisplayController::DisplayController() {}
+DisplayController::DisplayController() {
+  _last_bar_update = 0;
+}
 
 /*!
     @brief  Destructor
@@ -77,6 +79,8 @@ bool DisplayController::Handle_Display_AddOrReplace(
 
   _hw_instances.push_back(display); // Store the display instance
   WS_DEBUG_PRINTLN("[display] Display added or replaced successfully!");
+  WS.feedWDT();
+  WS.runNetFSM();
   return true;
 }
 
@@ -128,19 +132,47 @@ bool DisplayController::Handle_Display_Write(
   WS_DEBUG_PRINT("[display] Writing message to display: ");
   WS_DEBUG_PRINTLN(msgWrite->message);
   display->writeMessage(msgWrite->message);
+  WS.feedWDT();
+  WS.runNetFSM();
   return true;
 }
 
+/*!
+    @brief  Updates the status bar on all managed displays.
+    @param  rssi
+            The current WiFi RSSI value.
+    @param  is_connected
+            The current MQTT connection status.
+*/
 void DisplayController::update(int32_t rssi, bool is_connected) {
   // if _hw_instances is empty, early out
   if (_hw_instances.size() == 0)
     return;
 
+  // Only update the status bar every 60 seconds
+  unsigned long now = millis();
+  if (now - _last_bar_update < 60000)
+      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
-  DisplayHardware *display = nullptr;
-  for (auto &hw_instance : _hw_instances) {
+  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();
 }

src/components/display/controller.h

@@ -40,6 +40,10 @@ 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
 #endif

src/components/display/drivers/dispDrvBase.h

@@ -175,10 +175,6 @@ class dispDrvBase {
   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
-  bool _statusbar_mqtt_connected; ///< MQTT connection status for the status bar
 };
 
 #endif // WS_DISP_DRV_BASE_H

src/components/display/drivers/dispDrvSt7789.h

@@ -107,13 +107,13 @@ class dispDrvSt7789 : public dispDrvBase {
     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, EPD_BLACK);
+      _display->drawBitmap(0, 0, tft_bmp_logo_240135, 240, 135, ST77XX_BLACK);
     } else {
       // Unsupported resolution
       return;
     }
 
-    delay(1000);
+    delay(500);
   }
 
   /*!
@@ -149,7 +149,7 @@ class dispDrvSt7789 : public dispDrvBase {
 
     // Draw username on left side of the status bar
     _display->setTextSize(1);
-    _display->setTextColor(EPD_BLACK);
+    _display->setTextColor(ST77XX_BLACK);
     _display->setCursor(5, 6);
     _display->print(io_username);
 
@@ -162,11 +162,11 @@ class dispDrvSt7789 : public dispDrvBase {
     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, EPD_BLACK);
+                           _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, EPD_BLACK);
+                           _status_bar_icon_sz, ST77XX_BLACK);
       _display->drawBitmap(batteryX, iconY, epd_bmp_bat_full,
-                           _status_bar_icon_sz, _status_bar_icon_sz, EPD_BLACK);
+                           _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 {
@@ -189,7 +189,41 @@ class dispDrvSt7789 : public dispDrvBase {
     if (!_display)
       return;
 
-    // TODO - needs to be implemented!
+      WS_DEBUG_PRINTLN("Updating ST7789 status bar");
+
+      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;
+
+      // 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);
+      if (mqtt_status == 21) {
+        _display->drawBitmap(cloudX, iconY, epd_bmp_cloud_online,
+                             _status_bar_icon_sz, _status_bar_icon_sz, ST77XX_BLACK);
+      } else {
+        _display->drawBitmap(cloudX, iconY, epd_bmp_cloud_offline,
+                             _status_bar_icon_sz, _status_bar_icon_sz, ST77XX_BLACK);
+      }
+
+      // 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);
   }
 
   /*!

src/components/display/drivers/dispDrvThinkInkGrayscale4Eaamfgn.h

@@ -152,7 +152,6 @@ 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
-    if (mqtt_status != _statusbar_mqtt_connected) {
       int iconSpacing = 4;
       int rightMargin = 5;
       int iconY =
@@ -173,12 +172,8 @@ class drvDispThinkInkGrayscale4Eaamfgn : public dispDrvBase {
         _display->drawBitmap(cloudX, iconY, epd_bmp_cloud_offline,
                              STATUS_BAR_ICON_SZ, STATUS_BAR_ICON_SZ, EPD_BLACK);
       }
-      _statusbar_mqtt_connected = mqtt_status;
-      do_update = true;
-    }
 
-    if (do_update)
-      _display->display();
+    _display->display();
   }
 
   /*!

src/components/display/hardware.cpp

@@ -329,46 +329,16 @@ bool DisplayHardware::beginTft(
     miso = parsePin(spi_config->pin_miso);
   }
 
-  // Configure text size based on suffix in driver name
+  // TODO: Implement Text_size based on future Protobuf that includes it
   uint8_t text_sz; // Default text size
-  if (strstr(_name, "-lg") != nullptr) {
-    // Larger text size for displays with -lg suffix
-    text_sz = 4;
-    removeSuffix("-lg");
-  } else if (strstr(_name, "-md") != nullptr) {
-    // Larger text size for displays with -md suffix
-    text_sz = 3;
-    removeSuffix("-md");
-  } else {
-    text_sz = 1;
-  }
 
   // Create display driver object using the factory function
-  WS_DEBUG_PRINTLN("[display] Creating TFT display driver with pinout: ");
-    WS_DEBUG_PRINT("  CS: D");  WS_DEBUG_PRINTLN(cs);
-    WS_DEBUG_PRINT("  DC: D");  WS_DEBUG_PRINTLN(dc);
-    WS_DEBUG_PRINT("  MOSI: D");WS_DEBUG_PRINTLN(mosi);
-    WS_DEBUG_PRINT("  SCK: D"); WS_DEBUG_PRINTLN(sck);
-    if (rst != -1) {
-        WS_DEBUG_PRINT("  RST: D"); WS_DEBUG_PRINTLN(rst);
-    }
-    if (miso != -1) {
-        WS_DEBUG_PRINT("  MISO: D"); WS_DEBUG_PRINTLN(miso);
-    }
   _drvDisp = CreateDrvDispTft(_name, cs, dc, mosi, sck, rst, miso);
   if (!_drvDisp) {
     WS_DEBUG_PRINTLN("[display] Failed to create display driver!");
     return false;
   }
 
-  // Print configuration
-    WS_DEBUG_PRINTLN("[display] Successfully created tft display driver!");
-    WS_DEBUG_PRINTLN("[display] TFT configuration:");
-    WS_DEBUG_PRINT("  Width: "); WS_DEBUG_PRINTLN(config->width);
-    WS_DEBUG_PRINT("  Height: ");WS_DEBUG_PRINTLN(config->height);
-    WS_DEBUG_PRINT("  Rotation: ");WS_DEBUG_PRINTLN(config->rotation);
-    WS_DEBUG_PRINT("  Text Size: ");WS_DEBUG_PRINTLN(text_sz);
-
   _drvDisp->setWidth(config->width);
   _drvDisp->setHeight(config->height);
   _drvDisp->setRotation(config->rotation);

src/components/i2c/WipperSnapper_I2C.cpp

@@ -103,6 +103,8 @@ WipperSnapper_Component_I2C::WipperSnapper_Component_I2C(
     _portNum = msgInitRequest->i2c_port_number;
     _busStatusResponse = wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_SUCCESS;
   }
+
+  WS.runNetFSM();
 }
 
 /*************************************************************/
@@ -1067,6 +1069,7 @@ void WipperSnapper_Component_I2C::updateI2CDeviceProperties(
 
   // set response OK
   _busStatusResponse = wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_SUCCESS;
+  WS.runNetFSM();
 }
 
 /*******************************************************************************/