DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alter keycode keycode handling

Browse Source
This commit is contained in:
taco
2025-09-03 16:28:58 +10:00
parent afbfc6c6ed
commit 96a71bb21b
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
examples/companion_radio/ui-new/UITask.cpp
View File

@@ -223,11 +223,11 @@ public:
} }
bool handleInput(char c) override { bool handleInput(char c) override {
if (c == KEY_LEFT) { if (c == KEY_LEFT || c == KEY_PREV) {
_page = (_page + HomePage::Count - 1) % HomePage::Count; _page = (_page + HomePage::Count - 1) % HomePage::Count;
return true; return true;
} }
if (c == KEY_RIGHT || c == KEY_SELECT) { if (c == KEY_NEXT || c == KEY_RIGHT) {
_page = (_page + 1) % HomePage::Count; _page = (_page + 1) % HomePage::Count;
if (_page == HomePage::RECENT) { if (_page == HomePage::RECENT) {
_task->showAlert("Recent adverts", 800); _task->showAlert("Recent adverts", 800);
@@ -325,7 +325,7 @@ public:
} }
bool handleInput(char c) override { bool handleInput(char c) override {
if (c == KEY_SELECT || c == KEY_RIGHT) { if (c == KEY_NEXT || c == KEY_RIGHT) {
num_unread--; num_unread--;
if (num_unread == 0) { if (num_unread == 0) {
_task->gotoHomeScreen(); _task->gotoHomeScreen();
@@ -492,13 +492,13 @@ void UITask::loop() {
#if defined(PIN_USER_BTN) #if defined(PIN_USER_BTN)
int ev = user_btn.check(); int ev = user_btn.check();
if (ev == BUTTON_EVENT_CLICK) { if (ev == BUTTON_EVENT_CLICK) {
c = checkDisplayOn(KEY_SELECT); c = checkDisplayOn(KEY_NEXT);
} else if (ev == BUTTON_EVENT_LONG_PRESS) { } else if (ev == BUTTON_EVENT_LONG_PRESS) {
c = handleLongPress(KEY_ENTER); c = handleLongPress(KEY_ENTER);
} else if (ev == BUTTON_EVENT_DOUBLE_CLICK) { } else if (ev == BUTTON_EVENT_DOUBLE_CLICK) {
c = handleDoubleClick(KEY_ENTER); c = handleDoubleClick(KEY_PREV);
} else if (ev == BUTTON_EVENT_TRIPLE_CLICK) { } else if (ev == BUTTON_EVENT_TRIPLE_CLICK) {
c = handleTripleClick(KEY_ENTER); c = handleTripleClick(KEY_SELECT);
} }
#endif #endif
#if defined(WIO_TRACKER_L1) #if defined(WIO_TRACKER_L1)
@@ -518,9 +518,13 @@ void UITask::loop() {
#if defined(PIN_USER_BTN_ANA) #if defined(PIN_USER_BTN_ANA)
ev = analog_btn.check(); ev = analog_btn.check();
if (ev == BUTTON_EVENT_CLICK) { if (ev == BUTTON_EVENT_CLICK) {
c = checkDisplayOn(KEY_SELECT); c = checkDisplayOn(KEY_NEXT);
} else if (ev == BUTTON_EVENT_LONG_PRESS) { } else if (ev == BUTTON_EVENT_LONG_PRESS) {
c = handleLongPress(KEY_ENTER); 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);
} }
#endif #endif
@@ -611,7 +615,6 @@ char UITask::handleLongPress(char c) {
char UITask::handleDoubleClick(char c) { char UITask::handleDoubleClick(char c) {
MESH_DEBUG_PRINTLN("UITask: double click triggered"); MESH_DEBUG_PRINTLN("UITask: double click triggered");
checkDisplayOn(c); checkDisplayOn(c);
c = 0;
return c; return c;
} }