consolidate sketches

boards/esp32-32e/DisplayDriverTFT.cpp

@@ -0,0 +1,155 @@
+#include "DisplayDriverTFT.h"
+
+void DisplayDriverTFT::begin() {
+    // Backlight
+    pinMode(PIN_LCD_BL, OUTPUT);
+    digitalWrite(PIN_LCD_BL, LOW);
+
+    _tft.init();
+    _tft.setRotation(DISPLAY_ROTATION);
+    _tft.fillScreen(TFT_BLACK);
+
+    Serial.printf("[GFX] Display OK: %dx%d\n", DISPLAY_WIDTH, DISPLAY_HEIGHT);
+
+    drawBoot();
+
+    digitalWrite(PIN_LCD_BL, HIGH);
+    Serial.println("[GFX] Backlight ON");
+}
+
+void DisplayDriverTFT::setBacklight(bool on) {
+    digitalWrite(PIN_LCD_BL, on ? HIGH : LOW);
+}
+
+// ── Rendering ───────────────────────────────────────────────
+
+void DisplayDriverTFT::render(const ScreenState& st) {
+    if (st.screen != _lastScreen) {
+        _needsRedraw = true;
+        _lastScreen = st.screen;
+    }
+
+    switch (st.screen) {
+        case ScreenID::BOOT:
+            if (_needsRedraw) { drawBoot(); _needsRedraw = false; }
+            break;
+        case ScreenID::ALERT:
+            drawAlert(st);
+            break;
+        case ScreenID::DASHBOARD:
+            if (_needsRedraw) { drawDashboard(st); _needsRedraw = false; }
+            break;
+        case ScreenID::OFF:
+            if (_needsRedraw) { _tft.fillScreen(TFT_BLACK); _needsRedraw = false; }
+            break;
+    }
+}
+
+void DisplayDriverTFT::drawBoot() {
+    _tft.fillScreen(TFT_BLACK);
+    _tft.setTextColor(TFT_WHITE, TFT_BLACK);
+    _tft.setTextSize(2);
+    _tft.setCursor(10, 10);
+    _tft.printf("KLUBHAUS v%s", FW_VERSION);
+    _tft.setTextSize(1);
+    _tft.setCursor(10, 40);
+    _tft.print(BOARD_NAME);
+    _tft.setCursor(10, 60);
+    _tft.print("Booting...");
+}
+
+void DisplayDriverTFT::drawAlert(const ScreenState& st) {
+    uint32_t elapsed = millis() - st.alertStartMs;
+    uint8_t pulse = 180 + (uint8_t)(75.0f * sinf(elapsed / 300.0f));
+    uint16_t bg = _tft.color565(pulse, 0, 0);
+
+    _tft.fillScreen(bg);
+    _tft.setTextColor(TFT_WHITE, bg);
+
+    _tft.setTextSize(3);
+    _tft.setCursor(10, 20);
+    _tft.print(st.alertTitle.length() > 0 ? st.alertTitle : "ALERT");
+
+    _tft.setTextSize(2);
+    _tft.setCursor(10, 80);
+    _tft.print(st.alertBody);
+
+    _tft.setTextSize(1);
+    _tft.setCursor(10, DISPLAY_HEIGHT - 20);
+    _tft.print("Hold to silence...");
+}
+
+void DisplayDriverTFT::drawDashboard(const ScreenState& st) {
+    _tft.fillScreen(TFT_BLACK);
+    _tft.setTextColor(TFT_WHITE, TFT_BLACK);
+
+    _tft.setTextSize(1);
+    _tft.setCursor(5, 5);
+    _tft.printf("KLUBHAUS — %s", deviceStateStr(st.deviceState));
+
+    int y = 30;
+    _tft.setCursor(5, y); y += 18;
+    _tft.printf("WiFi: %s  %ddBm", st.wifiSsid.c_str(), st.wifiRssi);
+
+    _tft.setCursor(5, y); y += 18;
+    _tft.printf("IP: %s", st.ipAddr.c_str());
+
+    _tft.setCursor(5, y); y += 18;
+    _tft.printf("Up: %lus  Heap: %d", st.uptimeMs / 1000, ESP.getFreeHeap());
+
+    _tft.setCursor(5, y); y += 18;
+    _tft.printf("Last poll: %lus ago",
+                st.lastPollMs > 0 ? (millis() - st.lastPollMs) / 1000 : 0);
+}
+
+// ── Touch ───────────────────────────────────────────────────
+
+TouchEvent DisplayDriverTFT::readTouch() {
+    TouchEvent evt;
+    uint16_t tx, ty;
+    if (_tft.getTouch(&tx, &ty)) {
+        evt.pressed = true;
+        evt.x = tx;
+        evt.y = ty;
+    }
+    return evt;
+}
+
+int DisplayDriverTFT::dashboardTouch(int x, int y) {
+    // 2-column, 4-row
+    int col = x / (DISPLAY_WIDTH / 2);
+    int row = (y - 30) / 40;
+    if (row < 0 || row > 3) return -1;
+    return row * 2 + col;
+}
+
+HoldState DisplayDriverTFT::updateHold(unsigned long holdMs) {
+    HoldState h;
+    TouchEvent t = readTouch();
+
+    if (t.pressed) {
+        if (!_holdActive) {
+            _holdActive  = true;
+            _holdStartMs = millis();
+        }
+        uint32_t held = millis() - _holdStartMs;
+        h.active   = true;
+        h.progress = constrain((float)held / (float)holdMs, 0.0f, 1.0f);
+        h.completed = (held >= holdMs);
+
+        // Simple progress bar at bottom of screen
+        int barW = (int)(DISPLAY_WIDTH * h.progress);
+        _tft.fillRect(0, DISPLAY_HEIGHT - 8, barW, 8, TFT_WHITE);
+        _tft.fillRect(barW, DISPLAY_HEIGHT - 8, DISPLAY_WIDTH - barW, 8, TFT_DARKGREY);
+    } else {
+        _holdActive = false;
+    }
+    return h;
+}
+
+void DisplayDriverTFT::updateHint() {
+    float t = (millis() % 2000) / 2000.0f;
+    uint8_t v = (uint8_t)(30.0f + 30.0f * sinf(t * 2 * PI));
+    uint16_t col = _tft.color565(v, v, v);
+    _tft.drawRect(DISPLAY_WIDTH / 2 - 40, DISPLAY_HEIGHT / 2 + 20, 80, 40, col);
+}

boards/esp32-32e/DisplayDriverTFT.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <KlubhausCore.h>
+#include <TFT_eSPI.h>
+#include "board_config.h"
+
+class DisplayDriverTFT : public IDisplayDriver {
+public:
+    void begin() override;
+    void setBacklight(bool on) override;
+    void render(const ScreenState& state) override;
+    TouchEvent readTouch() override;
+    int  dashboardTouch(int x, int y) override;
+    HoldState updateHold(unsigned long holdMs) override;
+    void updateHint() override;
+    int  width()  override { return DISPLAY_WIDTH; }
+    int  height() override { return DISPLAY_HEIGHT; }
+
+private:
+    void drawBoot();
+    void drawAlert(const ScreenState& st);
+    void drawDashboard(const ScreenState& st);
+
+    TFT_eSPI _tft;
+
+    bool     _holdActive  = false;
+    uint32_t _holdStartMs = 0;
+    ScreenID _lastScreen  = ScreenID::BOOT;
+    bool     _needsRedraw = true;
+};

boards/esp32-32e/board_config.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#define BOARD_NAME        "WS_32E"
+
+// ══════════════════════════════════════════════════════════
+//  TODO: Set these to match YOUR display + wiring.
+//  Defaults below are for a common ILI9341 320×240 SPI TFT.
+//  The actual pin mapping must also be set in tft_user_setup.h
+//  (which gets copied into the vendored TFT_eSPI library).
+// ══════════════════════════════════════════════════════════
+
+#define DISPLAY_WIDTH     320
+#define DISPLAY_HEIGHT    240
+#define DISPLAY_ROTATION  1     // landscape
+
+// Backlight GPIO (directly wired)
+#define PIN_LCD_BL        22
+
+// Touch — if using XPT2046 via TFT_eSPI, set TOUCH_CS in tft_user_setup.h
+// If using capacitive touch (e.g. FT6236), configure I2C pins here:
+// #define TOUCH_SDA  21
+// #define TOUCH_SCL  22

boards/esp32-32e/esp32-32e.ino

@@ -0,0 +1,54 @@
+//
+// Klubhaus Doorbell — ESP32-32E target
+//
+
+#include <KlubhausCore.h>
+#include "board_config.h"
+#include "secrets.h"
+#include "DisplayDriverTFT.h"
+
+DisplayDriverTFT tftDriver;
+DisplayManager   display(&tftDriver);
+DoorbellLogic    logic(&display);
+
+void setup() {
+    Serial.begin(115200);
+    delay(500);
+
+    logic.begin(FW_VERSION, BOARD_NAME, wifiNetworks, wifiNetworkCount);
+    logic.finishBoot();
+}
+
+void loop() {
+    // ── State machine tick ──
+    logic.update();
+
+    // ── Render current screen ──
+    display.render(logic.getScreenState());
+
+    // ── Touch handling ──
+    const ScreenState& st = logic.getScreenState();
+
+    if (st.deviceState == DeviceState::ALERTING) {
+        HoldState h = display.updateHold(HOLD_TO_SILENCE_MS);
+        if (h.completed) {
+            logic.silenceAlert();
+        }
+        if (!h.active) {
+            display.updateHint();
+        }
+    } else {
+        TouchEvent evt = display.readTouch();
+        if (evt.pressed && st.screen == ScreenID::DASHBOARD) {
+            int tile = display.dashboardTouch(evt.x, evt.y);
+            if (tile >= 0) Serial.printf("[DASH] Tile %d tapped\n", tile);
+        }
+    }
+
+    // ── Serial console ──
+    if (Serial.available()) {
+        String cmd = Serial.readStringUntil('\n');
+        cmd.trim();
+        if (cmd.length() > 0) logic.onSerialCommand(cmd);
+    }
+}

boards/esp32-32e/secrets.h.example

@@ -0,0 +1,11 @@
+#pragma once
+#include <KlubhausCore.h>
+
+// Copy this file to secrets.h and fill in your credentials.
+// secrets.h is gitignored.
+
+static const WiFiCred wifiNetworks[] = {
+    { "Your_SSID_1", "password1" },
+    { "Your_SSID_2", "password2" },
+};
+static const int wifiNetworkCount = sizeof(wifiNetworks) / sizeof(wifiNetworks[0]);

boards/esp32-32e/tft_user_setup.h

@@ -0,0 +1,47 @@
+// ═══════════════════════════════════════════════════════════
+//  TFT_eSPI User_Setup for ESP32-32E target
+//  This file is copied over vendor/esp32-32e/TFT_eSPI/User_Setup.h
+//  by the install-libs-32e task.
+//
+//  TODO: Change the driver, pins, and dimensions to match your display.
+// ═══════════════════════════════════════════════════════════
+
+#define USER_SETUP_ID 200
+
+// ── Driver ──
+#define ILI9341_DRIVER
+// #define ST7789_DRIVER
+// #define ILI9488_DRIVER
+
+// ── Resolution ──
+#define TFT_WIDTH  240
+#define TFT_HEIGHT 320
+
+// ── SPI Pins ──
+#define TFT_MOSI  23
+#define TFT_SCLK  18
+#define TFT_CS     5
+#define TFT_DC    27
+#define TFT_RST   33
+
+// ── Backlight (optional, can also use GPIO directly) ──
+// #define TFT_BL  22
+// #define TFT_BACKLIGHT_ON HIGH
+
+// ── Touch (XPT2046 resistive) ──
+#define TOUCH_CS  14
+
+// ── SPI speed ──
+#define SPI_FREQUENCY       40000000
+#define SPI_READ_FREQUENCY  20000000
+#define SPI_TOUCH_FREQUENCY  2500000
+
+// ── Misc ──
+#define LOAD_GLCD
+#define LOAD_FONT2
+#define LOAD_FONT4
+#define LOAD_FONT6
+#define LOAD_FONT7
+#define LOAD_FONT8
+#define LOAD_GFXFF
+#define SMOOTH_FONT