Fully integrate SSD1306 driver, missing write func

Author: brentru

src/components/i2c/WipperSnapper_I2C.cpp

@@ -878,6 +878,21 @@ bool WipperSnapper_Component_I2C::initI2CDevice(
     }
     _drivers_out.push_back(_sevenSeg);
     WS_DEBUG_PRINTLN("7-Segement LED Matrix Initialized Successfully!");
+  } else if (strcmp("ssd1306", msgDeviceInitReq->i2c_device_name) == 0) {
+    _ssd1306 = new WipperSnapper_I2C_Driver_Out_Ssd1306(this->_i2c, i2cAddress);
+    _ssd1306->ConfigureSSD1306(
+        (uint8_t)msgDeviceInitReq->i2c_output_add.config.ssd1306_config.width,
+        (uint8_t)msgDeviceInitReq->i2c_output_add.config.ssd1306_config.height,
+        (uint8_t)
+            msgDeviceInitReq->i2c_output_add.config.ssd1306_config.text_size);
+    if (!_ssd1306->begin()) {
+      WS_DEBUG_PRINTLN("ERROR: Failed to initialize ssd1306!");
+      _busStatusResponse =
+          wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_DEVICE_INIT_FAIL;
+      return false;
+    }
+    _drivers_out.push_back(_ssd1306);
+    WS_DEBUG_PRINTLN("SSD1306 display initialized Successfully!");
   } else {
     WS_DEBUG_PRINTLN("ERROR: I2C device type not found!")
     _busStatusResponse =
@@ -1150,6 +1165,7 @@ bool WipperSnapper_Component_I2C::Handle_I2cDeviceOutputWrite(
   // Create a ptr to the base driver out
   WipperSnapper_I2C_Driver_Out *driver_out = nullptr;
   // Find the matching driver by address in the _drivers_out vector
+  // TODO: Refactor this outwards
   WS_DEBUG_PRINT("Searching for i2c output driver with address: ");
   WS_DEBUG_PRINT(msgDeviceWrite->i2c_device_address);
   for (size_t i = 0; i < _drivers_out.size(); i++) {
@@ -1172,6 +1188,10 @@ bool WipperSnapper_Component_I2C::Handle_I2cDeviceOutputWrite(
   } else if (msgDeviceWrite->which_output_msg ==
              wippersnapper_i2c_v1_I2CDeviceOutputWrite_write_char_lcd_tag) {
     driver_out->WriteMessageCharLCD(&msgDeviceWrite->output_msg.write_char_lcd);
+  } else if (msgDeviceWrite->which_output_msg ==
+             wippersnapper_i2c_v1_I2CDeviceOutputWrite_write_ssd1306_tag) {
+    driver_out->WriteMessageSSD1306(
+        msgDeviceWrite->output_msg.write_ssd1306.message);
   } else {
     WS_DEBUG_PRINTLN("ERROR: Unknown output message type!");
     return false;

src/components/i2c/WipperSnapper_I2C.h

@@ -54,6 +54,7 @@
 #include "drivers/WipperSnapper_I2C_Driver_Out_7Seg.h"
 #include "drivers/WipperSnapper_I2C_Driver_Out_CharLcd.h"
 #include "drivers/WipperSnapper_I2C_Driver_Out_QuadAlphaNum.h"
+#include "drivers/WipperSnapper_I2C_Driver_Out_Ssd1306.h"
 #include "drivers/WipperSnapper_I2C_Driver_PCT2075.h"
 #include "drivers/WipperSnapper_I2C_Driver_PM25.h"
 #include "drivers/WipperSnapper_I2C_Driver_SCD30.h"
@@ -203,6 +204,7 @@ class WipperSnapper_Component_I2C {
   WipperSnapper_I2C_Driver_Out_QuadAlphaNum *_quadAlphaNum = nullptr;
   WipperSnapper_I2C_Driver_Out_CharLcd *_charLcd = nullptr;
   WipperSnapper_I2C_Driver_Out_7Seg *_sevenSeg = nullptr;
+  WipperSnapper_I2C_Driver_Out_Ssd1306 *_ssd1306 = nullptr;
 };
 extern Wippersnapper WS;
 

src/components/i2c/drivers/WipperSnapper_I2C_Driver_Out.h

@@ -53,6 +53,30 @@ class WipperSnapper_I2C_Driver_Out : public WipperSnapper_I2C_Driver {
     // noop
   }
 
+  /*!
+      @brief    Configures a SSD1306 OLED display. Must be called before driver
+     begin()
+      @param    width
+                  The width of the display in pixels.
+      @param    height
+                  The height of the display in pixels.
+      @param    i2c_address
+                  The I2C address of the display.
+  */
+  virtual void ConfigureSSD1306(uint8_t width, uint8_t height,
+                                uint8_t text_size) {
+    // noop
+  }
+
+  /*!
+      @brief    Writes a message to the SSD1306 display.
+      @param    message
+                  The message to be displayed.
+  */
+  virtual void WriteMessageSSD1306(const char *message) {
+    // noop
+  }
+
   /*!
       @brief    Configures a LED backpack.
       @param    brightness

src/components/i2c/drivers/WipperSnapper_I2C_Driver_Out_Ssd1306.h

@@ -22,8 +22,6 @@
 
 #define DEFAULT_WIDTH 128
 #define DEFAULT_HEIGHT 64
-#define DEFAULT_ADDR 0x3C
-#define PIN_OLED_RESET -1
 
 /*!
     @brief  Class that provides a driver interface for a SSD1306
@@ -42,8 +40,7 @@ class WipperSnapper_I2C_Driver_Out_Ssd1306
                 7-bit device address.
   */
   /*******************************************************************************/
-  WipperSnapper_I2C_Driver_Out_Ssd1306(TwoWire *i2c,
-                                       uint16_t sensorAddress)
+  WipperSnapper_I2C_Driver_Out_Ssd1306(TwoWire *i2c, uint16_t sensorAddress)
       : WipperSnapper_I2C_Driver_Out(i2c, sensorAddress) {
     _i2c = i2c;
     _sensorAddress = sensorAddress;
@@ -66,9 +63,9 @@ class WipperSnapper_I2C_Driver_Out_Ssd1306
       @returns  True if initialized successfully, False otherwise.
   */
   bool begin() {
-    _display = new Adafruit_SSD1306(_width, _height, &_i2c, PIN_OLED_RESET);
-    bool did_begin = _display->begin(SSD1306_SWITCHCAPVCC, DEFAULT_ADDR);
-    if (! did_begin)
+    _display = new Adafruit_SSD1306(_width, _height, _i2c);
+    bool did_begin = _display->begin(SSD1306_SWITCHCAPVCC, _sensorAddress);
+    if (!did_begin)
       return false;
 
     // Show initial display buffer contents on the screen --
@@ -77,14 +74,42 @@ class WipperSnapper_I2C_Driver_Out_Ssd1306
     delay(2000);
     // Clear the buffer
     _display->clearDisplay();
-    // Set the text size
-
+    // Configure the text size and color
+    _display->setTextSize(_text_sz);
+    _display->setTextColor(SSD1306_WHITE);
+    // Reset the cursor position
+    _display->setCursor(0, 0);
     return true;
   }
 
+  /*!
+      @brief    Configures a SSD1306 OLED display. Must be called before driver
+     begin()
+      @param    width
+                  The width of the display in pixels.
+      @param    height
+                  The height of the display in pixels.
+      @param    i2c_address
+                  The I2C address of the display.
+  */
+  void ConfigureSSD1306(uint8_t width, uint8_t height, uint8_t text_size) {
+    _width = width;
+    _height = height;
+    _text_sz = text_size;
+  }
+
+  /*!
+      @brief    Writes a message to the SSD1306 display.
+      @param    message
+                  The message to be displayed.
+  */
+  void WriteMessageSSD1306(const char *message) {
+    // noop
+  }
 
 protected:
-  Adafruit_SSD1306 *_display = nullptr; ///< Pointer to the Adafruit_SSD1306 object
+  Adafruit_SSD1306 *_display =
+      nullptr;                       ///< Pointer to the Adafruit_SSD1306 object
   uint8_t _width, _height, _text_sz; ///< Width and height of the display
 };