refactor: key handling (#4849)

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
@@ -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);
}
-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)) {
+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);
}
}
}
-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);
}
}
@@ -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);
-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) ;
-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);
}
+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;
}
+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;
@@ -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)
-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);
}
}
+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
+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);
}
+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;
}
+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;
}
+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):
+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;
}