Revert all changes after bfb1d3a

Author: brentru

src/Wippersnapper.cpp

@@ -834,6 +834,25 @@ 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,26 +51,11 @@ 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.cfg_spi);
+                                  &msgAdd->interface_type.spi_epd);
   } else if (msgAdd->which_config ==
              wippersnapper_display_v1_DisplayAddOrReplace_config_tft_tag) {
     did_begin = display->beginTft(&msgAdd->config.config_tft,
-                                  &msgAdd->interface_type.cfg_spi);
-  } else if (msgAdd->which_config ==
-             wippersnapper_display_v1_DisplayAddOrReplace_config_oled_tag) {
-    did_begin = display->beginOled(&msgAdd->config.config_oled,
-                                   &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;
+                                  &msgAdd->interface_type.spi_tft);
   } else {
     WS_DEBUG_PRINTLN("[display] Unsupported display configuration type!");
     delete display;

src/components/display/drivers/dispDrvBase.h

@@ -63,17 +63,6 @@ class dispDrvBase {
       : _pin_cs(cs), _pin_dc(dc), _pin_mosi(mosi), _pin_sck(sck), _pin_rst(rst),
         _pin_miso(miso) {}
 
-  /*!
-      @brief    Creates a new I2C output component driver.
-      @param    i2c
-                The I2C hardware interface, default is Wire.
-      @param    sensorAddress
-                The I2C sensor's unique address.
-  */
-  dispDrvBase(TwoWire *i2c, uint16_t sensorAddress) {
-    // No-op constructor
-  }
-
   /*!
       @brief  Destructor for the base display driver.
               This destructor is virtual to allow derived classes to clean up
@@ -124,7 +113,7 @@ class dispDrvBase {
       @param  r
               The rotation of the display (0-3).
   */
-  virtual void setRotation(uint8_t r) { _rotation = r; }
+  void setRotation(uint8_t r) { _rotation = r; }
 
   /*!
       @brief  Sets the text size for the display.
@@ -135,42 +124,19 @@ class dispDrvBase {
   */
   virtual void setTextSize(uint8_t s) { _text_sz = s; }
 
-  /*!
-      @brief  Sets the brightness for the display (if supported).
-      @param  brightness
-              The brightness level to set.
-      @note   This method can be overridden by derived classes to provide
-              specific functionality.
-  */
-  virtual void setBrightness(int32_t brightness) { _brightness = brightness; }
-
-  /*!
-      @brief  Sets the alignment for the display (if supported).
-      @param  alignment
-              The alignment to set.
-      @note   This method can be overridden by derived classes to provide
-              specific functionality.
-  */
-  virtual void setAlignment(uint32_t alignment) { _alignment = alignment; }
-
 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
-  TwoWire *_i2c;           ///< Optional pointer to the I2C driver's Wire object
-  uint16_t _sensorAddress; ///< Optional I2C sensor address
-  uint8_t _text_sz = 1;    ///< Optional Text size for displaying a message
-  int16_t _height;         ///< Optional Height of the display
-  int16_t _width;          ///< Optional Width of the display
-  uint8_t _rotation;       ///< Optional Rotation of the display
-  int32_t _brightness; ///< Optional Brightness of the display (if supported)
-  uint32_t _alignment; ///< Optional Alignment of the display (specific to
-                       ///< drivers like LED backpacks)
+  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
 };
 
 #endif // WS_DISP_DRV_BASE_H

src/components/display/hardware.cpp

@@ -173,8 +173,9 @@ 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_SpiConfig *spi_config) {
+bool DisplayHardware::beginEPD(
+    wippersnapper_display_v1_EPDConfig *config,
+    wippersnapper_display_v1_EpdSpiConfig *spi_config) {
   // Validate pointers
   if (config == nullptr || spi_config == nullptr) {
     WS_DEBUG_PRINTLN("[display] EPD config or SPI config is null!");
@@ -272,8 +273,9 @@ 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_SpiConfig *spi_config) {
+bool DisplayHardware::beginTft(
+    wippersnapper_display_v1_TftConfig *config,
+    wippersnapper_display_v1_TftSpiConfig *spi_config) {
   // Validate pointers
   if (config == nullptr || spi_config == nullptr) {
     WS_DEBUG_PRINTLN("[display] EPD config or SPI config is null!");
@@ -331,133 +333,6 @@ bool DisplayHardware::beginTft(wippersnapper_display_v1_TftConfig *config,
   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.
-    @return True if configuration was successful, False otherwise.
-*/
-bool DisplayHardware::beginOled(
-    wippersnapper_display_v1_OledConfig *config,
-    wippersnapper_display_v1_I2cConfig *i2c_config) {
-  // Validate pointers
-  if (config == nullptr || i2c_config == nullptr || !i2c_config->has_i2c)
-    return false;
-
-  // If we already have a display driver assigned to this hardware instance,
-  // clean it up!
-  if (_drvDisp) {
-    delete _drvDisp;
-    _drvDisp = nullptr;
-  }
-
-  // Initialize OLED display driver based on device name
-  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 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, "SH1107") == 0) {
-    _drvDisp = new dispDrvSh1107(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);
-  _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;
-  }
-
-  WS_DEBUG_PRINTLN("[display] OLED initialized successfully.");
-  return true;
-}
-
-/*!
-    @brief  Attempts to configure and initialize an LED Backpack display
-    @param  config
-            Pointer to the LED Backpack's configuration structure.
-    @param  i2c_config
-            Pointer to the I2C configuration structure.
-    @return True if configuration was successful, False otherwise.
-*/
-bool DisplayHardware::beginLedBackpack(
-    wippersnapper_display_v1_LEDBackpackConfig *config,
-    wippersnapper_display_v1_I2cConfig *i2c_config) {
-  // Validate pointers
-  if (config == nullptr || i2c_config == nullptr || !i2c_config->has_i2c)
-    return false;
-
-  // If we already have a display driver assigned to this hardware instance,
-  // clean it up!
-  if (_drvDisp) {
-    delete _drvDisp;
-    _drvDisp = nullptr;
-  }
-
-  // Initialize OLED display driver based on device name
-  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, "7seg") == 0) {
-    _drvDisp = new dispDrv7Seg(WS._i2cPort0->getBus(),
-                               i2c_config->i2c.i2c_device_address);
-  } else 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, "quadalphanum") == 0) {
-    _drvDisp = new dispDrvQuadAlphaNum(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->setAlignment(config->alignment);
-  _drvDisp->setBrightness(config->brightness);
-
-  // Initialize the display driver
-  if (!_drvDisp->begin()) {
-    WS_DEBUG_PRINTLN("[display] Failed to begin driver!");
-    delete _drvDisp;
-    _drvDisp = nullptr;
-    return false;
-  }
-
-  WS_DEBUG_PRINTLN("[display] LED backpack initialized successfully.");
-  return true;
-}
-
 /*!
     @brief  Gets the name of the display hardware instance.
     @return The name of the display hardware instance.

src/components/display/hardware.h

@@ -15,11 +15,7 @@
 #ifndef WS_DISPLAY_HARDWARE_H
 #define WS_DISPLAY_HARDWARE_H
 #include "Wippersnapper.h"
-#include "drivers/dispDrv7Seg.h"
 #include "drivers/dispDrvBase.h"
-#include "drivers/dispDrvQuadAlphaNum.h"
-#include "drivers/dispDrvSh1107.h"
-#include "drivers/dispDrvSsd1306.h"
 #include "drivers/dispDrvSt7789.h"
 #include "drivers/dispDrvThinkInkGrayscale4Eaamfgn.h"
 #include "drivers/dispDrvThinkInkGrayscale4T5.h"
@@ -44,13 +40,9 @@ class DisplayHardware {
   void setType(wippersnapper_display_v1_DisplayType type);
   wippersnapper_display_v1_DisplayType getType();
   bool beginEPD(wippersnapper_display_v1_EPDConfig *config,
-                wippersnapper_display_v1_SpiConfig *spi_config);
+                wippersnapper_display_v1_EpdSpiConfig *spi_config);
   bool beginTft(wippersnapper_display_v1_TftConfig *config,
-                wippersnapper_display_v1_SpiConfig *spi_config);
-  bool beginOled(wippersnapper_display_v1_OledConfig *config,
-                 wippersnapper_display_v1_I2cConfig *i2c_config);
-  bool beginLedBackpack(wippersnapper_display_v1_LEDBackpackConfig *config,
-                        wippersnapper_display_v1_I2cConfig *i2c_config);
+                wippersnapper_display_v1_TftSpiConfig *spi_config);
 
   //
   // API for Adafruit_GFX that abstracts hardware functionality