i2c hacky output

need to refactor display model methods out, and i2c output methods in from i2c to display model, and driver files out of i2c drivers.

Author: tyeth

platformio.ini

@@ -277,6 +277,14 @@ build_flags = -DARDUINO_METRO_ESP32S3 -DBOARD_HAS_PSRAM
 board_build.partitions = tinyuf2-partitions-16MB.csv
 extra_scripts =  pre:rename_usb_config.py
 
+; Adafruit Metro ESP32-S3
+[env:adafruit_metro_esp32s3_debug]
+extends = env:adafruit_metro_esp32s3
+build_type = debug
+; debug_tool = jlink
+; upload_protocol = jlink
+board_build.partitions = tinyuf2-partitions-16MB.csv
+
 ; Adafruit Qualia ESP32-S3 RGB666
 [env:adafruit_qualia_s3_rgb666]
 extends = common:esp32

src/components/display/drivers/dispDrvI2cAdapter.h

@@ -0,0 +1,60 @@
+/*!
+ * @file src/components/display/drivers/dispDrvI2cAdapter.h
+ *
+ * Adapter that wraps I2C output drivers (drvOutputBase) behind the
+ * dispDrvBase interface so the display controller can manage them.
+ *
+ * Adafruit invests time and resources providing this open source code,
+ * please support Adafruit and open-source hardware by purchasing
+ * products from Adafruit!
+ *
+ * Copyright (c) Tyeth Gundry 2025 for Adafruit Industries.
+ *
+ * BSD license, all text here must be included in any redistribution.
+ *
+ */
+#ifndef WS_DISP_DRV_I2C_ADAPTER_H
+#define WS_DISP_DRV_I2C_ADAPTER_H
+
+#include "dispDrvBase.h"
+#include "../../i2c/drivers/drvOutputBase.h"
+
+/*!
+    @brief  Adapter that wraps an I2C output driver (drvOutputBase)
+            behind the display driver interface (dispDrvBase).
+*/
+class dispDrvI2cAdapter : public dispDrvBase {
+public:
+  /*!
+      @brief  Constructor — takes ownership of the I2C output driver.
+      @param  drv  Pointer to an I2C output driver (will be deleted on
+     destruction).
+  */
+  dispDrvI2cAdapter(drvOutputBase *drv) : dispDrvBase(), _drv(drv) {}
+
+  ~dispDrvI2cAdapter() {
+    if (_drv) {
+      delete _drv;
+      _drv = nullptr;
+    }
+  }
+
+  bool begin() override {
+    if (!_drv)
+      return false;
+    return _drv->begin();
+  }
+
+  void writeMessage(const char *message, bool clear_first = true,
+                    int32_t cursor_x = 0, int32_t cursor_y = 0) override {
+    if (!_drv)
+      return;
+    // I2C output drivers only support simple WriteMessage
+    _drv->WriteMessage(message);
+  }
+
+private:
+  drvOutputBase *_drv;
+};
+
+#endif // WS_DISP_DRV_I2C_ADAPTER_H

src/components/display/drivers/dispDrvRgb666.h

@@ -63,36 +63,47 @@ class dispDrvRgb666 : public dispDrvBase {
     if (!_expander)
       return false;
 
-    _rgbpanel = new Arduino_ESP32RGBPanel(
-        TFT_DE, TFT_VSYNC, TFT_HSYNC, TFT_PCLK, TFT_R1, TFT_R2, TFT_R3,
-        TFT_R4, TFT_R5, TFT_G0, TFT_G1, TFT_G2, TFT_G3, TFT_G4, TFT_G5,
-        TFT_B1, TFT_B2, TFT_B3, TFT_B4, TFT_B5,
-        1 /* hsync_polarity */, 46 /* hsync_front_porch */,
-        2 /* hsync_pulse_width */, 44 /* hsync_back_porch */,
-        1 /* vsync_polarity */, 50 /* vsync_front_porch */,
-        16 /* vsync_pulse_width */, 16 /* vsync_back_porch */);
-    if (!_rgbpanel)
-      return false;
-
-    // Select init operations based on panel string.
+    // Select init operations and dotclock timings per panel.
+    // Timings from CircuitPython dotclockframebuffer configs.
     // Accepts both panel part numbers and Adafruit PIDs.
     const uint8_t *init_ops = nullptr;
     size_t init_ops_len = 0;
+    uint16_t h_fp, h_pw, h_bp, v_fp, v_pw, v_bp;
+    uint16_t pclk_active_neg = 0;
+    int32_t prefer_speed = 16000000;
 
     if (strcmp(_panel, "TL021WVC02") == 0 ||
         strcmp(_panel, "adafruit-5792") == 0) {
+      // 2.1" round 480x480
       init_ops = TL021WVC02_init_operations;
       init_ops_len = sizeof(TL021WVC02_init_operations);
+      h_fp = 40;  h_pw = 20; h_bp = 40;
+      v_fp = 40;  v_pw = 10; v_bp = 40;
+      pclk_active_neg = 0; // pclk_active_high = True
     } else if (strcmp(_panel, "TL032FWV01") == 0 ||
                strcmp(_panel, "adafruit-5797") == 0) {
+      // 3.2" bar 320x820
       init_ops = tl032fwv01_init_operations;
       init_ops_len = sizeof(tl032fwv01_init_operations);
+      h_fp = 150; h_pw = 3;  h_bp = 251;
+      v_fp = 100; v_pw = 6;  v_bp = 90;
+      pclk_active_neg = 1; // pclk_active_high = False
     } else {
       WS_DEBUG_PRINT("[display] ERROR: Unknown RGB666 panel: ");
       WS_DEBUG_PRINTLN(_panel);
       return false;
     }
 
+    _rgbpanel = new Arduino_ESP32RGBPanel(
+        TFT_DE, TFT_VSYNC, TFT_HSYNC, TFT_PCLK, TFT_R1, TFT_R2, TFT_R3,
+        TFT_R4, TFT_R5, TFT_G0, TFT_G1, TFT_G2, TFT_G3, TFT_G4, TFT_G5,
+        TFT_B1, TFT_B2, TFT_B3, TFT_B4, TFT_B5,
+        1 /* hsync_polarity */, h_fp, h_pw, h_bp,
+        1 /* vsync_polarity */, v_fp, v_pw, v_bp,
+        pclk_active_neg, prefer_speed);
+    if (!_rgbpanel)
+      return false;
+
     _display = new Arduino_RGB_Display(_width, _height, _rgbpanel,
                                        _rotation, true /* auto_flush */,
                                        _expander, GFX_NOT_DEFINED /* RST */,

src/components/display/hardware.cpp

@@ -54,6 +54,9 @@ bool DisplayHardware::begin(ws_display_Add *addMsg) {
     return beginSpiEpd(addMsg);
   case ws_display_Add_ttl_rgb666_tag:
     return beginTtlRgb666(addMsg);
+  // DSI + i8080 todo
+  case ws_display_Add_i2c_tag:
+    return beginI2cDisplay(addMsg);
   default:
     WS_DEBUG_PRINTLN(
         "[display] ERROR: Unsupported display interface type!");
@@ -359,6 +362,94 @@ bool DisplayHardware::beginTtlRgb666(ws_display_Add *msg) {
 #endif
 }
 
+// ---------------------------------------------------------------------------
+// I2C display initialization (OLED, CharLCD, LED backpack, etc.)
+// ---------------------------------------------------------------------------
+bool DisplayHardware::beginI2cDisplay(ws_display_Add *msg) {
+  if (msg->which_interface_type != ws_display_Add_i2c_tag) {
+    WS_DEBUG_PRINTLN("[display] ERROR: Expected I2C interface for I2C display!");
+    return false;
+  }
+  ws_display_I2cDisplayConfig *i2c_cfg = &msg->interface_type.i2c;
+  uint16_t addr = (uint16_t)i2c_cfg->device_address;
+
+  if (_drvDisp) {
+    delete _drvDisp;
+    _drvDisp = nullptr;
+  }
+
+  WS_DEBUG_PRINT("[display] I2C driver: ");
+  WS_DEBUG_PRINT(msg->driver);
+  WS_DEBUG_PRINT(" addr: 0x");
+  WS_DEBUG_PRINTLN(addr, HEX);
+
+  // Get the initialized I2C bus from the I2C controller
+  if (!Ws._i2c_controller->IsBusStatusOK()) {
+    WS_DEBUG_PRINTLN("[display] ERROR: I2C bus not initialized!");
+    return false;
+  }
+  TwoWire *i2c = Ws._i2c_controller->GetI2cBus();
+
+  // Create the appropriate I2C output driver based on driver string
+  drvOutputBase *drv = nullptr;
+  if (strcasecmp(msg->driver, "SSD1306") == 0) {
+    drv = new drvOutSsd1306(i2c, addr, 0, msg->driver);
+  } else if (strcasecmp(msg->driver, "SH1107") == 0) {
+    drv = new drvOutSh1107(i2c, addr, 0, msg->driver);
+  } else if (strcasecmp(msg->driver, "charlcd") == 0) {
+    drv = new drvOutCharLcd(i2c, addr, 0, msg->driver);
+  } else if (strcasecmp(msg->driver, "7seg") == 0) {
+    drv = new drvOut7Seg(i2c, addr, 0, msg->driver);
+  } else if (strcasecmp(msg->driver, "quadalphanum") == 0) {
+    drv = new drvOutQuadAlphaNum(i2c, addr, 0, msg->driver);
+  } else {
+    WS_DEBUG_PRINT("[display] ERROR: Unsupported I2C display driver: ");
+    WS_DEBUG_PRINTLN(msg->driver);
+    return false;
+  }
+
+  // Configure based on config type
+  pb_size_t config = msg->which_config;
+  WS_DEBUG_PRINT("[display] I2C config tag: ");
+  WS_DEBUG_PRINTLN(config);
+  if (config == ws_display_Add_config_oled_tag) {
+    ws_display_OledConfig *cfg = &msg->config.config_oled;
+    WS_DEBUG_PRINT("[display] OLED config: ");
+    WS_DEBUG_PRINT(cfg->width);
+    WS_DEBUG_PRINT("x");
+    WS_DEBUG_PRINTLN(cfg->height);
+    drv->ConfigureSSD1306(cfg->width, cfg->height,
+                          cfg->font_size > 0 ? cfg->font_size : 1);
+  } else if (config == ws_display_Add_config_char_lcd_tag) {
+    ws_display_CharLcdConfig *cfg = &msg->config.config_char_lcd;
+    drv->ConfigureCharLcd(cfg->rows, cfg->columns, true);
+  } else if (config == ws_display_Add_config_led_tag) {
+    ws_display_LedBackpackConfig *cfg = &msg->config.config_led;
+    drv->ConfigureI2CBackpack(cfg->brightness, cfg->alignment);
+  } else {
+    // No matching config — for OLEDs, apply safe defaults to prevent
+    // crash from uninitialized width/height in drvOutSsd1306::begin()
+    WS_DEBUG_PRINTLN("[display] WARNING: No config for I2C display, "
+                     "applying defaults");
+    if (strcasecmp(msg->driver, "SSD1306") == 0) {
+      drv->ConfigureSSD1306(128, 32, 1);
+    } else if (strcasecmp(msg->driver, "SH1107") == 0) {
+      drv->ConfigureSSD1306(128, 64, 1);
+    }
+  }
+
+  WS_DEBUG_PRINTLN("[display] Calling I2C driver begin()...");
+  if (!drv->begin()) {
+    WS_DEBUG_PRINTLN("[display] ERROR: Failed to begin I2C display driver!");
+    delete drv;
+    return false;
+  }
+
+  _drvDisp = new dispDrvI2cAdapter(drv);
+  WS_DEBUG_PRINTLN("[display] I2C display initialized successfully!");
+  return true;
+}
+
 void DisplayHardware::showSplash() {
   if (_drvDisp)
     _drvDisp->showSplash();

src/components/display/hardware.h

@@ -17,6 +17,12 @@
 #include "Wippersnapper.h"
 #include "drivers/dispDrvBase.h"
 #include "drivers/dispDrvSt7789.h"
+#include "drivers/dispDrvI2cAdapter.h"
+#include "../i2c/drivers/drvOut7Seg.h"
+#include "../i2c/drivers/drvOutCharLcd.h"
+#include "../i2c/drivers/drvOutQuadAlphaNum.h"
+#include "../i2c/drivers/drvOutSh1107.h"
+#include "../i2c/drivers/drvOutSsd1306.h"
 #ifdef ARDUINO_ADAFRUIT_QUALIA_S3_RGB666
 #include "drivers/dispDrvRgb666.h"
 #endif
@@ -53,6 +59,7 @@ class DisplayHardware {
   bool beginSpiTft(ws_display_Add *msg);
   bool beginSpiEpd(ws_display_Add *msg);
   bool beginTtlRgb666(ws_display_Add *msg);
+  bool beginI2cDisplay(ws_display_Add *msg);
   int16_t parsePin(const char *pinStr);
 
   // EPD auto-detection helpers

src/wippersnapper.h

@@ -258,7 +258,7 @@ class wippersnapper {
   AnalogIOController *analogio_controller =
       nullptr; ///< Instance of AnalogIO controller
   DisplayController *_display_controller =
-      nullptr;                              ///< Instance of Display controller
+      nullptr; ///< Instance of Display controller
   DS18X20Controller *_ds18x20_controller =
       nullptr;                              ///< Instance of DS18X20 controller
   GPSController *_gps_controller = nullptr; ///< Instance of GPS controller