refactor(touch): centralize touch handling in DoorbellLogic
This commit is contained in:
@@ -21,14 +21,18 @@ void setup() {
|
||||
}
|
||||
|
||||
void loop() {
|
||||
// ── Read touch ──
|
||||
TouchEvent evt = display.readTouch();
|
||||
|
||||
// ── State machine tick ──
|
||||
logic.update();
|
||||
display.render(logic.getScreenState());
|
||||
|
||||
// ── Touch handling (tap gestures) ──
|
||||
const ScreenState& st = logic.getScreenState();
|
||||
int tile = logic.handleTouch(evt);
|
||||
|
||||
// Track initial hold position for hint
|
||||
// ── Hold gesture (for silencing alerts) ──
|
||||
static int holdStartX = -1;
|
||||
static int holdStartY = -1;
|
||||
|
||||
@@ -43,7 +47,6 @@ void loop() {
|
||||
holdStartX = evt.x;
|
||||
holdStartY = evt.y;
|
||||
}
|
||||
// Draw hint during hold (ACTIVE) or idle (IDLE)
|
||||
if(holdStartX >= 0) {
|
||||
if(h.active) {
|
||||
display.updateHint(holdStartX, holdStartY, true);
|
||||
@@ -55,21 +58,6 @@ void loop() {
|
||||
holdStartX = -1;
|
||||
holdStartY = -1;
|
||||
}
|
||||
if(evt.pressed) {
|
||||
if(st.screen == ScreenID::OFF) {
|
||||
// Tap in OFF mode → wake to DASHBOARD
|
||||
Serial.println("[TOUCH] OFF → DASHBOARD");
|
||||
logic.setScreen(ScreenID::DASHBOARD);
|
||||
display.setBacklight(true);
|
||||
} else if(st.screen == ScreenID::DASHBOARD) {
|
||||
int tile = display.dashboardTouch(evt.x, evt.y);
|
||||
if(tile >= 0) {
|
||||
Serial.printf("[DASH] Tile %d tapped\n", tile);
|
||||
}
|
||||
} else if(st.screen == ScreenID::ALERT) {
|
||||
Serial.println("[TOUCH] ALERT tap");
|
||||
}
|
||||
}
|
||||
|
||||
if(Serial.available()) {
|
||||
String cmd = Serial.readStringUntil('\n');
|
||||
|
||||
Reference in New Issue
Block a user