Fix some keys no sent to telemetry screens handler (#7263)
Fix some keys no sent to telemetry screens handler
This commit is contained in:
@@ -216,58 +216,46 @@ enum NavigationDirection {
|
|||||||
#define incrTelemetryScreen() direction = down
|
#define incrTelemetryScreen() direction = down
|
||||||
|
|
||||||
#if defined(NAVIGATION_XLITE)
|
#if defined(NAVIGATION_XLITE)
|
||||||
#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_LONG(KEY_LEFT)
|
#define EVT_KEY_PREVIOUS_VIEW(evt) (evt == EVT_KEY_LONG(KEY_LEFT) && IS_SHIFT_PRESSED())
|
||||||
#define EVT_KEY_NEXT_VIEW EVT_KEY_LONG(KEY_RIGHT)
|
#define EVT_KEY_NEXT_VIEW(evt) (evt == EVT_KEY_LONG(KEY_RIGHT) && IS_SHIFT_PRESSED())
|
||||||
#elif defined(NAVIGATION_X7)
|
#elif defined(NAVIGATION_X7)
|
||||||
#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_LONG(KEY_PAGE)
|
#define EVT_KEY_PREVIOUS_VIEW(evt) (evt == EVT_KEY_LONG(KEY_PAGE))
|
||||||
#define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(KEY_PAGE)
|
#define EVT_KEY_NEXT_VIEW(evt) (evt == EVT_KEY_BREAK(KEY_PAGE))
|
||||||
|
#elif defined(NAVIGATION_9X)
|
||||||
|
#define EVT_KEY_PREVIOUS_VIEW(evt) (evt == EVT_KEY_LONG(KEY_UP))
|
||||||
|
#define EVT_KEY_NEXT_VIEW(evt) (evt == EVT_KEY_LONG(KEY_DOWN))
|
||||||
#else
|
#else
|
||||||
#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_FIRST(KEY_UP)
|
#define EVT_KEY_PREVIOUS_VIEW(evt) (evt == EVT_KEY_FIRST(KEY_UP))
|
||||||
#define EVT_KEY_NEXT_VIEW EVT_KEY_FIRST(KEY_DOWN)
|
#define EVT_KEY_NEXT_VIEW(evt) (evt == EVT_KEY_FIRST(KEY_DOWN))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void menuViewTelemetryFrsky(event_t event)
|
void menuViewTelemetryFrsky(event_t event)
|
||||||
{
|
{
|
||||||
enum NavigationDirection direction = none;
|
enum NavigationDirection direction = none;
|
||||||
|
|
||||||
switch (event) {
|
if (event == EVT_KEY_FIRST(KEY_EXIT) && TELEMETRY_SCREEN_TYPE(s_frsky_view) != TELEMETRY_SCREEN_TYPE_SCRIPT) {
|
||||||
case EVT_KEY_FIRST(KEY_EXIT):
|
killEvents(event);
|
||||||
|
chainMenu(menuMainView);
|
||||||
|
}
|
||||||
#if defined(LUA)
|
#if defined(LUA)
|
||||||
case EVT_KEY_LONG(KEY_EXIT):
|
else if (event == EVT_KEY_LONG(KEY_EXIT)) {
|
||||||
|
killEvents(event);
|
||||||
|
chainMenu(menuMainView);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
killEvents(event);
|
else if (EVT_KEY_PREVIOUS_VIEW(event)) {
|
||||||
chainMenu(menuMainView);
|
killEvents(event);
|
||||||
break;
|
decrTelemetryScreen();
|
||||||
|
}
|
||||||
case EVT_KEY_PREVIOUS_VIEW:
|
else if (EVT_KEY_NEXT_VIEW(event)) {
|
||||||
#if defined(PCBXLITE)
|
killEvents(event);
|
||||||
if (IS_SHIFT_PRESSED()) {
|
incrTelemetryScreen();
|
||||||
decrTelemetryScreen();
|
}
|
||||||
}
|
else if (event == EVT_KEY_LONG(KEY_ENTER)) {
|
||||||
#else
|
killEvents(event);
|
||||||
if (IS_KEY_LONG(EVT_KEY_PREVIOUS_VIEW)) {
|
POPUP_MENU_ADD_ITEM(STR_RESET_TELEMETRY);
|
||||||
killEvents(event);
|
POPUP_MENU_ADD_ITEM(STR_RESET_FLIGHT);
|
||||||
}
|
POPUP_MENU_START(onMainViewMenu);
|
||||||
decrTelemetryScreen();
|
|
||||||
#endif
|
|
||||||
break;
|
|
||||||
|
|
||||||
case EVT_KEY_NEXT_VIEW:
|
|
||||||
#if defined(PCBXLITE)
|
|
||||||
if (IS_SHIFT_PRESSED()) {
|
|
||||||
incrTelemetryScreen();
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
incrTelemetryScreen();
|
|
||||||
#endif
|
|
||||||
break;
|
|
||||||
|
|
||||||
case EVT_KEY_LONG(KEY_ENTER):
|
|
||||||
killEvents(event);
|
|
||||||
POPUP_MENU_ADD_ITEM(STR_RESET_TELEMETRY);
|
|
||||||
POPUP_MENU_ADD_ITEM(STR_RESET_FLIGHT);
|
|
||||||
POPUP_MENU_START(onMainViewMenu);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i=0; i<=TELEMETRY_SCREEN_TYPE_MAX; i++) {
|
for (int i=0; i<=TELEMETRY_SCREEN_TYPE_MAX; i++) {
|
||||||
|
|||||||
@@ -381,21 +381,6 @@ void handleGui(event_t event) {
|
|||||||
}
|
}
|
||||||
else if (luaTask(event, RUN_TELEM_FG_SCRIPT, true)) {
|
else if (luaTask(event, RUN_TELEM_FG_SCRIPT, true)) {
|
||||||
// the telemetry screen is active
|
// the telemetry screen is active
|
||||||
// prevent events from keys MENU, UP, DOWN, ENT(short) and EXIT(short) from reaching the normal menus,
|
|
||||||
// so Lua telemetry script can fully use them
|
|
||||||
if (event) {
|
|
||||||
uint8_t key = EVT_KEY_MASK(event);
|
|
||||||
#if defined(PCBXLITE)
|
|
||||||
// SHIFT + LEFT/RIGHT LONG used to change telemetry screen on XLITE
|
|
||||||
if ((!IS_KEY_LONG(event) && key == KEY_RIGHT && IS_SHIFT_PRESSED()) || (!IS_KEY_LONG(event) && key == KEY_LEFT && IS_SHIFT_PRESSED()) || (!IS_KEY_LONG(event) && key == KEY_EXIT)) {
|
|
||||||
#else
|
|
||||||
// no need to filter out MENU and ENT(short), because they are not used by menuViewTelemetryFrsky()
|
|
||||||
if (key == KEY_PLUS || key == KEY_MINUS || (!IS_KEY_LONG(event) && key == KEY_EXIT)) {
|
|
||||||
#endif
|
|
||||||
// TRACE("Telemetry script event 0x%02x killed", event);
|
|
||||||
event = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
menuHandlers[menuLevel](event);
|
menuHandlers[menuLevel](event);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user