klubhaus/klubhaus-doorbell
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(doorbell): add staged boot sequence and refactor main loop

Browse Source
This commit is contained in:
David Gwilliam
2026-02-18 00:35:48 -08:00
parent 46289b9d40
commit bfba3b02fd
15 changed files with 255 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
boards/esp32-s3-lcd-43/DisplayDriverGFX.cpp
View File

@@ -129,19 +129,16 @@ void DisplayDriverGFX::render(const ScreenState& state) {
return;
// Check if we need full redraw
if(state.screen != _lastScreen) {
if(state.screen != _lastScreen || (state.screen == ScreenID::BOOT && state.bootStage != _lastBootStage)) {
_needsRedraw = true;
_lastScreen = state.screen;
_lastBootStage = state.bootStage;
}
switch(state.screen) {
case ScreenID::BOOT:
if(_needsRedraw) {
_gfx->fillScreen(0x000000);
_gfx->setTextColor(0xFFFF);
_gfx->setTextSize(2);
_gfx->setCursor(10, 10);
_gfx->print("KLUBHAUS BOOT");
drawBoot(state);
_needsRedraw = false;
}
break;
@@ -170,6 +167,43 @@ void DisplayDriverGFX::render(const ScreenState& state) {
}
}
void DisplayDriverGFX::drawBoot(const ScreenState& state) {
BootStage stage = state.bootStage;
_gfx->fillScreen(0x000000);
_gfx->setTextColor(0xFFFF);
_gfx->setTextSize(2);
_gfx->setCursor(10, 10);
_gfx->print("KLUBHAUS");
_gfx->setTextSize(1);
_gfx->setCursor(10, 50);
_gfx->print(BOARD_NAME);
// Show boot stage status
_gfx->setCursor(10, 80);
switch(stage) {
case BootStage::SPLASH:
_gfx->print("Initializing...");
break;
case BootStage::INIT_DISPLAY:
_gfx->print("Display OK");
break;
case BootStage::INIT_NETWORK:
_gfx->print("Network init...");
break;
case BootStage::CONNECTING_WIFI:
_gfx->print("Connecting WiFi...");
break;
case BootStage::READY:
_gfx->print("All systems go!");
break;
case BootStage::DONE:
_gfx->print("Ready!");
break;
}
}
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));

2
boards/esp32-s3-lcd-43/DisplayDriverGFX.h
View File

@@ -24,6 +24,7 @@ public:
private:
// Helper rendering functions
void drawBoot(const ScreenState& state);
void drawAlert(const ScreenState& state);
void drawDashboard(const ScreenState& state);
@@ -34,5 +35,6 @@ private:
// Screen tracking
ScreenID _lastScreen = ScreenID::BOOT;
BootStage _lastBootStage = BootStage::SPLASH;
bool _needsRedraw = true;
};

47
boards/esp32-s3-lcd-43/esp32-s3-lcd-43.ino
View File

@@ -21,48 +21,21 @@ void setup() {
}
void loop() {
// ── Read touch ──
// Read touch
TouchEvent evt = display.readTouch();
// ── State machine tick ──
// State machine tick
logic.update();
// 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) {
if(h.active) {
display.updateHint(holdStartX, holdStartY, true);
} else {
display.updateHint(holdStartX, holdStartY, false);
}
}
} else {
holdStartX = -1;
holdStartY = -1;
}
if(Serial.available()) {
String cmd = Serial.readStringUntil('\n');
cmd.trim();
if(cmd.length() > 0)
logic.onSerialCommand(cmd);
}
// Serial console
logic.processSerial();
}