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

refactor: key handling (#4849)

Browse Source
This commit is contained in:
philmoz
2024-05-27 18:33:53 +10:00
committed by GitHub
parent b8a0038c68
commit e807ccbebf
101 changed files with 380 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_curve_edit.cpp
+9 -17
View File
@@ -153,29 +153,21 @@ void menuModelCurveOne(event_t event)
case EVT_KEY_LONG(KEY_ENTER):
if (menuVerticalPosition > 1) {
killEvents(event);
POPUP_MENU_START(onCurveOneMenu, 3, STR_CURVE_PRESET, STR_MIRROR, STR_CLEAR);
}
break;
#if defined(KEYS_GPIO_REG_MDL)
case EVT_KEY_FIRST(KEY_MODEL):
pushMenu(menuChannelsView);
killEvents(event);
break;
#elif defined(NAVIGATION_X7)
case EVT_KEY_FIRST(KEY_MENU):
pushMenu(menuChannelsView);
killEvents(event);
break;
#elif defined(NAVIGATION_XLITE)
#if defined(NAVIGATION_XLITE)
case EVT_KEY_FIRST(KEY_ENTER):
if (keysGetState(KEY_SHIFT)) {
pushMenu(menuChannelsView);
killEvents(event);
}
break;
if (!keysGetState(KEY_SHIFT))
break;
killEvents(event);
#else
case EVT_KEY_BREAK(KEY_MODEL):
case EVT_KEY_BREAK(KEY_MENU):
#endif
pushMenu(menuChannelsView);
break;
}
drawCurve();
radio/src/gui/128x64/model_custom_scripts.cpp
+1 -1
View File
@@ -138,7 +138,7 @@ void menuModelCustomScripts(event_t event)
coord_t y;
int8_t sub = menuVerticalPosition;
if (event == EVT_KEY_FIRST(KEY_ENTER)) {
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
s_currIdx = sub;
pushMenu(menuModelCustomScriptOne);
}
radio/src/gui/128x64/model_failsafe.cpp
-1
View File
@@ -65,7 +65,6 @@ void menuModelFailsafe(event_t event)
wbar -= 6;
if (sub == k && !READ_ONLY() && event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
POPUP_MENU_START(onFailsafeMenu, 4, STR_NONE, STR_HOLD, STR_CHANNEL2FAILSAFE, STR_CHANNELS2FAILSAFE);
}
radio/src/gui/128x64/model_flightmodes.cpp
+2 -2
View File
@@ -229,14 +229,14 @@ void menuModelFlightModesAll(event_t event)
int8_t sub = menuVerticalPosition - HEADER_LINE;
// "Check trims" button
if (sub == MAX_FLIGHT_MODES && event == EVT_KEY_FIRST(KEY_ENTER)) {
if (sub == MAX_FLIGHT_MODES && event == EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
trimsCheckTimer = 200; // 2 seconds
}
// Flight mode lines
if (sub >= 0 && sub < MAX_FLIGHT_MODES &&
(event == EVT_KEY_FIRST(KEY_ENTER) || event == EVT_KEY_FIRST(KEY_RIGHT))) {
(event == EVT_KEY_BREAK(KEY_ENTER) || event == EVT_KEY_FIRST(KEY_RIGHT))) {
s_currIdx = sub;
pushMenu(menuModelFlightModeOne);
}
radio/src/gui/128x64/model_input_edit.cpp
+5 -11
View File
@@ -57,21 +57,15 @@ uint8_t FM_ROW(uint8_t value)
void menuModelExpoOne(event_t event)
{
#if defined(KEYS_GPIO_REG_MDL)
if (event == EVT_KEY_FIRST(KEY_MODEL)) {
pushMenu(menuChannelsView);
killEvents(event);
}
#elif defined(NAVIGATION_X7)
if (event == EVT_KEY_FIRST(KEY_MENU)) {
pushMenu(menuChannelsView);
killEvents(event);
}
#elif defined(NAVIGATION_XLITE)
#if defined(NAVIGATION_XLITE)
if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
pushMenu(menuChannelsView);
killEvents(event);
}
#else
if (event == EVT_KEY_BREAK(KEY_MODEL) || event == EVT_KEY_BREAK(KEY_MENU)) {
pushMenu(menuChannelsView);
}
#endif
ExpoData * ed = expoAddress(s_currIdx);
drawSource(PSIZE(TR_MENUINPUTS)*FW+FW, 0, MIXSRC_FIRST_INPUT+ed->chn, 0);
radio/src/gui/128x64/model_logical_switches.cpp
+1 -2
View File
@@ -256,8 +256,7 @@ void menuModelLogicalSwitches(event_t event)
uint8_t k = 0;
int8_t sub = menuVerticalPosition - HEADER_LINE;
if (event == EVT_KEY_FIRST(KEY_ENTER)) {
killEvents(event);
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
LogicalSwitchData * cs = lswAddress(sub);
if (cs->func)
s_currIdx = sub;
radio/src/gui/128x64/model_mix_edit.cpp
+5 -11
View File
@@ -90,21 +90,15 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
void menuModelMixOne(event_t event)
{
#if defined(KEYS_GPIO_REG_MDL)
if (event == EVT_KEY_FIRST(KEY_MODEL)) {
pushMenu(menuChannelsView);
killEvents(event);
}
#elif defined(NAVIGATION_X7)
if (event == EVT_KEY_FIRST(KEY_MENU)) {
pushMenu(menuChannelsView);
killEvents(event);
}
#elif defined(NAVIGATION_XLITE)
#if defined(NAVIGATION_XLITE)
if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
pushMenu(menuChannelsView);
killEvents(event);
}
#else
if (event == EVT_KEY_BREAK(KEY_MODEL) || event == EVT_KEY_BREAK(KEY_MENU)) {
pushMenu(menuChannelsView);
}
#endif
MixData * md2 = mixAddress(s_currIdx) ;
putsChn(PSIZE(TR_MIXES)*FW+FW, 0, md2->destCh+1,0);
radio/src/gui/128x64/model_outputs.cpp
+1 -3
View File
@@ -231,8 +231,7 @@ void menuModelLimits(event_t event)
uint8_t k = i+menuVerticalOffset;
LcdFlags attr = (sub==MAX_OUTPUT_CHANNELS) ? INVERS : 0;
if (sub==k && event==EVT_KEY_FIRST(KEY_ENTER) && !READ_ONLY() && (k != MAX_OUTPUT_CHANNELS) ) {
killEvents(event);
if (sub==k && event==EVT_KEY_BREAK(KEY_ENTER) && !READ_ONLY() && (k != MAX_OUTPUT_CHANNELS) ) {
s_editMode = 0;
POPUP_MENU_START(onLimitsMenu, 5, STR_EDIT, STR_RESET, STR_COPY_TRIMS_TO_OFS, STR_COPY_STICKS_TO_OFS, STR_COPY_MIN_MAX_TO_OUTPUTS);
}
@@ -244,7 +243,6 @@ void menuModelLimits(event_t event)
s_editMode = 0;
if (event == EVT_KEY_LONG(KEY_ENTER)) {
START_NO_HIGHLIGHT();
killEvents(event);
moveTrimsToOffsets(); // if highlighted and menu pressed - move trims to offsets
}
}
radio/src/gui/128x64/model_select.cpp
+17 -28
View File
@@ -141,7 +141,6 @@ void menuModelSelect(event_t event)
break;
case EVT_KEY_LONG(KEY_EXIT):
killEvents(event);
if (s_copyMode && s_copyTgtOfs == 0 && g_eeGeneral.currModel != sub && modelExists(sub)) {
POPUP_CONFIRMATION(STR_DELETEMODEL, nullptr);
SET_WARNING_INFO(modelHeaders[sub].name, sizeof(g_model.header.name), 0);
@@ -208,7 +207,6 @@ void menuModelSelect(event_t event)
event == EVT_KEY_LONG(KEY_ENTER)) {
s_copyMode = 0;
killEvents(event);
if (g_eeGeneral.currModel != sub) {
if (modelExists(sub)) {
POPUP_MENU_ADD_ITEM(STR_SELECT_MODEL);
@@ -240,36 +238,27 @@ void menuModelSelect(event_t event)
}
break;
#if defined(KEYS_GPIO_REG_PAGEDN)
case EVT_KEY_FIRST(KEY_PAGEUP):
chainMenu(menuTabModel[DIM(menuTabModel)-1].menuFunc);
killEvents(event);
break;
case EVT_KEY_FIRST(KEY_PAGEDN):
chainMenu(menuModelSetup);
break;
#elif defined(KEYS_GPIO_REG_PAGE)
case EVT_KEY_LONG(KEY_PAGE):
chainMenu(menuTabModel[DIM(menuTabModel)-1].menuFunc);
killEvents(event);
break;
case EVT_KEY_BREAK(KEY_PAGE):
chainMenu(menuModelSetup);
break;
#else
case EVT_KEY_FIRST(KEY_LEFT):
case EVT_KEY_FIRST(KEY_RIGHT):
if (sub == g_eeGeneral.currModel) {
bool forward = (event == EVT_KEY_FIRST(KEY_RIGHT));
chainMenu(forward ? menuModelSetup
: menuTabModel[DIM(menuTabModel) - 1].menuFunc);
} else {
// Page navigation only allowed if cursor on first line (for consistency)
if (sub != g_eeGeneral.currModel) {
AUDIO_WARNING2();
break;
}
// Fallthrough
case EVT_KEY_BREAK(KEY_PAGEUP):
chainMenu(menuTabModel[DIM(menuTabModel)-1].menuFunc);
break;
case EVT_KEY_FIRST(KEY_RIGHT):
// Page navigation only allowed if cursor on first line (for consistency)
if (sub != g_eeGeneral.currModel) {
AUDIO_WARNING2();
break;
}
// Fallthrough
case EVT_KEY_BREAK(KEY_PAGEDN):
chainMenu(menuModelSetup);
break;
#endif
}
if (s_copyMode) {
radio/src/gui/128x64/model_setup.cpp
+4 -19
View File
@@ -39,13 +39,6 @@
#include "telemetry/crossfire.h"
#endif
// TODO find why we need this (for REGISTER at least)
#if defined(PCBXLITE)
#define EVT_BUTTON_PRESSED() EVT_KEY_FIRST(KEY_ENTER)
#else
#define EVT_BUTTON_PRESSED() EVT_KEY_BREAK(KEY_ENTER)
#endif
uint8_t g_moduleIdx;
uint8_t getSwitchWarningsCount()
@@ -1010,7 +1003,6 @@ void menuModelSetup(event_t event)
AUDIO_WARNING1();
storageDirty(EE_MODEL);
}
killEvents(event);
break;
}
}
@@ -1065,7 +1057,6 @@ void menuModelSetup(event_t event)
if (!READ_ONLY() && menuHorizontalPosition > 0) {
switch (event) {
case EVT_KEY_LONG(KEY_ENTER):
killEvents(event);
if (g_model.potsWarnMode == POTS_WARN_MANUAL) {
SAVE_POT_POSITION(menuHorizontalPosition-1);
AUDIO_WARNING1();
@@ -1352,7 +1343,6 @@ void menuModelSetup(event_t event)
// START_NO_HIGHLIGHT();
// telemetryErrors = 0;
// AUDIO_WARNING1();
// killEvents(event);
// }
// }
break;
@@ -1636,7 +1626,7 @@ void menuModelSetup(event_t event)
lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0));
if (attr) {
if (moduleState[moduleIdx].mode == MODULE_MODE_NORMAL && s_editMode > 0) {
if (menuHorizontalPosition == 0 && event == EVT_BUTTON_PRESSED()) {
if (menuHorizontalPosition == 0 && event == EVT_KEY_BREAK(KEY_ENTER)) {
startRegisterDialog(moduleIdx);
}
else if (menuHorizontalPosition == 1) {
@@ -1739,7 +1729,6 @@ void menuModelSetup(event_t event)
modelHeaders[g_eeGeneral.currModel].modelId[moduleIdx] = g_model.header.modelId[moduleIdx];
}
else if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
uint8_t newVal = 0;
#if defined(STORAGE_MODELSLIST)
newVal = modelslist.findNextUnusedModelId(moduleIdx);
@@ -1778,12 +1767,10 @@ void menuModelSetup(event_t event)
if (isModuleR9MNonAccess(moduleIdx) || isModuleD16(moduleIdx) || isModuleAFHDS3(moduleIdx)) {
#if defined(PCBXLITE)
if (EVT_KEY_MASK(event) == KEY_ENTER) {
#elif defined(NAVIGATION_9X)
if (event == EVT_KEY_FIRST(KEY_ENTER)) {
killEvents(event);
#else
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
#endif
killEvents(event);
#if defined(AFHDS3)
if (isModuleAFHDS3(moduleIdx)) {
startBindMenuAfhds3(moduleIdx);
@@ -1874,7 +1861,6 @@ void menuModelSetup(event_t event)
s_editMode = 0;
if (moduleData.failsafeMode == FAILSAFE_CUSTOM) {
if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
setCustomFailsafe(moduleIdx);
AUDIO_WARNING1();
SEND_FAILSAFE_NOW(moduleIdx);
@@ -2291,15 +2277,14 @@ void menuModelSetup(event_t event)
case ITEM_MODEL_SETUP_USBJOYSTICK_CH_BUTTON:
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_USBJOYSTICK_SETTINGS), attr);
if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
pushMenu(menuModelUSBJoystick);
}
break;
case ITEM_MODEL_SETUP_USBJOYSTICK_APPLY:
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_USBJOYSTICK_APPLY_CHANGES), attr);
if (attr && !READ_ONLY() && event == EVT_KEY_FIRST(KEY_ENTER)) {
killEvents(event);
if (attr && !READ_ONLY() && event == EVT_KEY_BREAK(KEY_ENTER)) {
onUSBJoystickModelChanged();
}
break;
radio/src/gui/128x64/model_special_functions.cpp
-3
View File
@@ -166,7 +166,6 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
#else
if (menuHorizontalPosition<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
#endif
killEvents(event);
CustomFunctionData *cfn = &functions[sub];
if (!CFN_EMPTY(cfn))
POPUP_MENU_ADD_ITEM(STR_COPY);
@@ -416,7 +415,6 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
#if !defined(NAVIGATION_X7)
// For X7 type navigation the ENTER long press is handled below
if (attr && event==EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
s_editMode = !s_editMode;
active = true;
CFN_GVAR_MODE(cfn) += 1;
@@ -433,7 +431,6 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
if (active || event==EVT_KEY_LONG(KEY_ENTER)) {
CFN_PARAM(cfn) = CHECK_INCDEC_PARAM(event, val_displayed, val_min, val_max);
if (func == FUNC_ADJUST_GVAR && attr && event==EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_CONSTANT)
POPUP_MENU_ADD_ITEM(STR_CONSTANT);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_SOURCE)
radio/src/gui/128x64/model_telemetry.cpp
-2
View File
@@ -173,7 +173,6 @@ void menuModelTelemetry(event_t event)
s_editMode = 0;
s_currIdx = index;
if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
POPUP_MENU_START(onSensorMenu, 3, STR_EDIT, STR_COPY, STR_DELETE);
}
else if (event == EVT_KEY_BREAK(KEY_ENTER)) {
@@ -226,7 +225,6 @@ void menuModelTelemetry(event_t event)
if (attr) {
s_editMode = 0;
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
killEvents(KEY_ENTER);
POPUP_CONFIRMATION(STR_CONFIRMDELETE, onDeleteAllSensorsConfirm);
}
}
radio/src/gui/128x64/radio_diaganas.cpp
-2
View File
@@ -41,7 +41,6 @@ void menuRadioDiagAnalogs(event_t event)
switch (event) {
case EVT_KEY_FIRST(KEY_RIGHT):
case EVT_KEY_BREAK(KEY_PAGEDN):
case EVT_KEY_BREAK(KEY_PAGE):
{
if (viewpage == ANAVIEW_LAST)
viewpage = ANAVIEW_FIRST;
@@ -53,7 +52,6 @@ void menuRadioDiagAnalogs(event_t event)
case EVT_KEY_FIRST(KEY_LEFT):
case EVT_KEY_BREAK(KEY_PAGEUP):
case EVT_KEY_LONG(KEY_PAGE):
{
if (viewpage == ANAVIEW_FIRST)
viewpage = ANAVIEW_LAST;
radio/src/gui/128x64/radio_setup.cpp
+2 -2
View File
@@ -143,8 +143,8 @@ void menuRadioSetup(event_t event)
if ((menuVerticalPosition == ITEM_RADIO_SETUP_DATE + HEADER_LINE ||
menuVerticalPosition == ITEM_RADIO_SETUP_TIME + HEADER_LINE) &&
(s_editMode > 0) &&
(event == EVT_KEY_FIRST(KEY_ENTER) || event == EVT_KEY_LONG(KEY_ENTER) ||
event == EVT_KEY_FIRST(KEY_EXIT))) {
(event == EVT_KEY_BREAK(KEY_ENTER) || event == EVT_KEY_LONG(KEY_ENTER) ||
event == EVT_KEY_BREAK(KEY_EXIT))) {
// set the date and time into RTC chip
rtcSetTime(&t);
}
radio/src/gui/128x64/view_about.cpp
+2 -2
View File
@@ -36,8 +36,8 @@ void menuAboutView(event_t event)
{
switch(event)
{
case EVT_KEY_FIRST(KEY_EXIT):
case EVT_KEY_FIRST(KEY_ENTER):
case EVT_KEY_BREAK(KEY_EXIT):
case EVT_KEY_BREAK(KEY_ENTER):
chainMenu(menuMainView);
break;
}
radio/src/gui/128x64/view_channels.cpp
+2 -2
View File
@@ -38,8 +38,8 @@ constexpr coord_t CHANNEL_PROPERTIES_OFFSET = CHANNEL_GAUGE_OFFSET + CHANNEL_BAR
#define EVT_KEY_NEXT_PAGE EVT_ROTARY_RIGHT
#define EVT_KEY_PREVIOUS_PAGE EVT_ROTARY_LEFT
#elif defined(NAVIGATION_X7)
#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_LONG(KEY_PAGE)
#define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(KEY_PAGE)
#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_BREAK(KEY_PAGEUP)
#define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(KEY_PAGEDN)
#define EVT_KEY_NEXT_PAGE EVT_ROTARY_RIGHT
#define EVT_KEY_PREVIOUS_PAGE EVT_ROTARY_LEFT
#elif defined(NAVIGATION_XLITE)
radio/src/gui/128x64/view_main.cpp
+12 -19
View File
@@ -304,29 +304,29 @@ void displayBattVoltage()
#if defined(RADIO_T8) || defined(RADIO_COMMANDO8)
#define EVT_KEY_CONTEXT_MENU EVT_KEY_LONG(KEY_ENTER)
#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_BREAK(KEY_PAGEUP)
#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_FIRST(KEY_MODEL)
#define EVT_KEY_GENERAL_MENU EVT_KEY_FIRST(KEY_SYS)
#define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(KEY_PAGEDN)
#define EVT_KEY_NEXT_PAGE EVT_KEY_BREAK(KEY_PLUS)
#define EVT_KEY_PREVIOUS_PAGE EVT_KEY_BREAK(KEY_MINUS)
#define EVT_KEY_MODEL_MENU EVT_KEY_BREAK(KEY_MODEL)
#define EVT_KEY_GENERAL_MENU EVT_KEY_BREAK(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)
#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_FIRST(KEY_PAGEUP)
#define EVT_KEY_NEXT_VIEW EVT_KEY_FIRST(KEY_PAGEDN)
#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_BREAK(KEY_PAGEUP)
#define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(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_FIRST(KEY_MODEL)
#define EVT_KEY_GENERAL_MENU EVT_KEY_FIRST(KEY_SYS)
#define EVT_KEY_TELEMETRY EVT_KEY_FIRST(KEY_TELE)
#define EVT_KEY_MODEL_MENU EVT_KEY_BREAK(KEY_MODEL)
#define EVT_KEY_GENERAL_MENU EVT_KEY_BREAK(KEY_SYS)
#define EVT_KEY_TELEMETRY EVT_KEY_BREAK(KEY_TELE)
#elif defined(NAVIGATION_X7) || defined(NAVIGATION_TBS)
#define EVT_KEY_CONTEXT_MENU EVT_KEY_LONG(KEY_ENTER)
#define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(KEY_PAGE)
#define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(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_BREAK(KEY_MENU)
#define EVT_KEY_GENERAL_MENU EVT_KEY_LONG(KEY_MENU)
#define EVT_KEY_TELEMETRY EVT_KEY_LONG(KEY_PAGE)
#define EVT_KEY_TELEMETRY EVT_KEY_BREAK(KEY_PAGEUP)
#elif defined(NAVIGATION_XLITE)
#define EVT_KEY_CONTEXT_MENU EVT_KEY_LONG(KEY_ENTER)
#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_BREAK(KEY_UP)
@@ -447,8 +447,6 @@ void menuMainView(event_t event)
break;
case EVT_KEY_CONTEXT_MENU:
killEvents(event);
if (modelHasNotes()) {
POPUP_MENU_ADD_ITEM(STR_VIEW_NOTES);
}
@@ -459,18 +457,15 @@ void menuMainView(event_t event)
#if defined(EVT_KEY_LAST_MENU)
case EVT_KEY_LAST_MENU:
pushMenu(lastPopMenu());
killEvents(event);
break;
#endif
case EVT_KEY_MODEL_MENU:
pushMenu(menuModelSelect);
killEvents(event);
break;
case EVT_KEY_GENERAL_MENU:
pushMenu(menuTabGeneral[0].menuFunc);
killEvents(event);
break;
#if defined(EVT_KEY_PREVIOUS_VIEW)
@@ -492,13 +487,11 @@ void menuMainView(event_t event)
#if defined(EVT_KEY_STATISTICS)
case EVT_KEY_STATISTICS:
chainMenu(menuStatisticsView);
killEvents(event);
break;
#endif
case EVT_KEY_TELEMETRY:
chainMenu(menuViewTelemetry);
killEvents(event);
break;
radio/src/gui/128x64/view_statistics.cpp
+5 -41
View File
@@ -40,27 +40,13 @@ void menuStatisticsView(event_t event)
switch (event) {
case EVT_KEY_FIRST(KEY_UP):
#if defined(KEYS_GPIO_REG_PAGEDN)
case EVT_KEY_BREAK(KEY_PAGEDN):
#elif defined(NAVIGATION_X7)
case EVT_KEY_BREAK(KEY_PAGE):
#endif
chainMenu(menuStatisticsDebug);
break;
case EVT_KEY_FIRST(KEY_DOWN):
#if defined(KEYS_GPIO_REG_PAGEUP)
case EVT_KEY_BREAK(KEY_PAGEUP):
killEvents(event);
chainMenu(menuStatisticsDebug2);
#elif defined(NAVIGATION_X7)
case EVT_KEY_LONG(KEY_PAGE):
killEvents(event);
chainMenu(menuStatisticsDebug2);
#else
chainMenu(menuStatisticsDebug);
#endif
break;
case EVT_KEY_LONG(KEY_ENTER):
@@ -69,7 +55,7 @@ void menuStatisticsView(event_t event)
sessionTimer = 0;
break;
case EVT_KEY_FIRST(KEY_EXIT):
case EVT_KEY_BREAK(KEY_EXIT):
chainMenu(menuMainView);
break;
}
@@ -128,10 +114,9 @@ void menuStatisticsDebug(event_t event)
g_eeGeneral.globalTimer = 0;
sessionTimer = 0;
storageDirty(EE_GENERAL);
killEvents(event);
break;
case EVT_KEY_FIRST(KEY_ENTER):
case EVT_KEY_BREAK(KEY_ENTER):
#if defined(LUA)
maxLuaInterval = 0;
maxLuaDuration = 0;
@@ -140,30 +125,18 @@ void menuStatisticsDebug(event_t event)
break;
case EVT_KEY_FIRST(KEY_UP):
#if defined(KEYS_GPIO_REG_PAGEDN)
case EVT_KEY_BREAK(KEY_PAGEDN):
disableVBatBridge();
chainMenu(menuStatisticsDebug2);
break;
#elif defined(NAVIGATION_X7)
case EVT_KEY_BREAK(KEY_PAGE):
disableVBatBridge();
chainMenu(menuStatisticsDebug2);
break;
#endif
case EVT_KEY_FIRST(KEY_DOWN):
#if defined(KEYS_GPIO_REG_PAGEUP)
case EVT_KEY_BREAK(KEY_PAGEUP):
#elif defined(NAVIGATION_X7)
case EVT_KEY_LONG(KEY_PAGE):
#endif
killEvents(event);
disableVBatBridge();
chainMenu(menuStatisticsView);
break;
case EVT_KEY_FIRST(KEY_EXIT):
case EVT_KEY_BREAK(KEY_EXIT):
disableVBatBridge();
chainMenu(menuMainView);
break;
@@ -221,30 +194,21 @@ void menuStatisticsDebug2(event_t event)
title(STR_MENUDEBUG);
switch(event) {
// case EVT_KEY_FIRST(KEY_ENTER):
// case EVT_KEY_BREAK(KEY_ENTER):
// telemetryErrors = 0;
// break;
case EVT_KEY_FIRST(KEY_UP):
#if defined(KEYS_GPIO_REG_PAGEDN)
case EVT_KEY_BREAK(KEY_PAGEDN):
#elif defined(NAVIGATION_X7)
case EVT_KEY_BREAK(KEY_PAGE):
#endif
chainMenu(menuStatisticsView);
return;
case EVT_KEY_FIRST(KEY_DOWN):
#if defined(KEYS_GPIO_REG_PAGEUP)
case EVT_KEY_BREAK(KEY_PAGEUP):
#elif defined(NAVIGATION_X7)
case EVT_KEY_LONG(KEY_PAGE):
#endif
killEvents(event);
chainMenu(menuStatisticsDebug);
break;
case EVT_KEY_FIRST(KEY_EXIT):
case EVT_KEY_BREAK(KEY_EXIT):
chainMenu(menuMainView);
break;
}
radio/src/gui/212x64/model_curve_edit.cpp
-2
View File
@@ -161,14 +161,12 @@ void menuModelCurveOne(event_t event)
case EVT_KEY_LONG(KEY_ENTER):
if (menuVerticalPosition > 1) {
killEvents(event);
POPUP_MENU_START(onCurveOneMenu, 3, STR_CURVE_PRESET, STR_MIRROR, STR_CLEAR);
}
break;
case EVT_KEY_LONG(KEY_MENU):
pushMenu(menuChannelsView);
killEvents(event);
break;
}
radio/src/gui/212x64/model_custom_scripts.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ void menuModelCustomScripts(event_t event)
coord_t y;
int8_t sub = menuVerticalPosition;
if (event == EVT_KEY_FIRST(KEY_ENTER)) {
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
s_currIdx = sub;
pushMenu(menuModelCustomScriptOne);
}
radio/src/gui/212x64/model_failsafe.cpp
-1
View File
@@ -37,7 +37,6 @@ void menuModelFailsafe(event_t event)
break;
case EVT_KEY_LONG(KEY_ENTER):
killEvents(event);
event = 0;
if (menuVerticalPosition < sentModuleChannels(g_moduleIdx)) {
radio/src/gui/212x64/model_flightmodes.cpp
+2 -4
View File
@@ -76,10 +76,9 @@ void menuModelFlightModesAll(event_t event)
drawFlightMode(OFS_CHECKTRIMS, (LCD_LINES-1)*FH+1, mixerCurrentFlightMode+1);
if (sub == MAX_FLIGHT_MODES) {
if (!trimsCheckTimer) {
if (event == EVT_KEY_FIRST(KEY_ENTER)) {
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
trimsCheckTimer = 200; // 2 seconds trims cancelled
s_editMode = 1;
killEvents(event);
}
else {
lcdInvertLastLine();
@@ -87,10 +86,9 @@ void menuModelFlightModesAll(event_t event)
}
}
else {
if (event == EVT_KEY_FIRST(KEY_EXIT)) {
if (event == EVT_KEY_BREAK(KEY_EXIT)) {
trimsCheckTimer = 0;
s_editMode = 0;
killEvents(event);
}
}
}
radio/src/gui/212x64/model_gvars.cpp
-1
View File
@@ -197,7 +197,6 @@ void menuModelGVars(event_t event)
}
if ((menuHorizontalPosition<0 || !modelFMEnabled()) && event==EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
POPUP_MENU_START(onGVARSMenu, 2, STR_EDIT, STR_CLEAR);
}
}
radio/src/gui/212x64/model_input_edit.cpp
-1
View File
@@ -59,7 +59,6 @@ void menuModelExpoOne(event_t event)
{
if (event == EVT_KEY_LONG(KEY_MENU)) {
pushMenu(menuChannelsView);
killEvents(event);
}
ExpoData * ed = expoAddress(s_currIdx);
radio/src/gui/212x64/model_logical_switches.cpp
-2
View File
@@ -89,7 +89,6 @@ void menuModelLogicalSwitches(event_t event)
}
if (horz<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
killEvents(event);
LogicalSwitchData * cs = lswAddress(sub);
if (cs->func)
POPUP_MENU_ADD_ITEM(STR_COPY);
@@ -233,7 +232,6 @@ void menuModelLogicalSwitches(event_t event)
}
cs->v2 = CHECK_INCDEC_PARAM(event, cs->v2, v2_min, v2_max);
if (cstate==LS_FAMILY_OFS && cs->v1!=0 && event==EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
getvalue_t x = getValue(v1_val);
if (abs(v1_val) <= MIXSRC_LAST_CH) {
cs->v2 = calcRESXto100(x);
radio/src/gui/212x64/model_mix_edit.cpp
-1
View File
@@ -92,7 +92,6 @@ void menuModelMixOne(event_t event)
{
if (event == EVT_KEY_LONG(KEY_MENU)) {
pushMenu(menuChannelsView);
killEvents(event);
}
MixData * md2 = mixAddress(s_currIdx) ;
radio/src/gui/212x64/model_outputs.cpp
-2
View File
@@ -128,7 +128,6 @@ void menuModelLimits(event_t event)
s_editMode = 0;
if (event==EVT_KEY_LONG(KEY_ENTER)) {
START_NO_HIGHLIGHT();
killEvents(event);
moveTrimsToOffsets(); // if highlighted and menu pressed - move trims to offsets
}
}
@@ -147,7 +146,6 @@ void menuModelLimits(event_t event)
putsChn(0, y, k+1, (sub==k && menuHorizontalPosition < 0) ? INVERS : 0);
if (sub==k && menuHorizontalPosition < 0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
killEvents(event);
POPUP_MENU_START(onLimitsMenu, 4, STR_RESET, STR_COPY_TRIMS_TO_OFS, STR_COPY_STICKS_TO_OFS, STR_COPY_MIN_MAX_TO_OUTPUTS);
}
radio/src/gui/212x64/model_select.cpp
+3 -6
View File
@@ -142,7 +142,6 @@ void menuModelSelect(event_t event)
strcat_modelname (nametmp, sub, 0);
POPUP_CONFIRMATION(STR_DELETEMODEL, nullptr);
SET_WARNING_INFO(nametmp, sizeof(g_model.header.name), 0);
killEvents(event);
break;
}
// no break
@@ -202,7 +201,6 @@ void menuModelSelect(event_t event)
}
else if (event == EVT_KEY_LONG(KEY_ENTER)) {
s_copyMode = 0;
killEvents(event);
if (g_eeGeneral.currModel != sub) {
if (modelExists(sub)) {
POPUP_MENU_ADD_ITEM(STR_SELECT_MODEL);
@@ -230,12 +228,11 @@ void menuModelSelect(event_t event)
}
break;
case EVT_KEY_BREAK(KEY_PAGE):
case EVT_KEY_LONG(KEY_PAGE):
chainMenu(event == EVT_KEY_BREAK(KEY_PAGE)
case EVT_KEY_BREAK(KEY_PAGEDN):
case EVT_KEY_BREAK(KEY_PAGEUP):
chainMenu(event == EVT_KEY_BREAK(KEY_PAGEDN)
? menuModelSetup
: menuTabModel[DIM(menuTabModel) - 1].menuFunc);
killEvents(event);
break;
}
radio/src/gui/212x64/model_setup.cpp
+2 -8
View File
@@ -896,7 +896,6 @@ void menuModelSetup(event_t event)
AUDIO_WARNING1();
storageDirty(EE_MODEL);
}
killEvents(event);
break;
}
}
@@ -961,7 +960,6 @@ void menuModelSetup(event_t event)
if (!READ_ONLY() && menuHorizontalPosition > 0) {
switch (event) {
case EVT_KEY_LONG(KEY_ENTER):
killEvents(event);
if (g_model.potsWarnMode == POTS_WARN_MANUAL) {
SAVE_POT_POSITION(menuHorizontalPosition-1);
AUDIO_WARNING1();
@@ -1292,7 +1290,6 @@ void menuModelSetup(event_t event)
// START_NO_HIGHLIGHT();
// telemetryErrors = 0;
// AUDIO_WARNING1();
// killEvents(event);
// }
// }
break;
@@ -1552,7 +1549,6 @@ void menuModelSetup(event_t event)
modelHeaders[g_eeGeneral.currModel].modelId[moduleIdx] = g_model.header.modelId[moduleIdx];
}
else if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
uint8_t newVal = findNextUnusedModelId(g_eeGeneral.currModel, moduleIdx);
if (newVal != g_model.header.modelId[moduleIdx]) {
modelHeaders[g_eeGeneral.currModel].modelId[moduleIdx] = g_model.header.modelId[moduleIdx] = newVal;
@@ -1660,7 +1656,6 @@ void menuModelSetup(event_t event)
s_editMode = 0;
if (moduleData.failsafeMode == FAILSAFE_CUSTOM) {
if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
setCustomFailsafe(moduleIdx);
AUDIO_WARNING1();
SEND_FAILSAFE_NOW(moduleIdx);
@@ -2016,15 +2011,14 @@ void menuModelSetup(event_t event)
case ITEM_MODEL_SETUP_USBJOYSTICK_CH_BUTTON:
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_USBJOYSTICK_SETTINGS), attr);
if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
pushMenu(menuModelUSBJoystick);
}
break;
case ITEM_MODEL_SETUP_USBJOYSTICK_APPLY:
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_USBJOYSTICK_APPLY_CHANGES), attr);
if (attr && !READ_ONLY() && event == EVT_KEY_FIRST(KEY_ENTER)) {
killEvents(event);
if (attr && !READ_ONLY() && event == EVT_KEY_BREAK(KEY_ENTER)) {
onUSBJoystickModelChanged();
}
break;
radio/src/gui/212x64/model_special_functions.cpp
-2
View File
@@ -155,7 +155,6 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
int sub = menuVerticalPosition;
uint8_t eeFlags = (functions == g_model.customFn) ? EE_MODEL : EE_GENERAL;
if (menuHorizontalPosition<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
killEvents(event);
CustomFunctionData *cfn = &functions[sub];
if (!CFN_EMPTY(cfn))
POPUP_MENU_ADD_ITEM(STR_COPY);
@@ -396,7 +395,6 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
if (active || event==EVT_KEY_LONG(KEY_ENTER)) {
CFN_PARAM(cfn) = CHECK_INCDEC_PARAM(event, val_displayed, val_min, val_max);
if (func == FUNC_ADJUST_GVAR && attr && event==EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_CONSTANT)
POPUP_MENU_ADD_ITEM(STR_CONSTANT);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_SOURCE)
radio/src/gui/212x64/model_telemetry.cpp
-2
View File
@@ -160,7 +160,6 @@ void menuModelTelemetry(event_t event)
s_editMode = 0;
s_currIdx = index;
if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
POPUP_MENU_START(onSensorMenu, 3, STR_EDIT, STR_COPY, STR_DELETE);
}
else if (event == EVT_KEY_BREAK(KEY_ENTER)) {
@@ -211,7 +210,6 @@ void menuModelTelemetry(event_t event)
if (attr) {
s_editMode = 0;
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
killEvents(KEY_ENTER);
POPUP_CONFIRMATION(STR_CONFIRMDELETE, onDeleteAllSensorsConfirm);
}
}
radio/src/gui/212x64/radio_diaganas.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ void menuRadioDiagAnalogs(event_t event)
static int viewpage = ANAVIEW_FIRST;
if (event == EVT_KEY_BREAK(KEY_PAGE)) {
if (event == EVT_KEY_BREAK(KEY_PAGEDN)) {
if (viewpage == ANAVIEW_LAST)
viewpage = ANAVIEW_FIRST;
else
radio/src/gui/212x64/radio_setup.cpp
+1 -1
View File
@@ -136,7 +136,7 @@ void menuRadioSetup(event_t event)
if ((menuVerticalPosition==ITEM_RADIO_SETUP_DATE || menuVerticalPosition==ITEM_RADIO_SETUP_TIME) &&
(s_editMode>0) &&
(event==EVT_KEY_FIRST(KEY_ENTER) || event==EVT_KEY_BREAK(KEY_ENTER) || event==EVT_KEY_LONG(KEY_ENTER) || event==EVT_KEY_FIRST(KEY_EXIT))) {
(event==EVT_KEY_BREAK(KEY_ENTER) || event==EVT_KEY_BREAK(KEY_ENTER) || event==EVT_KEY_LONG(KEY_ENTER) || event==EVT_KEY_BREAK(KEY_EXIT))) {
// set the date and time into RTC chip
rtcSetTime(&t);
}
radio/src/gui/212x64/view_about.cpp
+2 -2
View File
@@ -36,8 +36,8 @@ void menuAboutView(event_t event)
{
switch(event)
{
case EVT_KEY_FIRST(KEY_ENTER):
case EVT_KEY_FIRST(KEY_EXIT):
case EVT_KEY_BREAK(KEY_ENTER):
case EVT_KEY_BREAK(KEY_EXIT):
chainMenu(menuMainView);
break;
}
radio/src/gui/212x64/view_channels.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ void menuChannelsView(event_t event)
viewChannels.secondPage = !viewChannels.secondPage;
break;
case EVT_KEY_FIRST(KEY_ENTER):
case EVT_KEY_BREAK(KEY_ENTER):
viewChannels.mixersView = !viewChannels.mixersView;
break;
}
radio/src/gui/212x64/view_main.cpp
+3 -6
View File
@@ -383,7 +383,7 @@ void displayTimers()
void menuMainViewChannelsMonitor(event_t event)
{
switch(event) {
case EVT_KEY_BREAK(KEY_PAGE):
case EVT_KEY_BREAK(KEY_PAGEDN):
case EVT_KEY_BREAK(KEY_EXIT):
chainMenu(menuMainView);
event = 0;
@@ -472,7 +472,6 @@ void menuMainView(event_t event)
break;
case EVT_KEY_LONG(KEY_ENTER):
killEvents(event);
if (modelHasNotes()) {
POPUP_MENU_ADD_ITEM(STR_VIEW_NOTES);
}
@@ -485,10 +484,9 @@ void menuMainView(event_t event)
case EVT_KEY_LONG(KEY_MENU):
pushMenu(menuTabGeneral[0].menuFunc);
killEvents(event);
break;
case EVT_KEY_BREAK(KEY_PAGE):
case EVT_KEY_BREAK(KEY_PAGEDN):
storageDirty(EE_MODEL);
g_model.view += 1;
if (g_model.view >= VIEW_COUNT) {
@@ -497,9 +495,8 @@ void menuMainView(event_t event)
}
break;
case EVT_KEY_LONG(KEY_PAGE):
case EVT_KEY_BREAK(KEY_PAGEUP):
chainMenu(menuViewTelemetry);
killEvents(event);
break;
case EVT_KEY_FIRST(KEY_EXIT):
radio/src/gui/212x64/view_statistics.cpp
+20 -26
View File
@@ -33,14 +33,13 @@ void menuStatisticsView(event_t event)
title(STR_MENUSTAT);
switch(event) {
case EVT_KEY_FIRST(KEY_PLUS):
case EVT_KEY_BREAK(KEY_PAGE):
case EVT_KEY_BREAK(KEY_PLUS):
case EVT_KEY_BREAK(KEY_PAGEDN):
chainMenu(menuStatisticsDebug);
break;
case EVT_KEY_FIRST(KEY_MINUS):
case EVT_KEY_LONG(KEY_PAGE):
killEvents(event);
case EVT_KEY_BREAK(KEY_MINUS):
case EVT_KEY_BREAK(KEY_PAGEUP):
#if defined(DEBUG_TRACE_BUFFER)
chainMenu(menuTraceBuffer);
#else
@@ -55,7 +54,7 @@ void menuStatisticsView(event_t event)
sessionTimer = 0;
break;
case EVT_KEY_FIRST(KEY_EXIT):
case EVT_KEY_BREAK(KEY_EXIT):
chainMenu(menuMainView);
break;
}
@@ -123,10 +122,9 @@ void menuStatisticsDebug(event_t event)
g_eeGeneral.globalTimer = 0;
sessionTimer = 0;
storageDirty(EE_GENERAL);
killEvents(event);
break;
case EVT_KEY_FIRST(KEY_ENTER):
case EVT_KEY_BREAK(KEY_ENTER):
#if defined(LUA)
maxLuaInterval = 0;
maxLuaDuration = 0;
@@ -134,20 +132,19 @@ void menuStatisticsDebug(event_t event)
maxMixerDuration = 0;
break;
case EVT_KEY_FIRST(KEY_PLUS):
case EVT_KEY_BREAK(KEY_PAGE):
case EVT_KEY_BREAK(KEY_PLUS):
case EVT_KEY_BREAK(KEY_PAGEDN):
disableVBatBridge();
chainMenu(menuStatisticsDebug2);
break;
case EVT_KEY_FIRST(KEY_MINUS):
case EVT_KEY_LONG(KEY_PAGE):
killEvents(event);
case EVT_KEY_BREAK(KEY_MINUS):
case EVT_KEY_BREAK(KEY_PAGEUP):
disableVBatBridge();
chainMenu(menuStatisticsView);
break;
case EVT_KEY_FIRST(KEY_EXIT):
case EVT_KEY_BREAK(KEY_EXIT):
disableVBatBridge();
chainMenu(menuMainView);
break;
@@ -217,8 +214,8 @@ void menuStatisticsDebug2(event_t event)
title(STR_MENUDEBUG);
switch(event) {
case EVT_KEY_FIRST(KEY_PLUS):
case EVT_KEY_BREAK(KEY_PAGE):
case EVT_KEY_BREAK(KEY_PLUS):
case EVT_KEY_BREAK(KEY_PAGEDN):
#if defined(DEBUG_TRACE_BUFFER)
chainMenu(menuTraceBuffer);
#else
@@ -226,13 +223,12 @@ void menuStatisticsDebug2(event_t event)
#endif
return;
case EVT_KEY_FIRST(KEY_MINUS):
case EVT_KEY_LONG(KEY_PAGE):
killEvents(event);
case EVT_KEY_BREAK(KEY_MINUS):
case EVT_KEY_BREAK(KEY_PAGEUP):
chainMenu(menuStatisticsDebug);
break;
case EVT_KEY_FIRST(KEY_EXIT):
case EVT_KEY_BREAK(KEY_EXIT):
chainMenu(menuMainView);
break;
@@ -257,17 +253,15 @@ void menuTraceBuffer(event_t event)
{
case EVT_KEY_LONG(KEY_ENTER):
dumpTraceBuffer();
killEvents(event);
break;
case EVT_KEY_FIRST(KEY_MINUS):
case EVT_KEY_LONG(KEY_PAGE):
killEvents(event);
case EVT_KEY_BREAK(KEY_MINUS):
case EVT_KEY_BREAK(KEY_PAGEUP):
chainMenu(menuStatisticsDebug2);
break;
case EVT_KEY_FIRST(KEY_PLUS):
case EVT_KEY_BREAK(KEY_PAGE):
case EVT_KEY_BREAK(KEY_PLUS):
case EVT_KEY_BREAK(KEY_PAGEDN):
chainMenu(menuStatisticsView);
return;
}
radio/src/gui/colorlcd/LvglWrapper.cpp
-1
View File
@@ -111,7 +111,6 @@ static void dispatch_kb_event(Window* w, event_t evt)
} else if (key != KEY_ENTER) {
w->onEvent(evt);
} else if (evt == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(KEY_ENTER);
lv_event_send(w->getLvObj(), LV_EVENT_LONG_PRESSED, nullptr);
}
}
radio/src/gui/colorlcd/gvar_numberedit.cpp
-2
View File
@@ -119,8 +119,6 @@ void GVarNumberEdit::setSuffix(std::string value)
void GVarNumberEdit::onEvent(event_t event)
{
if (event == EVT_KEY_LONG(KEY_ENTER)) {
// TODO: check this...
// killEvents(event);
switchGVarMode();
} else {
Window::onEvent(event);
radio/src/gui/colorlcd/menu_model.cpp
+1 -1
View File
@@ -77,7 +77,7 @@ void ModelMenu::addGoToMonitorsButton()
getHeaderWindow(),
{LCD_W / 2 + 6, MENU_TITLE_TOP + 1, LCD_W / 2 - 8, MENU_TITLE_HEIGHT - 2},
STR_OPEN_CHANNEL_MONITORS, [=]() {
pushEvent(EVT_KEY_FIRST(KEY_MODEL));
pushEvent(EVT_KEY_BREAK(KEY_MODEL));
return 0;
});
}
radio/src/gui/colorlcd/model_templates.cpp
-1
View File
@@ -83,7 +83,6 @@ void TemplatePage::updateInfo()
void TemplatePage::onEvent(event_t event)
{
if (event == EVT_KEY_LONG(KEY_EXIT) || event == EVT_KEY_BREAK(KEY_EXIT)) {
killEvents(event);
deleteLater();
} else {
Page::onEvent(event);
radio/src/gui/colorlcd/select_fab_carousel.cpp
-1
View File
@@ -123,7 +123,6 @@ class SelectFabButton : public ButtonBase
#if defined(HARDWARE_KEYS)
switch (event) {
case EVT_KEY_BREAK(KEY_EXIT):
killEvents(event);
parent->deleteLater();
return;
}
radio/src/gui/common/stdlcd/draw_functions.cpp
-2
View File
@@ -241,7 +241,6 @@ void editName(coord_t x, coord_t y, char* name, uint8_t size, event_t event,
#if !defined(NAVIGATION_XLITE)
if (v == ' ') {
s_editMode = 0;
killEvents(event);
break;
}
else
@@ -255,7 +254,6 @@ void editName(coord_t x, coord_t y, char* name, uint8_t size, event_t event,
#if defined(NAVIGATION_9X)
if (event==EVT_KEY_LONG(KEY_LEFT))
killEvents(KEY_LEFT);
#endif
break;
}
radio/src/gui/common/stdlcd/menus.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ void chainMenu(MenuHandlerFunc newMenu)
void pushMenu(MenuHandlerFunc newMenu)
{
killEvents(KEY_ENTER);
killEvents(KEY_ENTER); // TODO: Check if needed.
if (menuLevel == 0) {
if (newMenu == menuRadioSetup)
radio/src/gui/common/stdlcd/model_inputs.cpp
-3
View File
@@ -262,7 +262,6 @@ void menuModelExposAll(event_t event)
case EVT_KEY_LONG(KEY_EXIT):
if (s_copyMode && s_copyTgtOfs == 0) {
deleteExpo(s_currIdx);
killEvents(event);
event = 0;
}
// no break
@@ -297,7 +296,6 @@ void menuModelExposAll(event_t event)
}
// no break
case EVT_KEY_LONG(KEY_ENTER):
killEvents(event);
if (s_copyTgtOfs) {
s_copyMode = 0;
s_copyTgtOfs = 0;
@@ -335,7 +333,6 @@ void menuModelExposAll(event_t event)
// insertExpo(s_currIdx);
// pushMenu(menuModelExpoOne);
// s_copyMode = 0;
// killEvents(event);
// }
// break;
}
radio/src/gui/common/stdlcd/model_mixes.cpp
-3
View File
@@ -178,7 +178,6 @@ void menuModelMixAll(event_t event)
case EVT_KEY_LONG(KEY_EXIT):
if (s_copyMode && s_copyTgtOfs == 0) {
deleteMix(s_currIdx);
killEvents(event);
event = 0;
}
// no break
@@ -214,7 +213,6 @@ void menuModelMixAll(event_t event)
// no break
case EVT_KEY_LONG(KEY_ENTER):
killEvents(event);
if (s_copyTgtOfs) {
s_copyMode = 0;
s_copyTgtOfs = 0;
@@ -252,7 +250,6 @@ void menuModelMixAll(event_t event)
// insertMix(s_currIdx, s_currCh - 1);
// pushMenu(menuModelMixOne);
// s_copyMode = 0;
// killEvents(event);
// }
// break;
}
radio/src/gui/common/stdlcd/model_module_options.cpp
+1 -2
View File
@@ -91,7 +91,7 @@ void menuModelModuleOptions(event_t event)
}
if (menuEvent) {
killEvents(KEY_EXIT);
killEvents(KEY_EXIT); // TODO: Check if needed
moduleState[g_moduleIdx].mode = MODULE_MODE_NORMAL;
if (reusableBuffer.hardwareAndSettings.moduleSettings.dirty) {
abortPopMenu();
@@ -103,7 +103,6 @@ void menuModelModuleOptions(event_t event)
}
if (event == EVT_KEY_LONG(KEY_ENTER) && reusableBuffer.hardwareAndSettings.moduleSettings.dirty) {
killEvents(event);
reusableBuffer.hardwareAndSettings.moduleSettings.dirty = MODULE_SETTINGS_OK;
moduleState[g_moduleIdx].writeModuleSettings(&reusableBuffer.hardwareAndSettings.moduleSettings);
}
radio/src/gui/common/stdlcd/model_receiver_options.cpp
+1 -2
View File
@@ -106,7 +106,7 @@ void menuModelReceiverOptions(event_t event)
});
if (menuEvent) {
killEvents(KEY_EXIT);
killEvents(KEY_EXIT); // TODO: Check if needed
moduleState[g_moduleIdx].mode = MODULE_MODE_NORMAL;
if (reusableBuffer.hardwareAndSettings.receiverSettings.dirty) {
abortPopMenu();
@@ -127,7 +127,6 @@ void menuModelReceiverOptions(event_t event)
}
if (event == EVT_KEY_LONG(KEY_ENTER) && reusableBuffer.hardwareAndSettings.receiverSettings.dirty) {
killEvents(event);
reusableBuffer.hardwareAndSettings.receiverSettings.dirty = RECEIVER_SETTINGS_OK;
moduleState[g_moduleIdx].writeReceiverSettings(&reusableBuffer.hardwareAndSettings.receiverSettings);
}
radio/src/gui/common/stdlcd/model_usbjoystick.cpp
+6 -13
View File
@@ -50,21 +50,15 @@ enum USBJFields {
void menuModelUSBJoystickOne(event_t event)
{
#if defined(KEYS_GPIO_REG_MDL)
if (event == EVT_KEY_FIRST(KEY_MODEL)) {
pushMenu(menuChannelsView);
killEvents(event);
}
#elif defined(NAVIGATION_X7)
if (event == EVT_KEY_FIRST(KEY_MENU)) {
pushMenu(menuChannelsView);
killEvents(event);
}
#elif defined(NAVIGATION_XLITE)
#if defined(NAVIGATION_XLITE)
if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
pushMenu(menuChannelsView);
killEvents(event);
}
#else
if (event == EVT_KEY_BREAK(KEY_MODEL) || event == EVT_KEY_BREAK(KEY_MENU)) {
pushMenu(menuChannelsView);
}
#endif
USBJoystickChData * cch = usbJChAddress(s_currIdx);
putsChn(12*FW, 0, s_currIdx+1, 0);
@@ -198,8 +192,7 @@ void menuModelUSBJoystick(event_t event)
coord_t y = 0;
uint8_t k = 0;
if (event == EVT_KEY_FIRST(KEY_ENTER)) {
killEvents(event);
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
USBJoystickChData * cch = usbJChAddress(sub);
s_currIdx = sub;
if (sub >= 0)
radio/src/gui/common/stdlcd/radio_ghost_menu.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ void menuGhostModuleConfig(event_t event)
break;
case EVT_KEY_FIRST(KEY_ENTER):
case EVT_KEY_BREAK(KEY_ENTER):
reusableBuffer.ghostMenu.buttonAction = GHST_BTN_JOYPRESS;
reusableBuffer.ghostMenu.menuAction = GHST_MENU_CTRL_NONE;
moduleState[EXTERNAL_MODULE].counter = GHST_MENU_CONTROL;
radio/src/gui/common/stdlcd/radio_hardware.cpp
+1 -1
View File
@@ -265,7 +265,7 @@ void menuRadioHardware(event_t event)
case ITEM_RADIO_HARDWARE_LABEL_STICKS:
lcdDrawTextAlignedLeft(y, STR_STICKS);
lcdDrawText(HW_SETTINGS_COLUMN2, y, BUTTON(TR_CALIBRATION), attr);
if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
pushMenu(menuRadioCalibration);
}
break;
radio/src/gui/common/stdlcd/radio_power_meter.cpp
+1 -2
View File
@@ -40,8 +40,7 @@ void menuRadioPowerMeter(event_t event)
if (TELEMETRY_STREAMING()) {
lcdDrawCenteredText(LCD_H/2, STR_TURN_OFF_RECEIVER);
if (event == EVT_KEY_FIRST(KEY_EXIT)) {
killEvents(event);
if (event == EVT_KEY_BREAK(KEY_EXIT)) {
popMenu();
}
return;
radio/src/gui/common/stdlcd/radio_sdmanager.cpp
-4
View File
@@ -307,7 +307,6 @@ void menuRadioSdManager(event_t _event)
#if defined(KEYS_GPIO_REG_MENU)
case EVT_KEY_LONG(KEY_MENU):
if (SD_CARD_PRESENT() && !READ_ONLY() && s_editMode == 0) {
killEvents(_event);
POPUP_MENU_ADD_ITEM(STR_SD_INFO);
POPUP_MENU_START(onSdManagerMenu);
}
@@ -332,7 +331,6 @@ void menuRadioSdManager(event_t _event)
menuVerticalOffset = 0;
menuVerticalPosition = HEADER_LINE;
REFRESH_FILES();
killEvents(_event);
return;
}
}
@@ -341,7 +339,6 @@ void menuRadioSdManager(event_t _event)
case EVT_KEY_LONG(KEY_ENTER):
#if (HEADER_LINE > 0)
if (menuVerticalPosition < HEADER_LINE) {
killEvents(_event);
POPUP_MENU_ADD_ITEM(STR_SD_INFO);
POPUP_MENU_START(onSdManagerMenu);
break;
@@ -351,7 +348,6 @@ void menuRadioSdManager(event_t _event)
getSelectionFullPath(lfn);
if (SD_CARD_PRESENT() && s_editMode <= 0) {
killEvents(_event);
int index = menuVerticalPosition - HEADER_LINE - menuVerticalOffset;
char * line = reusableBuffer.sdManager.lines[index];
if (!strcmp(line, "..")) {
radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp
+1 -2
View File
@@ -56,8 +56,7 @@ void menuRadioSpectrumAnalyser(event_t event)
if (moduleState[g_moduleIdx].mode != MODULE_MODE_SPECTRUM_ANALYSER) {
if (TELEMETRY_STREAMING()) {
lcdDrawCenteredText(LCD_H/2, STR_TURN_OFF_RECEIVER);
if (event == EVT_KEY_FIRST(KEY_EXIT)) {
killEvents(event);
if (event == EVT_KEY_BREAK(KEY_EXIT)) {
popMenu();
}
return;
radio/src/gui/common/stdlcd/view_telemetry.cpp
+3 -8
View File
@@ -39,8 +39,8 @@ enum NavigationDirection {
#define EVT_KEY_PREVIOUS_VIEW(evt) (evt == EVT_KEY_FIRST(KEY_PAGEUP))
#define EVT_KEY_NEXT_VIEW(evt) (evt == EVT_KEY_FIRST(KEY_PAGEDN))
#elif defined(NAVIGATION_X7) || defined(NAVIGATION_X9D)
#define EVT_KEY_PREVIOUS_VIEW(evt) (evt == EVT_KEY_LONG(KEY_PAGE))
#define EVT_KEY_NEXT_VIEW(evt) (evt == EVT_KEY_BREAK(KEY_PAGE))
#define EVT_KEY_PREVIOUS_VIEW(evt) (evt == EVT_KEY_BREAK(KEY_PAGEUP))
#define EVT_KEY_NEXT_VIEW(evt) (evt == EVT_KEY_BREAK(KEY_PAGEDN))
#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))
@@ -53,26 +53,21 @@ void menuViewTelemetry(event_t event)
{
enum NavigationDirection direction = NAVIGATION_DIRECTION_NONE;
if (event == EVT_KEY_FIRST(KEY_EXIT) && TELEMETRY_SCREEN_TYPE(s_frsky_view) != TELEMETRY_SCREEN_TYPE_SCRIPT) {
killEvents(event);
if (event == EVT_KEY_BREAK(KEY_EXIT) && TELEMETRY_SCREEN_TYPE(s_frsky_view) != TELEMETRY_SCREEN_TYPE_SCRIPT) {
chainMenu(menuMainView);
}
#if defined(LUA)
else if (event == EVT_KEY_LONG(KEY_EXIT)) {
killEvents(event);
chainMenu(menuMainView);
}
#endif
else if (EVT_KEY_PREVIOUS_VIEW(event)) {
killEvents(event);
decrTelemetryScreen();
}
else if (EVT_KEY_NEXT_VIEW(event)) {
killEvents(event);
incrTelemetryScreen();
}
else if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
POPUP_MENU_START(onMainViewMenu, 2, STR_RESET_TELEMETRY, STR_RESET_FLIGHT);
}
radio/src/gui/navigation/navigation_9x.cpp
+1 -1
View File
@@ -228,7 +228,7 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
s_editMode = EDIT_MODE_INIT;
break;
case EVT_KEY_FIRST(KEY_ENTER):
case EVT_KEY_BREAK(KEY_ENTER):
if (!menuTab || l_posVert>0) {
if (READ_ONLY_UNLOCKED()) {
s_editMode = (s_editMode <= 0);
radio/src/gui/navigation/navigation_x7.cpp
+2 -13
View File
@@ -141,7 +141,6 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
if (i_flags & INCDEC_SOURCE) {
if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
checkIncDecSelection = MIXSRC_NONE;
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
@@ -194,7 +193,6 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
}
else if (i_flags & INCDEC_SWITCH) {
if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
checkIncDecSelection = SWSRC_NONE;
if (i_min <= SWSRC_FIRST_SWITCH && i_max >= SWSRC_LAST_SWITCH) POPUP_MENU_ADD_ITEM(STR_MENU_SWITCHES);
if (i_min <= SWSRC_FIRST_TRIM && i_max >= SWSRC_LAST_TRIM) POPUP_MENU_ADD_ITEM(STR_MENU_TRIMS);
@@ -286,23 +284,14 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
if (menuTab) {
int cc = curr;
switch (event) {
#if defined(KEYS_GPIO_REG_PAGEUP)
case EVT_KEY_FIRST(KEY_PAGEUP):
#else
case EVT_KEY_LONG(KEY_PAGE):
#endif
case EVT_KEY_BREAK(KEY_PAGEUP):
if (s_editMode>0)
break;
cc = chgMenu(curr, menuTab, menuTabSize, -1);
killEvents(event);
break;
#if defined(KEYS_GPIO_REG_PAGEDN)
case EVT_KEY_FIRST(KEY_PAGEDN):
#else
case EVT_KEY_BREAK(KEY_PAGE):
#endif
case EVT_KEY_BREAK(KEY_PAGEDN):
if (s_editMode>0)
break;
radio/src/gui/navigation/navigation_x9d.cpp
+2 -6
View File
@@ -141,7 +141,6 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
if (i_flags & INCDEC_SOURCE) {
if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
checkIncDecSelection = MIXSRC_NONE;
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
@@ -194,7 +193,6 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
}
else if (i_flags & INCDEC_SWITCH) {
if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
checkIncDecSelection = SWSRC_NONE;
if (i_min <= SWSRC_FIRST_SWITCH && i_max >= SWSRC_LAST_SWITCH) POPUP_MENU_ADD_ITEM(STR_MENU_SWITCHES);
if (i_min <= SWSRC_FIRST_TRIM && i_max >= SWSRC_LAST_TRIM) POPUP_MENU_ADD_ITEM(STR_MENU_TRIMS);
@@ -329,7 +327,6 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
switch (event) {
case EVT_KEY_LONG(KEY_MENU):
if (menuTab == menuTabModel) {
killEvents(event);
if (modelHasNotes()) {
POPUP_MENU_ADD_SD_ITEM(STR_VIEW_CHANNELS);
POPUP_MENU_ADD_ITEM(STR_VIEW_NOTES);
@@ -341,15 +338,14 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
}
break;
case EVT_KEY_LONG(KEY_PAGE):
case EVT_KEY_BREAK(KEY_PAGEUP):
if (s_editMode>0)
break;
cc = chgMenu(curr, menuTab, menuTabSize, -1);
killEvents(event);
break;
case EVT_KEY_BREAK(KEY_PAGE):
case EVT_KEY_BREAK(KEY_PAGEDN):
if (s_editMode>0)
break;
radio/src/gui/navigation/navigation_xlite.cpp
-2
View File
@@ -150,7 +150,6 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
if (i_flags & INCDEC_SOURCE) {
if (event == EVT_KEY_LONG(KEY_ENTER) && !keysGetState(KEY_SHIFT)) {
killEvents(event);
checkIncDecSelection = MIXSRC_NONE;
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
@@ -203,7 +202,6 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
}
else if (i_flags & INCDEC_SWITCH) {
if (event == EVT_KEY_LONG(KEY_ENTER) && !keysGetState(KEY_SHIFT)) {
killEvents(event);
checkIncDecSelection = SWSRC_NONE;
if (i_min <= SWSRC_FIRST_SWITCH && i_max >= SWSRC_LAST_SWITCH) POPUP_MENU_ADD_ITEM(STR_MENU_SWITCHES);
if (i_min <= SWSRC_FIRST_TRIM && i_max >= SWSRC_LAST_TRIM) POPUP_MENU_ADD_ITEM(STR_MENU_TRIMS);
radio/src/hal/key_driver.h
-1
View File
@@ -28,7 +28,6 @@ enum EnumKeys {
KEY_EXIT,
KEY_ENTER,
KEY_PAGE,
KEY_PAGEUP,
KEY_PAGEDN,
radio/src/keys.cpp
+27 -11
View File
@@ -58,7 +58,9 @@
#define KSTATE_RPTDELAY 95
#define KSTATE_START 97
#define KSTATE_PAUSE 98
#define KSTATE_KILLED 99
#define KFLAG_KILLED 1
#define KFLAG_LONG_PRESS 2
// global last event
event_t s_evt;
@@ -72,6 +74,7 @@ class Key
uint8_t m_vals = 0;
uint8_t m_cnt = 0;
uint8_t m_state = 0;
uint8_t m_flags = 0;
public:
event_t input(bool val);
@@ -92,16 +95,19 @@ event_t Key::input(bool val)
m_cnt++;
if (m_state && m_vals == 0) {
if ((m_state || m_flags) && m_vals == 0) {
// key is released
if (m_state != KSTATE_KILLED) {
if ((m_flags & (KFLAG_KILLED|KFLAG_LONG_PRESS)) == 0) {
evt = _MSK_KEY_BREAK;
}
m_state = KSTATE_OFF;
m_cnt = 0;
m_flags = 0;
return evt;
}
if (m_flags & KFLAG_KILLED) return evt;
switch (m_state) {
case KSTATE_OFF:
if (m_vals == FILTER_MASK) {
@@ -121,6 +127,7 @@ event_t Key::input(bool val)
if (m_cnt == KEY_LONG_DELAY) {
// generate long key press
evt = _MSK_KEY_LONG;
m_flags |= KFLAG_LONG_PRESS;
}
if (m_cnt == KEY_REPEAT_DELAY) {
m_state = 16;
@@ -150,9 +157,6 @@ event_t Key::input(bool val)
m_cnt = 0;
}
break;
case KSTATE_KILLED: //killed
break;
}
return evt;
@@ -166,8 +170,8 @@ void Key::pauseEvents()
void Key::killEvents()
{
// TRACE("key %d killed", key());
m_state = KSTATE_KILLED;
if (m_state)
m_flags |= KFLAG_KILLED;
}
static Key keys[MAX_KEYS];
@@ -427,10 +431,22 @@ bool keysPollingCycle()
for (int i = 0; i < MAX_KEYS; i++) {
event_t evt = keys[i].input(keys_input & (1 << i));
if (evt) {
// SHIFT key should not trigger REPT events
if (i != KEY_SHIFT || evt != _MSK_KEY_REPT) {
pushEvent(evt | i);
evt |= i;
#if defined(KEYS_GPIO_REG_PAGEDN) && !defined(KEYS_GPIO_REG_PAGEUP)
// Radio with single PAGEDN key
if (evt == EVT_KEY_LONG(KEY_PAGEDN)) {
// Convert long press PAGEDN to short press PAGEUP
evt = EVT_KEY_BREAK(KEY_PAGEUP);
}
#endif
#if defined(KEYS_GPIO_REG_SHIFT)
// SHIFT key should not trigger REPT events
if (evt != EVT_KEY_REPT(KEY_SHIFT)) {
pushEvent(evt);
}
#else
pushEvent(evt);
#endif
}
}
radio/src/lua/api_general.cpp
+2 -2
View File
@@ -1657,11 +1657,11 @@ Stops key state machine. See [Key Events](../key_events.md) for the detailed des
*/
static int luaKillEvents(lua_State * L)
{
#if defined(KEYS_GPIO_REG_PAGE)
#if defined(KEYS_GPIO_REG_MENU)
#define IS_MASKABLE(key) \
((key) != KEY_EXIT && (key) != KEY_ENTER && \
((scriptInternalData[0].reference == SCRIPT_STANDALONE) || \
(key) != KEY_PAGE))
(key) != KEY_PAGEDN))
#else
#define IS_MASKABLE(key) ((key) != KEY_EXIT && (key) != KEY_ENTER)
#endif
radio/src/lua/interface.cpp
-3
View File
@@ -1191,7 +1191,6 @@ static bool resumeLua(bool init, bool allowLcdUsage)
if (scriptResult != 0) {
TRACE("Script finished with status %d", scriptResult);
killAllEvents();
luaState = INTERPRETER_RELOAD_PERMANENT_SCRIPTS;
}
else if (luaDisplayStatistics) {
@@ -1221,14 +1220,12 @@ static bool resumeLua(bool init, bool allowLcdUsage)
if (evt.event == EVT_KEY_LONG(KEY_EXIT)) {
TRACE("Script force exit");
// killEvents(evt);
luaEmptyEventBuffer();
luaState = INTERPRETER_RELOAD_PERMANENT_SCRIPTS;
}
#if defined(KEYS_GPIO_REG_MENU)
// TODO find another key and add a #define
else if (evt.event == EVT_KEY_LONG(KEY_MENU)) {
killEvents(evt.event);
luaEmptyEventBuffer();
luaDisplayStatistics = !luaDisplayStatistics;
}
radio/src/lua/lua_widget.cpp
-8
View File
@@ -166,14 +166,6 @@ void LuaEventHandler::onCancel() { luaPushEvent(EVT_KEY_BREAK(KEY_EXIT)); }
void LuaEventHandler::onEvent(event_t event)
{
if (event == EVT_KEY_LONG(KEY_EXIT)) {
killEvents(KEY_EXIT);
}
#if !defined(KEYS_GPIO_REG_PAGEUP) && !defined(USE_HATS_AS_KEYS)
else if (event == EVT_KEY_LONG(KEY_PAGEDN)) {
killEvents(KEY_PAGEDN);
}
#endif
luaPushEvent(event);
}
radio/src/main.cpp
-7
View File
@@ -440,13 +440,6 @@ bool handleGui(event_t event)
TELEMETRY_SCREEN_TYPE(s_frsky_view) == TELEMETRY_SCREEN_TYPE_SCRIPT;
bool isStandalone = scriptInternalData[0].reference == SCRIPT_STANDALONE;
if ((isTelemView || isStandalone) && event) {
#if !defined(KEYS_GPIO_REG_PAGEUP)
// For radios with a single PAGE key, kill the
// EVT_KEY_BREAK event after a long press of the PAGE key.
if (event == EVT_KEY_LONG(KEY_PAGE)) {
killEvents(KEY_PAGE);
}
#endif
luaPushEvent(event);
}
refreshNeeded = luaTask(true);
radio/src/simu.cpp
+1 -3
View File
@@ -389,9 +389,7 @@ void OpenTxSim::updateKeysAndSwitches(bool start)
KEY_Down, KEY_MINUS,
#elif defined(PCBTARANIS)
KEY_Page_Up, KEY_MENU,
#if defined(KEYS_GPIO_REG_PAGE)
KEY_Page_Down, KEY_PAGE,
#endif
KEY_Page_Down, KEY_PAGEDN,
KEY_Return, KEY_ENTER,
KEY_BackSpace, KEY_EXIT,
KEY_Up, KEY_PLUS,
radio/src/targets/taranis/hal.h
+14 -14
View File
@@ -50,8 +50,8 @@
#define KEYS_GPIO_PIN_MENU LL_GPIO_PIN_7 // PD.07
#define KEYS_GPIO_REG_EXIT GPIOD
#define KEYS_GPIO_PIN_EXIT LL_GPIO_PIN_2 // PD.02
#define KEYS_GPIO_REG_PAGE GPIOD
#define KEYS_GPIO_PIN_PAGE LL_GPIO_PIN_3 // PD.03
#define KEYS_GPIO_REG_PAGEDN GPIOD
#define KEYS_GPIO_PIN_PAGEDN LL_GPIO_PIN_3 // PD.03
#define KEYS_GPIO_REG_ENTER GPIOF
#define KEYS_GPIO_PIN_ENTER LL_GPIO_PIN_0 // PF.00
#elif defined(PCBXLITE)
@@ -153,8 +153,8 @@
#define KEYS_GPIO_REG_BIND GPIOD
#define KEYS_GPIO_PIN_BIND LL_GPIO_PIN_9 // PD.09
#elif defined(RADIO_FAMILY_T20)
#define KEYS_GPIO_REG_PAGE GPIOD
#define KEYS_GPIO_PIN_PAGE LL_GPIO_PIN_11 // PD.11
#define KEYS_GPIO_REG_PAGEDN GPIOD
#define KEYS_GPIO_PIN_PAGEDN LL_GPIO_PIN_11 // PD.11
#define KEYS_GPIO_REG_MENU GPIOD
#define KEYS_GPIO_PIN_MENU LL_GPIO_PIN_10 // PD.10
#define KEYS_GPIO_REG_EXIT GPIOD
@@ -162,8 +162,8 @@
#define KEYS_GPIO_REG_ENTER GPIOE
#define KEYS_GPIO_PIN_ENTER LL_GPIO_PIN_7 // PE.7
#elif defined(RADIO_T14)
#define KEYS_GPIO_REG_PAGE GPIOD
#define KEYS_GPIO_PIN_PAGE LL_GPIO_PIN_3 // PD.03
#define KEYS_GPIO_REG_PAGEDN GPIOD
#define KEYS_GPIO_PIN_PAGEDN LL_GPIO_PIN_3 // PD.03
#define KEYS_GPIO_REG_MENU GPIOD
#define KEYS_GPIO_PIN_MENU LL_GPIO_PIN_7 // PD.07
#define KEYS_GPIO_REG_EXIT GPIOD
@@ -171,8 +171,8 @@
#define KEYS_GPIO_REG_ENTER GPIOA
#define KEYS_GPIO_PIN_ENTER LL_GPIO_PIN_13 // PA.13
#elif defined(PCBX7)
#define KEYS_GPIO_REG_PAGE GPIOD
#define KEYS_GPIO_PIN_PAGE LL_GPIO_PIN_3 // PD.03
#define KEYS_GPIO_REG_PAGEDN GPIOD
#define KEYS_GPIO_PIN_PAGEDN LL_GPIO_PIN_3 // PD.03
#define KEYS_GPIO_REG_MENU GPIOD
#define KEYS_GPIO_PIN_MENU LL_GPIO_PIN_7 // PD.07
#define KEYS_GPIO_REG_EXIT GPIOD
@@ -180,8 +180,8 @@
#define KEYS_GPIO_REG_ENTER GPIOE
#define KEYS_GPIO_PIN_ENTER LL_GPIO_PIN_10 // PE.10
#elif defined(PCBX9LITE)
#define KEYS_GPIO_REG_PAGE GPIOE
#define KEYS_GPIO_PIN_PAGE LL_GPIO_PIN_8 // PE.08
#define KEYS_GPIO_REG_PAGEDN GPIOE
#define KEYS_GPIO_PIN_PAGEDN LL_GPIO_PIN_8 // PE.08
#define KEYS_GPIO_REG_MENU GPIOE
#define KEYS_GPIO_PIN_MENU LL_GPIO_PIN_7 // PE.07
#define KEYS_GPIO_REG_EXIT GPIOE
@@ -193,8 +193,8 @@
#define KEYS_GPIO_PIN_MENU LL_GPIO_PIN_2 // PD.02
#define KEYS_GPIO_REG_EXIT GPIOD
#define KEYS_GPIO_PIN_EXIT LL_GPIO_PIN_7 // PD.07
#define KEYS_GPIO_REG_PAGE GPIOD
#define KEYS_GPIO_PIN_PAGE LL_GPIO_PIN_3 // PD.03
#define KEYS_GPIO_REG_PAGEDN GPIOD
#define KEYS_GPIO_PIN_PAGEDN LL_GPIO_PIN_3 // PD.03
#define KEYS_GPIO_REG_ENTER GPIOE
#define KEYS_GPIO_PIN_ENTER LL_GPIO_PIN_12 // PE.12
#else
@@ -202,8 +202,8 @@
#define KEYS_GPIO_PIN_MENU LL_GPIO_PIN_7 // PD.07
#define KEYS_GPIO_REG_EXIT GPIOD
#define KEYS_GPIO_PIN_EXIT LL_GPIO_PIN_2 // PD.02
#define KEYS_GPIO_REG_PAGE GPIOD
#define KEYS_GPIO_PIN_PAGE LL_GPIO_PIN_3 // PD.03
#define KEYS_GPIO_REG_PAGEDN GPIOD
#define KEYS_GPIO_PIN_PAGEDN LL_GPIO_PIN_3 // PD.03
#define KEYS_GPIO_REG_PLUS GPIOE
#define KEYS_GPIO_PIN_PLUS LL_GPIO_PIN_10 // PE.10
#define KEYS_GPIO_REG_MINUS GPIOE
radio/src/thirdparty/libopenui/src/menu.cpp
Vendored
+1 -6
View File
@@ -439,12 +439,7 @@ void Menu::onEvent(event_t event)
{
#if defined(HARDWARE_KEYS)
if (toolbar && (event == EVT_KEY_BREAK(KEY_PAGEDN) ||
#if defined(KEYS_GPIO_REG_PAGEUP)
event == EVT_KEY_BREAK(KEY_PAGEUP)
#else
event == EVT_KEY_LONG(KEY_PAGEDN)
#endif
)) {
event == EVT_KEY_BREAK(KEY_PAGEUP))) {
toolbar->onEvent(event);
}
#endif
radio/src/thirdparty/libopenui/src/menutoolbar.cpp
Vendored
-5
View File
@@ -98,12 +98,7 @@ void MenuToolbar::onEvent(event_t event)
if (event == EVT_KEY_BREAK(KEY_PAGEDN)) {
lv_group_focus_next(group);
}
#if defined(KEYS_GPIO_REG_PAGEUP)
else if (event == EVT_KEY_BREAK(KEY_PAGEUP)) {
#else
else if (event == EVT_KEY_LONG(KEY_PAGEDN)) {
killEvents(event);
#endif
lv_group_focus_prev(group);
}
radio/src/thirdparty/libopenui/src/window.cpp
Vendored
-22
View File
@@ -400,7 +400,6 @@ void NavWindow::onEvent(event_t event)
break;
case EVT_KEY_LONG(KEY_MODEL):
killEvents(KEY_MODEL);
onLongPressMDL();
break;
@@ -409,7 +408,6 @@ void NavWindow::onEvent(event_t event)
break;
case EVT_KEY_LONG(KEY_SYS):
killEvents(event);
onLongPressSYS();
break;
@@ -418,7 +416,6 @@ void NavWindow::onEvent(event_t event)
break;
case EVT_KEY_LONG(KEY_TELE):
killEvents(event);
onLongPressTELE();
break;
@@ -426,28 +423,9 @@ void NavWindow::onEvent(event_t event)
onPressPGDN();
break;
#if defined(KEYS_GPIO_REG_PAGEUP) || defined(USE_HATS_AS_KEYS)
// Radios with both PGUP and PGDN buttons
case EVT_KEY_BREAK(KEY_PAGEUP):
onPressPGUP();
break;
case EVT_KEY_LONG(KEY_PAGEDN):
killEvents(event);
onLongPressPGDN();
break;
case EVT_KEY_LONG(KEY_PAGEUP):
killEvents(event);
onLongPressPGUP();
break;
#else
// Radios witb only a single PGUP/DN button
case EVT_KEY_LONG(KEY_PAGEDN):
killEvents(event);
onPressPGUP();
break;
#endif
#endif
default: