Separate out rotation for future usage and add notes

Author: tyeth

src/components/i2c/WipperSnapper_I2C.cpp

@@ -892,7 +892,9 @@ bool WipperSnapper_Component_I2C::initI2CDevice(
         (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);
+            msgDeviceInitReq->i2c_output_add.config.ssd1306_config.text_size,
+        90);  // fixed as currently the only screen is 128x64 featherwing which
+              // needs a rotation of 1 / 90degrees, and constructor w/h swap.
     if (!_sh1107->begin()) {
       WS_DEBUG_PRINTLN("ERROR: Failed to initialize sh1107!");
       _busStatusResponse =
@@ -925,7 +927,8 @@ bool WipperSnapper_Component_I2C::initI2CDevice(
         (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);
+            msgDeviceInitReq->i2c_output_add.config.ssd1306_config.text_size,
+        0);  // TODO: add rotation to protobuf and IO UI for adapted max len
     if (!_ssd1306->begin()) {
       WS_DEBUG_PRINTLN("ERROR: Failed to initialize ssd1306!");
       _busStatusResponse =

src/components/i2c/drivers/WipperSnapper_I2C_Driver_Out.h

@@ -62,9 +62,11 @@ class WipperSnapper_I2C_Driver_Out : public WipperSnapper_I2C_Driver {
                   The height of the display in pixels.
       @param    text_size
                   The display's text size.
+      @param    rotation
+                  The rotation of the display in degrees, default is 0 (no rotation).
   */
   virtual void ConfigureSSD1306(uint8_t width, uint8_t height,
-                                uint8_t text_size) {
+                                uint8_t text_size, uint8_t rotation = 0) {
     // noop
   }
 

src/components/i2c/drivers/WipperSnapper_I2C_Driver_Out_Sh1107.h

@@ -68,11 +68,9 @@ class WipperSnapper_I2C_Driver_Out_SH1107
       @returns  True if initialized successfully, False otherwise.
   */
   bool begin() {
-    uint8_t rotation = 0;  // Default rotation
-    // Attempt to create and allocate a SH1107 obj
-    if (_width == 128 && _height == 64) {  // featherwing
+    if (_width == 128 && _height == 64 && _rotation == 1) {
+      // featherwing needs to be rotated 90 degrees and swap w/h
       _display = new Adafruit_SH1107(_height, _width, _i2c);
-      rotation = 1;  // Set rotation to 1 for 128x64 OLED featherwing
     } else {
       _display = new Adafruit_SH1107(_width, _height, _i2c);
     }
@@ -88,7 +86,7 @@ class WipperSnapper_I2C_Driver_Out_SH1107
     // Clear the buffer.
     _display->clearDisplay();
     _display->display();
-    _display->setRotation(rotation);
+    _display->setRotation(_rotation);  // 0-3, not degrees for SH1107
 
     // Configure the text size and color
     _display->setTextSize(_text_sz);
@@ -115,11 +113,15 @@ class WipperSnapper_I2C_Driver_Out_SH1107
                   The height of the display in pixels.
       @param    text_size
                   The magnification factor for the text size.
+      @param    rotation
+                  The rotation of the display in degrees, default is 0 (no rotation).
   */
-  void ConfigureSH1107(uint8_t width, uint8_t height, uint8_t text_size) {
+  void ConfigureSH1107(uint8_t width, uint8_t height, uint8_t text_size,
+                       uint8_t rotation) {
     _width = width;
     _height = height;
     _text_sz = text_size;
+    _rotation = rotation % 90;
     WS_DEBUG_PRINT("SH1107 text size: ");
     WS_DEBUG_PRINTLN(text_size);
   }
@@ -204,11 +206,12 @@ class WipperSnapper_I2C_Driver_Out_SH1107
   }
 
 protected:
-  Adafruit_SH1107 *_display =
-      nullptr;      ///< Pointer to the Adafruit_SH1107 object
-  uint8_t _width;   ///< Width of the display in pixels
-  uint8_t _height;  ///< Height of the display in pixels
-  uint8_t _text_sz; ///< Text size of the display
+ Adafruit_SH1107 *_display =
+     nullptr;        ///< Pointer to the Adafruit_SH1107 object
+ uint8_t _width;     ///< Width of the display in pixels
+ uint8_t _height;    ///< Height of the display in pixels
+ uint8_t _rotation;  ///< Rotation of the display (0-3)
+ uint8_t _text_sz;   ///< Text size of the display
 };
 
 #endif // WIPPERSNAPPER_I2C_DRIVER_OUT_SH1107_H

src/components/i2c/drivers/WipperSnapper_I2C_Driver_Out_Ssd1306.h

@@ -53,8 +53,10 @@ class WipperSnapper_I2C_Driver_Out_Ssd1306
   */
   ~WipperSnapper_I2C_Driver_Out_Ssd1306() {
     if (_display != nullptr) {
+      WS_DEBUG_PRINTLN("SSD1306 Destructor called, clearing display buffer.");
       _display->clearDisplay();
       _display->display();
+      WS_DEBUG_PRINTLN("SSD1306 display cleared, turning off display.");
       _display->ssd1306_command(SSD1306_DISPLAYOFF);
       delete _display;
       _display = nullptr;
@@ -70,7 +72,8 @@ class WipperSnapper_I2C_Driver_Out_Ssd1306
     _display = new Adafruit_SSD1306(_width, _height, _i2c);
     if (!_display->begin(SSD1306_SWITCHCAPVCC, _sensorAddress, false, false))
       return false;
-    // Configure the text size and color
+    // Configure the rotation, text size and color
+    _display->setRotation(_rotation);
     _display->setTextSize(_text_sz);
     _display->setTextColor(SSD1306_WHITE);
     // Use full 256 char 'Code Page 437' font
@@ -90,11 +93,15 @@ class WipperSnapper_I2C_Driver_Out_Ssd1306
                   The height of the display in pixels.
       @param    text_size
                   The magnification factor for the text size.
+      @param    rotation
+                  The rotation of the display in degrees, default is 0 (no rotation).
   */
-  void ConfigureSSD1306(uint8_t width, uint8_t height, uint8_t text_size) {
+  void ConfigureSSD1306(uint8_t width, uint8_t height, uint8_t text_size, 
+                        uint8_t rotation = 0) {
     _width = width;
     _height = height;
     _text_sz = text_size;
+    _rotation = rotation;
     WS_DEBUG_PRINT("SSD1306 text size: ");
     WS_DEBUG_PRINTLN(text_size);
   }
@@ -153,11 +160,12 @@ class WipperSnapper_I2C_Driver_Out_Ssd1306
   }
 
 protected:
-  Adafruit_SSD1306 *_display =
-      nullptr;      ///< Pointer to the Adafruit_SSD1306 object
-  uint8_t _width;   ///< Width of the display in pixels
-  uint8_t _height;  ///< Height of the display in pixels
-  uint8_t _text_sz; ///< Text size of the display
+ Adafruit_SSD1306 *_display =
+     nullptr;        ///< Pointer to the Adafruit_SSD1306 object
+ uint8_t _width;     ///< Width of the display in pixels
+ uint8_t _height;    ///< Height of the display in pixels
+ uint8_t _rotation;  ///< Rotation of the display in degrees
+ uint8_t _text_sz;   ///< Text size of the display
 };
 
 #endif // WIPPERSNAPPER_I2C_DRIVER_OUT_SSD1306_H