Refactor out i2c_output work, bring in new display elements as i2c outputs!

Author: brentru

src/Wippersnapper.cpp

@@ -834,25 +834,6 @@ bool cbDecodeSignalRequestI2C(pb_istream_t *stream, const pb_field_t *field,
     if (!encodeI2CResponse(&msgi2cResponse)) {
       return false;
     }
-  } else if (field->tag ==
-             wippersnapper_signal_v1_I2CRequest_req_i2c_device_out_write_tag) {
-    WS_DEBUG_PRINTLN("[app] I2C Device Output Write");
-    // Decode stream into an I2CDeviceDeinitRequest
-    wippersnapper_i2c_v1_I2CDeviceOutputWrite msgDeviceWrite =
-        wippersnapper_i2c_v1_I2CDeviceOutputWrite_init_zero;
-    // Decode stream into struct, msgI2CDeviceDeinitRequest
-    if (!ws_pb_decode(stream, wippersnapper_i2c_v1_I2CDeviceOutputWrite_fields,
-                      &msgDeviceWrite)) {
-      WS_DEBUG_PRINTLN(
-          "[app] ERROR: Failed decoding I2CDeviceOutputWrite message.");
-      return false;
-    }
-
-    if (!WS._i2cPort0->Handle_I2cDeviceOutputWrite(&msgDeviceWrite)) {
-      WS_DEBUG_PRINTLN("[app] ERROR: Failed to write to I2C output device.");
-      return false; // fail out if we can't decode, we don't have a response to
-                    // publish
-    }
     WS_DEBUG_PRINTLN("[app] I2C Device Output Write Done");
     return true; // we successfully wrote to the device, this subtype has no
                  // response to publish to IO

src/components/display/controller.cpp

@@ -51,11 +51,26 @@ bool DisplayController::Handle_Display_AddOrReplace(
   if (msgAdd->which_config ==
       wippersnapper_display_v1_DisplayAddOrReplace_config_epd_tag) {
     did_begin = display->beginEPD(&msgAdd->config.config_epd,
-                                  &msgAdd->interface_type.spi_epd);
+                                  &msgAdd->interface_type.cfg_spi);
   } else if (msgAdd->which_config ==
              wippersnapper_display_v1_DisplayAddOrReplace_config_tft_tag) {
     did_begin = display->beginTft(&msgAdd->config.config_tft,
-                                  &msgAdd->interface_type.spi_tft);
+                                  &msgAdd->interface_type.cfg_spi);
+  } else if (msgAdd->which_config ==
+             wippersnapper_display_v1_DisplayAddOrReplace_config_ssd1306_tag) {
+    did_begin = display->beginOled(&msgAdd->config.config_ssd1306,
+                                   &msgAdd->interface_type.cfg_i2c);
+  } else if (
+      msgAdd->which_config ==
+      wippersnapper_display_v1_DisplayAddOrReplace_config_led_backpack_tag) {
+    WS_DEBUG_PRINTLN("[display] LED Backpack support coming soon!");
+    delete display;
+    return false;
+  } else if (msgAdd->which_config ==
+             wippersnapper_display_v1_DisplayAddOrReplace_config_char_lcd_tag) {
+    WS_DEBUG_PRINTLN("[display] Character LCD support coming soon!");
+    delete display;
+    return false;
   } else {
     WS_DEBUG_PRINTLN("[display] Unsupported display configuration type!");
     delete display;

src/components/display/hardware.cpp

@@ -173,9 +173,8 @@ int16_t DisplayHardware::parsePin(const char *pinStr) {
             Pointer to the SPI configuration structure for EPD.
     @return True if configuration was successful, False otherwise.
 */
-bool DisplayHardware::beginEPD(
-    wippersnapper_display_v1_EPDConfig *config,
-    wippersnapper_display_v1_EpdSpiConfig *spi_config) {
+bool DisplayHardware::beginEPD(wippersnapper_display_v1_EPDConfig *config,
+                               wippersnapper_display_v1_SpiConfig *spi_config) {
   // Validate pointers
   if (config == nullptr || spi_config == nullptr) {
     WS_DEBUG_PRINTLN("[display] EPD config or SPI config is null!");
@@ -273,9 +272,8 @@ void DisplayHardware::removeSuffix(const char *suffix) {
             Pointer to the SPI configuration structure for TFT.
     @return True if configuration was successful, False otherwise.
 */
-bool DisplayHardware::beginTft(
-    wippersnapper_display_v1_TftConfig *config,
-    wippersnapper_display_v1_TftSpiConfig *spi_config) {
+bool DisplayHardware::beginTft(wippersnapper_display_v1_TftConfig *config,
+                               wippersnapper_display_v1_SpiConfig *spi_config) {
   // Validate pointers
   if (config == nullptr || spi_config == nullptr) {
     WS_DEBUG_PRINTLN("[display] EPD config or SPI config is null!");
@@ -333,6 +331,65 @@ bool DisplayHardware::beginTft(
   return true;
 }
 
+/*!
+    @brief  Attempts to configure and initialize an OLED display
+    @param  config
+            Pointer to the OLED's configuration structure.
+    @param  i2c_config
+            Pointer to the I2C configuration structure for OLED.
+    @return True if configuration was successful, False otherwise.
+*/
+bool DisplayHardware::beginOled(
+    wippersnapper_display_v1_SSD1306Config *config,
+    wippersnapper_display_v1_I2cConfig *i2c_config) {
+  // Validate pointers
+  if (config == nullptr || i2c_config == nullptr || !i2c_config->has_i2c) {
+    WS_DEBUG_PRINTLN("[display] OLED or I2C config is null!");
+    return false;
+  }
+
+  // If we already have a display driver assigned to this hardware instance,
+  // clean it up!
+  if (_drvDisp) {
+    delete _drvDisp;
+    _drvDisp = nullptr;
+  }
+
+  if (strnlen(i2c_config->i2c.i2c_device_name,
+              sizeof(i2c_config->i2c.i2c_device_name)) <
+          sizeof(i2c_config->i2c.i2c_device_name) &&
+      strcmp(i2c_config->i2c.i2c_device_name, "SSD1306") == 0) {
+    _drvDisp = new dispDrvSsd1306(WS._i2cPort0->getBus(),
+                                  i2c_config->i2c.i2c_device_address);
+  } else {
+    WS_DEBUG_PRINTLN("[display] Unsupported OLED driver!");
+    return false;
+  }
+
+  // Validate that the display driver was created successfully
+  if (!_drvDisp) {
+    WS_DEBUG_PRINTLN("[display] Failed to create display driver!");
+    _drvDisp = nullptr;
+    return false;
+  }
+
+  // Configure display dimensions and text size
+  _drvDisp->setWidth(config->width);
+  _drvDisp->setHeight(config->height);
+  // tODO: Remove the ssd-1306 -specic text size setters
+  // _drvDisp->setTextSize(config->text_size);
+
+  // Initialize the display driver
+  if (!_drvDisp->begin()) {
+    WS_DEBUG_PRINTLN("[display] Failed to begin display driver!");
+    delete _drvDisp;
+    _drvDisp = nullptr;
+    return false;
+  }
+
+  return true;
+}
+
 /*!
     @brief  Gets the name of the display hardware instance.
     @return The name of the display hardware instance.

src/components/display/hardware.h

@@ -16,6 +16,7 @@
 #define WS_DISPLAY_HARDWARE_H
 #include "Wippersnapper.h"
 #include "drivers/dispDrvBase.h"
+#include "drivers/dispDrvSsd1306.h"
 #include "drivers/dispDrvSt7789.h"
 #include "drivers/dispDrvThinkInkGrayscale4Eaamfgn.h"
 #include "drivers/dispDrvThinkInkGrayscale4T5.h"
@@ -40,10 +41,11 @@ class DisplayHardware {
   void setType(wippersnapper_display_v1_DisplayType type);
   wippersnapper_display_v1_DisplayType getType();
   bool beginEPD(wippersnapper_display_v1_EPDConfig *config,
-                wippersnapper_display_v1_EpdSpiConfig *spi_config);
+                wippersnapper_display_v1_SpiConfig *spi_config);
   bool beginTft(wippersnapper_display_v1_TftConfig *config,
-                wippersnapper_display_v1_TftSpiConfig *spi_config);
-  // TODO: bool beginOled(...);
+                wippersnapper_display_v1_SpiConfig *spi_config);
+  bool beginOled(wippersnapper_display_v1_SSD1306Config *config,
+                 wippersnapper_display_v1_I2cConfig *i2c_config);
 
   //
   // API for Adafruit_GFX that abstracts hardware functionality