From ded8f237e052da369a0a4b9373fa23fb173c23e9 Mon Sep 17 00:00:00 2001 From: "bernet.andre@gmail.com" Date: Sun, 19 May 2013 09:42:17 +0000 Subject: [PATCH] [Taranis] Alignment on DR screen, better key for editing curve from DR/mixer --- src/gui/menu_model.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/menu_model.cpp b/src/gui/menu_model.cpp index cb280c71a..29ec59697 100644 --- a/src/gui/menu_model.cpp +++ b/src/gui/menu_model.cpp @@ -2702,7 +2702,7 @@ void menuModelExpoOne(uint8_t event) if (attr) { CHECK_INCDEC_MODELVAR_ZERO(event, ed->curveParam, CURVE_BASE+MAX_CURVES-1); if (ed->curveParam) ed->curveMode = MODE_CURVE; - if (ed->curveParam>=CURVE_BASE && event==EVT_KEY_FIRST(KEY_MENU)) { + if (ed->curveParam>=CURVE_BASE && event==EVT_KEY_LONG(KEY_ENTER)) { s_curveChan = ed->curveParam - CURVE_BASE; pushMenu(menuModelCurveOne); } @@ -2876,7 +2876,7 @@ void menuModelMixOne(uint8_t event) if (md2->curveMode == MODE_CURVE) { putsCurve(COLUMN_X+MIXES_2ND_COLUMN, y, curveParam, attr); if (attr) { - if (event==EVT_KEY_FIRST(KEY_MENU) && (curveParam<0 || curveParam>=CURVE_BASE)){ + if (event==EVT_KEY_LONG(KEY_ENTER) && (curveParam<0 || curveParam>=CURVE_BASE)){ s_curveChan = (curveParam<0 ? -curveParam-1 : curveParam-CURVE_BASE); pushMenu(menuModelCurveOne); } @@ -2953,9 +2953,9 @@ static uint8_t s_copySrcCh; #if LCD_W >= 212 #define EXPO_LINE_WEIGHT_POS 7*FW -#define EXPO_LINE_EXPO_POS 10*FW +#define EXPO_LINE_EXPO_POS 12*FW #define EXPO_LINE_SWITCH_POS 13*FW+4 -#define EXPO_LINE_SIDE_POS 20*FW +#define EXPO_LINE_SIDE_POS 19*FW #define EXPO_LINE_SELECT_POS 18 #elif defined(TRANSLATIONS_CZ) #define EXPO_LINE_WEIGHT_POS 7*FW-2