From 76ae89d2f2fd45643c9ee7356fec1b457c4add8b Mon Sep 17 00:00:00 2001 From: Bryan Mayland Date: Sat, 19 Mar 2022 00:43:57 -0400 Subject: [PATCH] feat: Short press for SYS/MODEL setup on BW screens, long for ModelSelect on colorlcd (#1610) * Allow short press to SYS/MODEL on BW screens, long for ModelSelect on colorlcd * T8 navigation style gets short SYS/MODEL presses too --- radio/src/gui/128x64/view_main.cpp | 8 ++++---- radio/src/gui/colorlcd/view_main.cpp | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/128x64/view_main.cpp b/radio/src/gui/128x64/view_main.cpp index 37ccb0576..41710d336 100644 --- a/radio/src/gui/128x64/view_main.cpp +++ b/radio/src/gui/128x64/view_main.cpp @@ -285,8 +285,8 @@ void displayBattVoltage() #define EVT_KEY_NEXT_VIEW EVT_KEY_FIRST(KEY_PAGEDN) #define EVT_KEY_NEXT_PAGE EVT_KEY_FIRST(KEY_PLUS) #define EVT_KEY_PREVIOUS_PAGE EVT_KEY_FIRST(KEY_MINUS) -#define EVT_KEY_MODEL_MENU EVT_KEY_LONG(KEY_MODEL) -#define EVT_KEY_GENERAL_MENU EVT_KEY_LONG(KEY_SYS) +#define EVT_KEY_MODEL_MENU EVT_KEY_FIRST(KEY_MODEL) +#define EVT_KEY_GENERAL_MENU EVT_KEY_FIRST(KEY_SYS) #define EVT_KEY_TELEMETRY EVT_KEY_LONG(KEY_PAGEUP) #elif defined(NAVIGATION_X7_TX12) #define EVT_KEY_CONTEXT_MENU EVT_KEY_LONG(KEY_ENTER) @@ -294,8 +294,8 @@ void displayBattVoltage() #define EVT_KEY_NEXT_VIEW EVT_KEY_FIRST(KEY_PAGEDN) #define EVT_KEY_NEXT_PAGE EVT_ROTARY_RIGHT #define EVT_KEY_PREVIOUS_PAGE EVT_ROTARY_LEFT -#define EVT_KEY_MODEL_MENU EVT_KEY_LONG(KEY_MODEL) -#define EVT_KEY_GENERAL_MENU EVT_KEY_LONG(KEY_SYS) +#define EVT_KEY_MODEL_MENU EVT_KEY_FIRST(KEY_MODEL) +#define EVT_KEY_GENERAL_MENU EVT_KEY_FIRST(KEY_SYS) #define EVT_KEY_TELEMETRY EVT_KEY_FIRST(KEY_TELE) #elif defined(NAVIGATION_X7) || defined(NAVIGATION_TBS) #define EVT_KEY_CONTEXT_MENU EVT_KEY_LONG(KEY_ENTER) diff --git a/radio/src/gui/colorlcd/view_main.cpp b/radio/src/gui/colorlcd/view_main.cpp index fb88a9e01..21b6b7b5b 100644 --- a/radio/src/gui/colorlcd/view_main.cpp +++ b/radio/src/gui/colorlcd/view_main.cpp @@ -20,6 +20,7 @@ */ #include "view_main.h" +#include "model_select.h" #include "menu_model.h" #include "menu_radio.h" #include "menu_screen.h" @@ -261,11 +262,16 @@ bool ViewMain::onTouchEnd(coord_t x, coord_t y) void ViewMain::onEvent(event_t event) { switch (event) { - case EVT_KEY_FIRST(KEY_MODEL): + case EVT_KEY_BREAK(KEY_MODEL): killEvents(event); new ModelMenu(); break; + case EVT_KEY_LONG(KEY_MODEL): + killEvents(event); + new ModelSelectMenu(); + break; + case EVT_KEY_FIRST(KEY_RADIO): killEvents(event); new RadioMenu();