From 9f3898ae1e0c75b5f1dbbd882869237f7b13c12d Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 27 Feb 2017 14:04:44 +0100 Subject: [PATCH] [9XR-PRO] Navigation issue in FlightModeOne screen --- radio/src/gui/128x64/model_flightmodes.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/128x64/model_flightmodes.cpp b/radio/src/gui/128x64/model_flightmodes.cpp index a1e1fab00..57949eaba 100644 --- a/radio/src/gui/128x64/model_flightmodes.cpp +++ b/radio/src/gui/128x64/model_flightmodes.cpp @@ -84,7 +84,7 @@ bool isTrimModeAvailable(int mode) return (mode < 0 || (mode%2) == 0 || (mode/2) != s_currIdx); } -void menuModelPhaseOne(event_t event) +void menuModelFlightModeOne(event_t event) { FlightModeData * fm = flightModeAddress(s_currIdx); drawFlightMode(13*FW, 0, s_currIdx+1, (getFlightMode()==s_currIdx ? BOLD : 0)); @@ -140,7 +140,7 @@ void menuModelPhaseOne(event_t event) #if defined(CPUARM) for (uint8_t t = 0; t < NUM_STICKS; t++) { drawTrimMode(MIXES_2ND_COLUMN + (t*2*FW), y, s_currIdx, t, menuHorizontalPosition == t ? attr : 0); - if (s_editMode && attr && menuHorizontalPosition == t) { + if (s_editMode >= 0 && attr && menuHorizontalPosition == t) { trim_t & v = fm->trim[t]; v.mode = checkIncDec(event, v.mode==TRIM_MODE_NONE ? -1 : v.mode, -1, k==0 ? 0 : 2*MAX_FLIGHT_MODES-1, EE_MODEL, isTrimModeAvailable); } @@ -276,7 +276,7 @@ void menuModelFlightModesAll(event_t event) #endif if (sub >= 0 && sub < MAX_FLIGHT_MODES) { s_currIdx = sub; - pushMenu(menuModelPhaseOne); + pushMenu(menuModelFlightModeOne); } break; }