From 2df2c5a0111ed5b886eff1ebdc8eb8d05dd833ae Mon Sep 17 00:00:00 2001 From: "bsongis@gmail.com" Date: Tue, 26 Mar 2013 06:39:49 +0000 Subject: [PATCH] [Taranis] Problem wrap around inside Model Setup --- src/menu_model.cpp | 10 +++++----- src/myeeprom.h | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/menu_model.cpp b/src/menu_model.cpp index 94bab4e18..fd2cd5141 100644 --- a/src/menu_model.cpp +++ b/src/menu_model.cpp @@ -1056,12 +1056,12 @@ void menuModelSetup(uint8_t event) case ITEM_MODE_INTERNAL_MODULE_FAILSAFE: lcd_putsLeft(y, TR_FAILSAFE); - lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, PSTR("\011""Hold\0 ""Custom\0 ""No pulses"), g_model.failsafeMode, (m_posHorz==0 || g_model.failsafeMode!=FAILSAFE_CUSTOM) ? attr : 0); + lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, PSTR("\011""Hold\0 ""Custom\0 ""No pulses"), g_model.failsafeMode, m_posHorz==0 ? attr : 0); if (g_model.failsafeMode == FAILSAFE_CUSTOM) lcd_putsAtt(MODEL_SETUP_2ND_COLUMN + 10*FW, y, PSTR("[Set]"), m_posHorz==1 ? attr : 0); if (attr) { - if (s_editMode==0 && g_model.failsafeMode!=FAILSAFE_CUSTOM) - m_posHorz = -1; - if (m_posHorz==0 || g_model.failsafeMode!=FAILSAFE_CUSTOM) { + if (g_model.failsafeMode != FAILSAFE_CUSTOM) + m_posHorz = 0; + if (m_posHorz==0) { if (editMode>0 || p1valdiff) { CHECK_INCDEC_MODELVAR_ZERO(event, g_model.failsafeMode, FAILSAFE_LAST); } @@ -3511,7 +3511,7 @@ void menuModelCustomFunctions(uint8_t event) uint8_t active = (attr && (s_editMode>0 || p1valdiff)); switch (j) { case 0: - putsSwitches(MODEL_CUSTOM_FUNC_1ST_COLUMN, y, sd->swtch, attr | ((activeFnSwitches & ((MASK_FUNC_TYPE)1 << k)) ? BOLD : 0)); + putsSwitches(MODEL_CUSTOM_FUNC_1ST_COLUMN, y, sd->swtch, attr | ((activeFnSwitches & ((MASK_CFN_TYPE)1 << k)) ? BOLD : 0)); if (active || AUTOSWITCH_ENTER_LONG()) CHECK_INCDEC_MODELSWITCH(event, sd->swtch, SWSRC_FIRST, SWSRC_LAST); break; diff --git a/src/myeeprom.h b/src/myeeprom.h index d34e79889..9c3425b5e 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -887,8 +887,6 @@ PACK(typedef struct t_PhaseData { #define CURVTYPE int8_t #endif -#define MAX_SWITCH (MAX_PSWITCH+NUM_CSW) - enum SwitchSources { SWSRC_NONE = 0,