feat(display): add active state parameter to hint animation

1. **Added `active` parameter to hint animation**
   - `updateHint()` now accepts a boolean `active` parameter across both display drivers (TFT and GFX)
   - When `active=true`: faster pulse animation (500ms period) during active hold
   - When `active=false`: slower pulse animation (2000ms period) during idle state

2. **Improved animation calculations**
   - Replaced modulo operator with `fmodf()` for cleaner float calculations
   - Standardized to `static_cast<uint8_t>()` for type conversions
   - Fixed GFX driver to use `color565()` method instead of manual bit shifting

3. **Updated hint display logic**
   - Now differentiates between "holding" state (fast pulse) and "idle" state (slow pulse)
   - Hint draws at both states when `holdStartX >= 0` (touch position captured)

4. **Added code formatter task**
   - New `mise.toml` task for running clang-format across all source files

- Users get **visual feedback differentiation**: fast pulsing during active hold vs. slow pulsing when idle
- More intuitive UI that clearly indicates whether a long-press is in progress or just waiting
- Cleaner, more maintainable code with standardized calculations and type conversions
This commit is contained in:
2026-02-17 05:03:41 -08:00
parent ff073c762b
commit c4adb38576
6 changed files with 36 additions and 19 deletions

View File

@@ -169,10 +169,10 @@ HoldState DisplayDriverTFT::updateHold(unsigned long holdMs) {
return h; return h;
} }
void DisplayDriverTFT::updateHint(int x, int y) { void DisplayDriverTFT::updateHint(int x, int y, bool active) {
float t = (millis() % 2000) / 2000.0f; float period = active ? 500.0f : 2000.0f;
uint8_t v = (uint8_t)(30.0f + 30.0f * sinf(t * 2 * PI)); float t = fmodf(millis(), period) / period;
uint8_t v = static_cast<uint8_t>(30.0f + 30.0f * sinf(t * 2.0f * PI));
uint16_t col = _tft.color565(v, v, v); uint16_t col = _tft.color565(v, v, v);
// Draw at touch position instead of center
_tft.drawRect(x - 40, y - 20, 80, 40, col); _tft.drawRect(x - 40, y - 20, 80, 40, col);
} }

View File

@@ -44,8 +44,9 @@ void loop() {
holdStartX = t.x; holdStartX = t.x;
holdStartY = t.y; holdStartY = t.y;
} }
if(!h.active && holdStartX >= 0) { // Fix for esp32-32e.ino
display.updateHint(holdStartX, holdStartY); if(holdStartX >= 0) {
display.updateHint(holdStartX, holdStartY, h.active);
} }
} else { } else {
holdStartX = -1; holdStartX = -1;

View File

@@ -239,21 +239,21 @@ void DisplayDriverGFX::drawDashboard(const ScreenState& state) {
} }
} }
void DisplayDriverGFX::updateHint(int x, int y) { void DisplayDriverGFX::updateHint(int x, int y, bool active) {
if(!_gfx) if(!_gfx)
return; return;
static uint32_t lastTime = 0; static uint32_t lastTime = 0;
uint32_t now = millis(); uint32_t now = millis();
// Fixed: throttle to 100ms instead of 50ms
if(now - lastTime < 100) if(now - lastTime < 100)
return; return;
lastTime = now; lastTime = now;
float t = (now % 2000) / 2000.0f; // active=true: faster pulse (500ms), active=false: slower pulse (2000ms)
uint8_t v = static_cast<uint8_t>(30.0f + 30.0f * sinf(t * 2 * 3.14159f)); float period = active ? 500.0f : 2000.0f;
uint16_t col = ((v >> 3) << 11) | ((v >> 2) << 5) | (v >> 3); float t = fmodf(now, period) / period;
uint8_t v = static_cast<uint8_t>(30.0f + 30.0f * sinf(t * 2.0f * 3.14159f));
uint16_t col = _gfx->color565(v, v, v);
// Draw at touch position instead of center
_gfx->drawCircle(x, y, 50, col); _gfx->drawCircle(x, y, 50, col);
} }

View File

@@ -40,19 +40,21 @@ void loop() {
holdStartY = -1; holdStartY = -1;
} }
if(h.started) { if(h.started) {
// Capture initial touch position
holdStartX = evt.x; holdStartX = evt.x;
holdStartY = evt.y; holdStartY = evt.y;
} }
if(!h.active && holdStartX >= 0) { // Draw hint during hold (ACTIVE) or idle (IDLE)
display.updateHint(holdStartX, holdStartY); if(holdStartX >= 0) {
if(h.active) {
display.updateHint(holdStartX, holdStartY, true);
} else {
display.updateHint(holdStartX, holdStartY, false);
}
} }
} else { } else {
// Reset when not alerting
holdStartX = -1; holdStartX = -1;
holdStartY = -1; holdStartY = -1;
} }
if(evt.pressed) { if(evt.pressed) {
if(st.screen == ScreenID::OFF) { if(st.screen == ScreenID::OFF) {
// Tap in OFF mode → wake to DASHBOARD // Tap in OFF mode → wake to DASHBOARD

View File

@@ -32,8 +32,8 @@ public:
/// Track a long-press gesture; returns progress/completion. /// Track a long-press gesture; returns progress/completion.
virtual HoldState updateHold(unsigned long holdMs) = 0; virtual HoldState updateHold(unsigned long holdMs) = 0;
/// Idle hint animation (e.g. pulsing ring) while alert is showing. /// Idle hint animation (e.g. pulsing ring) while alert is showing.
virtual void updateHint(int x, int y) = 0; /// @param active If true, show "holding" animation; if false, show "idle" animation.
virtual void updateHint(int x, int y, bool active) = 0;
virtual int width() = 0; virtual int width() = 0;
virtual int height() = 0; virtual int height() = 0;
}; };

View File

@@ -139,3 +139,17 @@ rm -rf boards/esp32-32e/build
rm -rf boards/esp32-s3-lcd-43/build rm -rf boards/esp32-s3-lcd-43/build
echo "[OK] Build artifacts cleaned" echo "[OK] Build artifacts cleaned"
""" """
[tasks.format]
run = """
clang-format -i --style=file \
boards/esp32-32e/*.cpp \
boards/esp32-32e/*.h \
boards/esp32-32e/*.ino \
boards/esp32-s3-lcd-43/*.cpp \
boards/esp32-s3-lcd-43/*.h \
boards/esp32-s3-lcd-43/*.ino \
libraries/KlubhausCore/src/*.cpp \
libraries/KlubhausCore/src/*.h \
libraries/KlubhausCore/*.properties
"""