Browse Source
Merge pull request #1038 from adam2872/Analogue-button-fix-for-new-UI
Analogue user button fix for new UI
pull/1069/head
ripplebiz
7 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
16 additions and
9 deletions
-
examples/companion_radio/ui-new/UITask.cpp
-
examples/companion_radio/ui-new/UITask.h
|
|
|
@ -700,15 +700,18 @@ void UITask::loop() { |
|
|
|
} |
|
|
|
#endif |
|
|
|
#if defined(PIN_USER_BTN_ANA) |
|
|
|
ev = analog_btn.check(); |
|
|
|
if (ev == BUTTON_EVENT_CLICK) { |
|
|
|
c = checkDisplayOn(KEY_NEXT); |
|
|
|
} else if (ev == BUTTON_EVENT_LONG_PRESS) { |
|
|
|
c = handleLongPress(KEY_ENTER); |
|
|
|
} else if (ev == BUTTON_EVENT_DOUBLE_CLICK) { |
|
|
|
c = handleDoubleClick(KEY_PREV); |
|
|
|
} else if (ev == BUTTON_EVENT_TRIPLE_CLICK) { |
|
|
|
c = handleTripleClick(KEY_SELECT); |
|
|
|
if (abs(millis() - _analogue_pin_read_millis) > 10) { |
|
|
|
ev = analog_btn.check(); |
|
|
|
if (ev == BUTTON_EVENT_CLICK) { |
|
|
|
c = checkDisplayOn(KEY_NEXT); |
|
|
|
} else if (ev == BUTTON_EVENT_LONG_PRESS) { |
|
|
|
c = handleLongPress(KEY_ENTER); |
|
|
|
} else if (ev == BUTTON_EVENT_DOUBLE_CLICK) { |
|
|
|
c = handleDoubleClick(KEY_PREV); |
|
|
|
} else if (ev == BUTTON_EVENT_TRIPLE_CLICK) { |
|
|
|
c = handleTripleClick(KEY_SELECT); |
|
|
|
} |
|
|
|
_analogue_pin_read_millis = millis(); |
|
|
|
} |
|
|
|
#endif |
|
|
|
#if defined(DISP_BACKLIGHT) && defined(BACKLIGHT_BTN) |
|
|
|
|
|
|
|
@ -40,6 +40,10 @@ class UITask : public AbstractUITask { |
|
|
|
int last_led_increment = 0; |
|
|
|
#endif |
|
|
|
|
|
|
|
#ifdef PIN_USER_BTN_ANA |
|
|
|
unsigned long _analogue_pin_read_millis = millis(); |
|
|
|
#endif |
|
|
|
|
|
|
|
UIScreen* splash; |
|
|
|
UIScreen* home; |
|
|
|
UIScreen* msg_preview; |
|
|
|
|