piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(bw): editing names on 9x/xlite nav radios & popup menu using wrong keys/events (#4967)

Browse Source
This commit is contained in:
philmoz
2024-05-05 16:12:50 +10:00
committed by GitHub
parent 7d61113dda
commit 0ccba1e160
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/navigation/common.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ int checkIncDecSelection = 0;
void repeatLastCursorMove(event_t event)
{
if (IS_PREVIOUS_EVENT(event) || IS_NEXT_EVENT(event)) {
if (IS_PREVIOUS_MOVE_EVENT(event) || IS_NEXT_MOVE_EVENT(event)) {
pushEvent(event);
}
else {
radio/src/keys.h
+15 -1
View File
@@ -149,12 +149,26 @@ inline bool IS_KEY_EVT(event_t evt, uint8_t key)
inline bool IS_NEXT_EVENT(event_t evt)
{
return evt == EVT_KEY_FIRST(KEY_DOWN) || evt == EVT_KEY_REPT(KEY_DOWN) ||
evt == EVT_KEY_FIRST(KEY_RIGHT) || evt == EVT_KEY_REPT(KEY_RIGHT) ||
evt == EVT_KEY_FIRST(KEY_MINUS) || evt == EVT_KEY_REPT(KEY_MINUS) ||
evt == EVT_ROTARY_RIGHT;
}
inline bool IS_PREVIOUS_EVENT(event_t evt)
{
return evt == EVT_KEY_FIRST(KEY_UP) || evt == EVT_KEY_REPT(KEY_UP) ||
evt == EVT_KEY_FIRST(KEY_PLUS) || evt == EVT_KEY_REPT(KEY_PLUS) ||
evt == EVT_ROTARY_LEFT;
}
inline bool IS_NEXT_MOVE_EVENT(event_t evt)
{
return evt == EVT_KEY_FIRST(KEY_DOWN) || evt == EVT_KEY_REPT(KEY_DOWN) ||
evt == EVT_KEY_FIRST(KEY_RIGHT) || evt == EVT_KEY_REPT(KEY_RIGHT) ||
evt == EVT_KEY_FIRST(KEY_MINUS) || evt == EVT_KEY_REPT(KEY_MINUS) ||
evt == EVT_ROTARY_RIGHT;
}
inline bool IS_PREVIOUS_MOVE_EVENT(event_t evt)
{
return evt == EVT_KEY_FIRST(KEY_UP) || evt == EVT_KEY_REPT(KEY_UP) ||
evt == EVT_KEY_FIRST(KEY_LEFT) || evt == EVT_KEY_REPT(KEY_LEFT) ||