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
This commit is contained in:
Bryan Mayland
2022-03-19 14:43:57 +10:00
committed by GitHub
parent ae8585b6f4
commit 76ae89d2f2
2 changed files with 11 additions and 5 deletions
+4 -4
View File
@@ -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)