snapshot

sketches/doorbell-touch-esp32-32e/doorbell-touch-esp32-32e.ino

@@ -1,88 +1,80 @@
-/*
- * KLUBHAUS ALERT v5.0 — E32R35T Edition
- *
- * Target: LCDWiki E32R35T (ESP32-WROOM-32E + 3.5" ST7796S + XPT2046)
- *
- * Refactored: business logic separated from display code.
- * Business logic knows nothing about TFT_eSPI.
- * Display knows nothing about ntfy/WiFi/state machine.
- * They communicate through ScreenState (plain struct).
- */
-
+#include <SPI.h>
 #include "Config.h"
-#include "DisplayManager.h"
 #include "DoorbellLogic.h"
+#include "DisplayManager.h"
+
+#define HOLD_TO_SILENCE_MS 1000
 
-DisplayManager display;
 DoorbellLogic  logic;
-
-#include <TFT_eSPI.h>
-
-#ifndef LOAD_GLCD
-  #error "LOAD_GLCD is NOT defined — fonts missing!"
-#endif
-
-#ifndef ST7796_DRIVER
-  #error "ST7796_DRIVER is NOT defined — wrong setup!"
-#endif
+DisplayManager display;
 
 void setup() {
   Serial.begin(115200);
-  unsigned long t = millis();
-  while (!Serial && millis() - t < 3000) delay(10);
-  delay(500);
+  delay(1000);
+  Serial.println("\n=== KLUBHAUS ALERT v5.1 ===");
 
-  Serial.println("\n========================================");
-  Serial.println("  KLUBHAUS ALERT v5.0 — E32R35T");
-  #if DEBUG_MODE
-  Serial.println("  *** DEBUG MODE — _test topics ***");
-  #endif
-  Serial.println("========================================");
-
-  // 1. Init display hardware
   display.begin();
 
-  // 2. Init logic (sets boot splash screen state)
   logic.begin();
   display.render(logic.getScreenState());
-  delay(1500);
+  delay(2000);
 
-  // 3. WiFi (logic updates screen state, we render each phase)
-  // We need a small coupling here for the blocking WiFi connect
-  // This could be made async later
-  logic.beginWiFi();  // sets screen to WIFI_CONNECTING
+  logic.beginWiFi();
   display.render(logic.getScreenState());
 
-  logic.connectWiFiBlocking();  // blocks, sets CONNECTED or FAILED
+  logic.connectWiFiBlocking();
   display.render(logic.getScreenState());
   delay(1500);
 
-  // 4. Finish boot
   logic.finishBoot();
-  display.setBacklight(false);
-
-  Serial.println("[BOOT] Ready — monitoring ntfy.sh\n");
+  display.render(logic.getScreenState());
 }
 
 void loop() {
-  // 1. Read touch
-  TouchEvent touch = display.readTouch();
-  logic.onTouch(touch);
+  logic.update();
 
-  // 2. Read serial commands
+  const ScreenState& state = logic.getScreenState();
+
+  // ---- Touch handling (varies by screen) ----
+
+  if (state.screen == ScreenID::ALERT) {
+    // Hold-to-silence: progress bar drawn by render()
+    HoldState hold = display.updateHold(HOLD_TO_SILENCE_MS);
+    if (hold.completed) {
+      Serial.println("[HOLD] Silence hold completed");
+      logic.onTouch(TouchEvent{true, hold.x, hold.y});
+    }
+
+  } else if (state.screen == ScreenID::DASHBOARD) {
+    // Dashboard: tile taps don't dismiss, outside taps dismiss
+    TouchEvent evt = display.readTouch();
+    if (evt.pressed) {
+      int tile = display.dashboardTouch(evt.x, evt.y);
+      if (tile >= 0) {
+        Serial.printf("[DASH] Tile %d tapped\n", tile);
+        // Tile-specific actions go here later
+      } else {
+        // Tap outside tiles — dismiss dashboard
+        logic.onTouch(evt);
+      }
+    }
+
+  } else {
+    // All other screens (OFF, boot, etc): simple touch
+    TouchEvent evt = display.readTouch();
+    if (evt.pressed) {
+      logic.onTouch(evt);
+    }
+  }
+
+  // ---- Render ----
+  display.render(logic.getScreenState());
+
+  // ---- Serial commands ----
   if (Serial.available()) {
     String cmd = Serial.readStringUntil('\n');
     cmd.trim();
-    logic.onSerialCommand(cmd);
+    if (cmd.length() > 0) logic.onSerialCommand(cmd);
   }
-
-  // 3. Update business logic
-  logic.update();
-
-  // 4. Render
-  const ScreenState& state = logic.getScreenState();
-  display.setBacklight(state.screen != ScreenID::OFF);
-  display.render(state);
-
-  delay(20);
 }
+