From 5d7f4ebc0b5be7235907dc7ad84b53863e565753 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 18 Aug 2016 15:47:21 +0200 Subject: [PATCH] [X7D] Switch warning fix --- radio/src/dataconstants.h | 26 ++++++++++++++++---------- radio/src/switches.cpp | 6 ++++-- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 08e40d642..5a738fcf5 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -757,23 +757,29 @@ enum MixSources { MIXSRC_SLIDER1, LUA_EXPORT("ls", "Left slider") MIXSRC_SLIDER2, LUA_EXPORT("rs", "Right slider") MIXSRC_LAST_POT = MIXSRC_SLIDER2, +#elif defined(PCBX9E) + MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1") + MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2") + MIXSRC_POT3, LUA_EXPORT("s3", "Potentiometer 3") + MIXSRC_POT4, LUA_EXPORT("s4", "Potentiometer 4 (X9E only)") + MIXSRC_FIRST_SLIDER, + MIXSRC_SLIDER1 = MIXSRC_FIRST_SLIDER, LUA_EXPORT("ls", "Left slider") + MIXSRC_SLIDER2, LUA_EXPORT("rs", "Right slider") + MIXSRC_SLIDER3, LUA_EXPORT("lcs", "Left center slider (X9E only)") + MIXSRC_SLIDER4, LUA_EXPORT("rcs", "Right center slider (X9E only)") + MIXSRC_LAST_POT = MIXSRC_SLIDER4, +#elif defined(PCBX7D) + MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1") + MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2") + MIXSRC_LAST_POT = MIXSRC_POT2, #elif defined(PCBTARANIS) MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1") MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2") MIXSRC_POT3, LUA_EXPORT("s3", "Potentiometer 3") - #if defined(PCBX9E) - MIXSRC_POT4, LUA_EXPORT("s4", "Potentiometer 4 (X9E only)") - #endif MIXSRC_FIRST_SLIDER, MIXSRC_SLIDER1 = MIXSRC_FIRST_SLIDER, LUA_EXPORT("ls", "Left slider") MIXSRC_SLIDER2, LUA_EXPORT("rs", "Right slider") - #if defined(PCBX9E) - MIXSRC_SLIDER3, LUA_EXPORT("lcs", "Left center slider (X9E only)") - MIXSRC_SLIDER4, LUA_EXPORT("rcs", "Right center slider (X9E only)") - MIXSRC_LAST_POT = MIXSRC_SLIDER4, - #else - MIXSRC_LAST_POT = MIXSRC_SLIDER2, - #endif + MIXSRC_LAST_POT = MIXSRC_SLIDER2, #else MIXSRC_P1 = MIXSRC_FIRST_POT, MIXSRC_P2, diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp index c903a808b..ff55bda32 100644 --- a/radio/src/switches.cpp +++ b/radio/src/switches.cpp @@ -30,10 +30,12 @@ #define SWITCH_WARNING_LIST_X WARNING_LINE_X #define SWITCH_WARNING_LIST_Y WARNING_LINE_Y+3*FH #define SWITCH_WARNING_LIST_INTERVAL 35 -#elif defined(PCBTARANIS) +#elif LCD_W >= 212 #define SWITCH_WARNING_LIST_X 60 #define SWITCH_WARNING_LIST_Y 4*FH+3 #else + #define SWITCH_WARNING_LIST_X 4 + #define SWITCH_WARNING_LIST_Y 4*FH+4 #endif #if defined(CPUARM) @@ -746,7 +748,7 @@ void checkSwitches() } #undef GETADC_COUNT #endif -#endif // !defined(MODULE_ALWAYS_SEND_PULSES) +#endif // !defined(MODULE_ALWAYS_SEND_PULSES) getMovedSwitch();