refactor: key handling (#4849)
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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) ;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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, "..")) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user