refactor(esp32-s3-lcd-43): remove IO expander and use LovyanGFX backlight

boards/esp32-s3-lcd-43/DisplayDriverGFX.cpp

@@ -1,60 +1,28 @@
+// boards/esp32-s3-lcd-43/DisplayDriverGFX.cpp
 #include <Arduino.h>
-#include <Wire.h>
-#include <ESP_IOExpander_Library.h>
 #include "LovyanPins.h"
 #include "board_config.h"
 #include "DisplayDriverGFX.h"
 
 // ── Globals ──
 static LGFX* _gfx = nullptr;
-static ESP_IOExpander* _expander = nullptr;
 
 // ── Forward declarations ──
-static void initExpander();
 static void initDisplay();
 
 // ── Dimensions ──
 static constexpr int DISP_W = 800;
 static constexpr int DISP_H = 480;
 
-// ── Expander initialization (from Westcott) ──
-static void initExpander() {
-    Serial.println("IO expander init...");
-    
-    // Initialize I2C for expander (port 0)
-    Wire.begin(TOUCH_SDA, TOUCH_SCL);
-    
-    _expander = new ESP_IOExpander_CH422G(
-        (i2c_port_t)I2C_NUM_0,
-        ESP_IO_EXPANDER_I2C_CH422G_ADDRESS
-    );
-    _expander->init();
-    _expander->begin();
-    
-    // Set all pins to output
-    _expander->multiPinMode(TP_RST | LCD_BL | LCD_RST | SD_CS | USB_SEL, OUTPUT);
-    
-    // Reset sequence for LCD
-    _expander->digitalWrite(LCD_RST, LOW);
-    delay(50);
-    _expander->digitalWrite(LCD_RST, HIGH);
-    delay(150);
-    
-    // Turn on backlight
-    _expander->digitalWrite(LCD_BL, HIGH);
-    
-    Serial.println("IO expander ready");
-}
-
 // ── Display initialization ──
 static void initDisplay() {
     Serial.println("LovyanGFX init...");
-    
+
     _gfx = new LGFX();
     _gfx->init();
     _gfx->setRotation(1);  // Landscape
     _gfx->fillScreen(0x000000);
-    
+
     Serial.println("Display ready");
 }
 
@@ -67,13 +35,13 @@ DisplayDriverGFX& DisplayDriverGFX::instance() {
 // ── IDisplayDriver implementation ──
 
 void DisplayDriverGFX::begin() {
-    initExpander();
     initDisplay();
 }
 
 void DisplayDriverGFX::setBacklight(bool on) {
-    if (_expander) {
-        _expander->digitalWrite(LCD_BL, on ? HIGH : LOW);
+    if (_gfx) {
+        // LovyanGFX handles backlight via setBrightness
+        _gfx->setBrightness(on ? 255 : 0);
     }
 }
 
@@ -89,22 +57,22 @@ int DisplayDriverGFX::height() {
 
 TouchEvent DisplayDriverGFX::readTouch() {
     TouchEvent evt;
-    
+
     if (!_gfx) return evt;
-    
+
     int32_t x, y;
     if (_gfx->getTouch(&x, &y)) {
         evt.pressed = true;
         evt.x = static_cast<int>(x);
         evt.y = static_cast<int>(y);
-        
+
         // Track press start for hold detection
         if (!_lastTouch.pressed) {
             _pressStartMs = millis();
             _isHolding = false;
         }
     }
-    
+
     _lastTouch = evt;
     return evt;
 }
@@ -115,39 +83,39 @@ int DisplayDriverGFX::dashboardTouch(int x, int y) {
     constexpr int rows = 2;
     constexpr int tileW = DISP_W / cols;
     constexpr int tileH = DISP_H / rows;
-    
+
     if (x < 0 || x >= DISP_W || y < 0 || y >= DISP_H) {
         return -1;
     }
-    
+
     int col = x / tileW;
     int row = y / tileH;
-    
+
     return row * cols + col;
 }
 
 HoldState DisplayDriverGFX::updateHold(unsigned long holdMs) {
     HoldState state;
-    
+
     if (!_lastTouch.pressed) {
         _isHolding = false;
         return state;
     }
-    
+
     unsigned long elapsed = millis() - _pressStartMs;
-    
+
     if (!_isHolding) {
         _isHolding = true;
     }
-    
+
     state.active = true;
     state.progress = static_cast<float>(elapsed) / static_cast<float>(holdMs);
-    
+
     if (state.progress >= 1.0f) {
         state.progress = 1.0f;
         state.completed = true;
     }
-    
+
     return state;
 }
 
@@ -155,13 +123,13 @@ HoldState DisplayDriverGFX::updateHold(unsigned long holdMs) {
 
 void DisplayDriverGFX::render(const ScreenState& state) {
     if (!_gfx) return;
-    
+
     // Check if we need full redraw
     if (state.screen != _lastScreen) {
         _needsRedraw = true;
         _lastScreen = state.screen;
     }
-    
+
     switch (state.screen) {
         case ScreenID::BOOT:
             if (_needsRedraw) {
@@ -173,18 +141,18 @@ void DisplayDriverGFX::render(const ScreenState& state) {
                 _needsRedraw = false;
             }
             break;
-            
+
         case ScreenID::OFF:
             if (_needsRedraw) {
                 _gfx->fillScreen(0x000000);
                 _needsRedraw = false;
             }
             break;
-            
+
         case ScreenID::ALERT:
             drawAlert(state);
             break;
-            
+
         case ScreenID::DASHBOARD:
             if (_needsRedraw) {
                 drawDashboard(state);
@@ -198,18 +166,18 @@ void DisplayDriverGFX::drawAlert(const ScreenState& state) {
     uint32_t elapsed = millis() - state.alertStartMs;
     uint8_t pulse = static_cast<uint8_t>(180.0f + 75.0f * sinf(elapsed / 300.0f));
     uint16_t bg = _gfx->color565(pulse, 0, 0);
-    
+
     _gfx->fillScreen(bg);
     _gfx->setTextColor(0xFFFF, bg);
-    
+
     _gfx->setTextSize(3);
     _gfx->setCursor(10, 20);
     _gfx->print(state.alertTitle.length() > 0 ? state.alertTitle.c_str() : "ALERT");
-    
+
     _gfx->setTextSize(2);
     _gfx->setCursor(10, 80);
     _gfx->print(state.alertBody);
-    
+
     _gfx->setTextSize(1);
     _gfx->setCursor(10, DISP_H - 20);
     _gfx->print("Hold to silence...");
@@ -217,44 +185,44 @@ void DisplayDriverGFX::drawAlert(const ScreenState& state) {
 
 void DisplayDriverGFX::drawDashboard(const ScreenState& state) {
     _gfx->fillScreen(0x001030);  // Dark blue
-    
+
     // Header
     _gfx->fillRect(0, 0, DISP_W, 30, 0x0220);
     _gfx->setTextColor(0xFFFF);
     _gfx->setTextSize(1);
     _gfx->setCursor(5, 10);
     _gfx->printf("KLUBHAUS");
-    
+
     // WiFi status
     _gfx->setCursor(DISP_W - 100, 10);
     _gfx->printf("WiFi:%s", state.wifiSsid.length() > 0 ? "ON" : "OFF");
 
-    
+
     // Tiles: 2 rows × 4 columns
     constexpr int cols = 4;
     constexpr int rows = 2;
     constexpr int tileW = DISP_W / cols;
     constexpr int tileH = (DISP_H - 30) / rows;
     constexpr int margin = 8;
-    
+
     // Draw placeholder tiles (8 total for 2x4 grid)
     const char* tileLabels[] = {"1", "2", "3", "4", "5", "6", "7", "8"};
-    
+
     for (int i = 0; i < 8; i++) {
         int col = i % cols;
         int row = i / cols;
-        
+
         int x = col * tileW + margin;
         int y = 30 + row * tileH + margin;
         int w = tileW - 2 * margin;
         int h = tileH - 2 * margin;
-        
+
         // Tile background
         _gfx->fillRoundRect(x, y, w, h, 8, 0x0220);
-        
+
         // Tile border
         _gfx->drawRoundRect(x, y, w, h, 8, 0xFFFF);
-        
+
         // Tile number
         _gfx->setTextColor(0xFFFF);
         _gfx->setTextSize(2);
@@ -265,15 +233,15 @@ void DisplayDriverGFX::drawDashboard(const ScreenState& state) {
 
 void DisplayDriverGFX::updateHint() {
     if (!_gfx) return;
-    
+
     static uint32_t lastTime = 0;
     uint32_t now = millis();
     if (now - lastTime < 50) return;
     lastTime = now;
-    
+
     float t = (now % 2000) / 2000.0f;
     uint8_t v = static_cast<uint8_t>(30.0f + 30.0f * sinf(t * 2 * 3.14159f));
     uint16_t col = ((v >> 3) << 11) | ((v >> 2) << 5) | (v >> 3);
-    
+
     _gfx->drawCircle(DISP_W / 2, DISP_H / 2, 50, col);
 }