Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Navigation fix

Browse source
This commit is contained in:
Bertrand Songis 2019-02-11 09:42:19 +01:00
parent 7898376dde
commit c16d1bf2e9
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radio/src/gui/128x64/model_setup.cpp
View file

@ -1383,7 +1383,8 @@ void menuModelSetup(event_t event)
CHECK_INCDEC_MODELVAR_ZERO(event, moduleData.failsafeMode, FAILSAFE_LAST); CHECK_INCDEC_MODELVAR_ZERO(event, moduleData.failsafeMode, FAILSAFE_LAST);
if (checkIncDec_Ret) SEND_FAILSAFE_NOW(moduleIdx); if (checkIncDec_Ret) SEND_FAILSAFE_NOW(moduleIdx);
} }
} else if (menuHorizontalPosition == 1) { }
else if (menuHorizontalPosition == 1) {
s_editMode = 0; s_editMode = 0;
if (moduleData.failsafeMode == FAILSAFE_CUSTOM) { if (moduleData.failsafeMode == FAILSAFE_CUSTOM) {
if (event == EVT_KEY_LONG(KEY_ENTER)) { if (event == EVT_KEY_LONG(KEY_ENTER)) {
@ -1398,7 +1399,8 @@ void menuModelSetup(event_t event)
pushMenu(menuModelFailsafe); pushMenu(menuModelFailsafe);
} }
} }
} else { }
else {
lcdDrawSolidFilledRect(MODEL_SETUP_2ND_COLUMN, y, LCD_W - MODEL_SETUP_2ND_COLUMN, 8); lcdDrawSolidFilledRect(MODEL_SETUP_2ND_COLUMN, y, LCD_W - MODEL_SETUP_2ND_COLUMN, 8);
} }
} }
@ -1642,7 +1644,7 @@ void menuModelFailsafe(event_t event)
event = 0; event = 0;
if (menuVerticalPosition < sentModuleChannels(g_moduleIdx)) { if (menuVerticalPosition < sentModuleChannels(g_moduleIdx)) {
if (s_editMode) { if (s_editMode > 0) {
g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition] = channelOutputs[menuVerticalPosition+channelStart]; g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition] = channelOutputs[menuVerticalPosition+channelStart];
s_editMode = 0; s_editMode = 0;
} }
@ -1688,7 +1690,7 @@ void menuModelFailsafe(event_t event)
LcdFlags flags = TINSIZE; LcdFlags flags = TINSIZE;
if (menuVerticalPosition == ch) { if (menuVerticalPosition == ch) {
flags |= INVERS; flags |= INVERS;
if (s_editMode) { if (s_editMode > 0) {
if (failsafeValue == FAILSAFE_CHANNEL_HOLD || failsafeValue == FAILSAFE_CHANNEL_NOPULSE) { if (failsafeValue == FAILSAFE_CHANNEL_HOLD || failsafeValue == FAILSAFE_CHANNEL_NOPULSE) {
s_editMode = 0; s_editMode = 0;
} }