feat(doorbell): add staged boot sequence and refactor main loop
This commit is contained in:
@@ -17,7 +17,10 @@ void DisplayDriverTFT::begin() {
|
||||
Serial.printf("[TOUCH] Raw Z=%d (non-zero = controller detected)\n", z);
|
||||
Serial.flush();
|
||||
|
||||
drawBoot();
|
||||
ScreenState st;
|
||||
st.screen = ScreenID::BOOT;
|
||||
st.bootStage = BootStage::SPLASH;
|
||||
drawBoot(st);
|
||||
|
||||
digitalWrite(PIN_LCD_BL, HIGH);
|
||||
Serial.println("[GFX] Backlight ON");
|
||||
@@ -29,15 +32,16 @@ void DisplayDriverTFT::setBacklight(bool on) { digitalWrite(PIN_LCD_BL, on ? HIG
|
||||
// ── Rendering ───────────────────────────────────────────────
|
||||
|
||||
void DisplayDriverTFT::render(const ScreenState& st) {
|
||||
if(st.screen != _lastScreen) {
|
||||
if(st.screen != _lastScreen || (st.screen == ScreenID::BOOT && st.bootStage != _lastBootStage)) {
|
||||
_needsRedraw = true;
|
||||
_lastScreen = st.screen;
|
||||
_lastBootStage = st.bootStage;
|
||||
}
|
||||
|
||||
switch(st.screen) {
|
||||
case ScreenID::BOOT:
|
||||
if(_needsRedraw) {
|
||||
drawBoot();
|
||||
drawBoot(st);
|
||||
_needsRedraw = false;
|
||||
}
|
||||
break;
|
||||
@@ -60,7 +64,9 @@ void DisplayDriverTFT::render(const ScreenState& st) {
|
||||
}
|
||||
}
|
||||
|
||||
void DisplayDriverTFT::drawBoot() {
|
||||
void DisplayDriverTFT::drawBoot(const ScreenState& st) {
|
||||
BootStage stage = st.bootStage;
|
||||
|
||||
_tft.fillScreen(TFT_BLACK);
|
||||
_tft.setTextColor(TFT_WHITE, TFT_BLACK);
|
||||
_tft.setTextSize(2);
|
||||
@@ -69,8 +75,29 @@ void DisplayDriverTFT::drawBoot() {
|
||||
_tft.setTextSize(1);
|
||||
_tft.setCursor(10, 40);
|
||||
_tft.print(BOARD_NAME);
|
||||
_tft.setCursor(10, 60);
|
||||
_tft.print("Booting...");
|
||||
|
||||
// Show boot stage status
|
||||
_tft.setCursor(10, 70);
|
||||
switch(stage) {
|
||||
case BootStage::SPLASH:
|
||||
_tft.print("Initializing...");
|
||||
break;
|
||||
case BootStage::INIT_DISPLAY:
|
||||
_tft.print("Display OK");
|
||||
break;
|
||||
case BootStage::INIT_NETWORK:
|
||||
_tft.print("Network init...");
|
||||
break;
|
||||
case BootStage::CONNECTING_WIFI:
|
||||
_tft.print("Connecting WiFi...");
|
||||
break;
|
||||
case BootStage::READY:
|
||||
_tft.print("All systems go!");
|
||||
break;
|
||||
case BootStage::DONE:
|
||||
_tft.print("Ready!");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void DisplayDriverTFT::drawAlert(const ScreenState& st) {
|
||||
|
||||
@@ -19,7 +19,7 @@ public:
|
||||
int height() override { return DISPLAY_HEIGHT; }
|
||||
|
||||
private:
|
||||
void drawBoot();
|
||||
void drawBoot(const ScreenState& st);
|
||||
void drawAlert(const ScreenState& st);
|
||||
void drawDashboard(const ScreenState& st);
|
||||
|
||||
@@ -28,5 +28,6 @@ private:
|
||||
bool _holdActive = false;
|
||||
uint32_t _holdStartMs = 0;
|
||||
ScreenID _lastScreen = ScreenID::BOOT;
|
||||
BootStage _lastBootStage = BootStage::SPLASH;
|
||||
bool _needsRedraw = true;
|
||||
};
|
||||
|
||||
@@ -21,55 +21,29 @@ void setup() {
|
||||
}
|
||||
|
||||
void loop() {
|
||||
// ── Read touch ──
|
||||
// Read touch
|
||||
TouchEvent evt = display.readTouch();
|
||||
|
||||
// ── Touch debug ──
|
||||
// Touch debug (useful for new boards)
|
||||
if(evt.pressed) {
|
||||
Serial.printf("[TOUCH] pressed: x=%d, y=%d\n", evt.x, evt.y);
|
||||
}
|
||||
|
||||
// ── State machine tick ──
|
||||
// State machine tick
|
||||
logic.update();
|
||||
|
||||
// ── Render current screen ──
|
||||
// Render current screen
|
||||
display.render(logic.getScreenState());
|
||||
|
||||
// ── Touch handling (tap gestures) ──
|
||||
const ScreenState& st = logic.getScreenState();
|
||||
int tile = logic.handleTouch(evt);
|
||||
// Handle tap gestures
|
||||
logic.handleTouch(evt);
|
||||
|
||||
// ── Hold gesture (for silencing alerts) ──
|
||||
static int holdStartX = -1;
|
||||
static int holdStartY = -1;
|
||||
// Handle hold-to-silence gesture
|
||||
logic.updateHold(evt);
|
||||
|
||||
if(st.deviceState == DeviceState::ALERTING) {
|
||||
HoldState h = display.updateHold(HOLD_TO_SILENCE_MS);
|
||||
if(h.completed) {
|
||||
logic.silenceAlert();
|
||||
holdStartX = -1;
|
||||
holdStartY = -1;
|
||||
}
|
||||
if(h.started) {
|
||||
holdStartX = evt.x;
|
||||
holdStartY = evt.y;
|
||||
}
|
||||
if(holdStartX >= 0) {
|
||||
display.updateHint(holdStartX, holdStartY, h.active);
|
||||
}
|
||||
} else {
|
||||
holdStartX = -1;
|
||||
holdStartY = -1;
|
||||
}
|
||||
// Serial console
|
||||
logic.processSerial();
|
||||
|
||||
// ── Serial console ──
|
||||
if(Serial.available()) {
|
||||
String cmd = Serial.readStringUntil('\n');
|
||||
cmd.trim();
|
||||
if(cmd.length() > 0)
|
||||
logic.onSerialCommand(cmd);
|
||||
}
|
||||
|
||||
// Yield to WiFi/BT stack (prevents Task Watchdog timeout)
|
||||
delay(10);
|
||||
}
|
||||
// Yield to WiFi/BT stack
|
||||
delay(LOOP_YIELD_MS);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user