From ef56bf3cb4ac51c2c24951e2de6519cd1ff54da6 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 28 Aug 2015 14:44:09 +0200 Subject: [PATCH] New type swsrc_t introduced --- radio/src/gui/Taranis/lcd.cpp | 4 ++-- radio/src/gui/Taranis/lcd.h | 4 ++-- radio/src/gui/Taranis/menu_model_setup.cpp | 6 +++--- radio/src/gui/Taranis/menus.h | 2 +- radio/src/gui/Taranis/navigation.cpp | 4 ++-- radio/src/myeeprom.h | 2 +- radio/src/opentx.h | 4 +++- radio/src/switches.cpp | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/radio/src/gui/Taranis/lcd.cpp b/radio/src/gui/Taranis/lcd.cpp index 3d5030080..27d940f6f 100755 --- a/radio/src/gui/Taranis/lcd.cpp +++ b/radio/src/gui/Taranis/lcd.cpp @@ -727,7 +727,7 @@ void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att) } } -void putsSwitches(coord_t x, coord_t y, int8_t idx, LcdFlags att) +void putsSwitches(coord_t x, coord_t y, swsrc_t idx, LcdFlags att) { if (idx == SWSRC_OFF) return lcd_putsiAtt(x, y, STR_OFFON, 0, att); @@ -803,7 +803,7 @@ void putsCurve(coord_t x, coord_t y, int8_t idx, LcdFlags att) putsStrIdx(x, y, STR_CV, idx, att); } -void putsTimerMode(coord_t x, coord_t y, int8_t mode, LcdFlags att) +void putsTimerMode(coord_t x, coord_t y, swsrc_t mode, LcdFlags att) { if (mode >= 0) { if (mode < TMRMODE_COUNT) diff --git a/radio/src/gui/Taranis/lcd.h b/radio/src/gui/Taranis/lcd.h index 52a4c3ea6..ffc1dee4b 100755 --- a/radio/src/gui/Taranis/lcd.h +++ b/radio/src/gui/Taranis/lcd.h @@ -167,7 +167,7 @@ void lcd_outdez8(coord_t x, coord_t y, int8_t val); void putsStrIdx(coord_t x, coord_t y, const pm_char *str, uint8_t idx, LcdFlags att=0); void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att); -void putsSwitches(coord_t x, coord_t y, int8_t swtch, LcdFlags att=0); +void putsSwitches(coord_t x, coord_t y, swsrc_t swtch, LcdFlags att=0); void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0); void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att=0); void putsFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att=0); @@ -175,7 +175,7 @@ void putsFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att=0); void putsCurveRef(coord_t x, coord_t y, CurveRef &curve, LcdFlags att); #endif void putsCurve(coord_t x, coord_t y, int8_t idx, LcdFlags att=0); -void putsTimerMode(coord_t x, coord_t y, int8_t mode, LcdFlags att=0); +void putsTimerMode(coord_t x, coord_t y, swsrc_t mode, LcdFlags att=0); void putsTrimMode(coord_t x, coord_t y, uint8_t phase, uint8_t idx, LcdFlags att); #define putsChn(x, y, idx, att) putsMixerSource(x, y, MIXSRC_CH1+idx-1, att) diff --git a/radio/src/gui/Taranis/menu_model_setup.cpp b/radio/src/gui/Taranis/menu_model_setup.cpp index 6b1c135a5..4e97fb4f5 100644 --- a/radio/src/gui/Taranis/menu_model_setup.cpp +++ b/radio/src/gui/Taranis/menu_model_setup.cpp @@ -142,15 +142,15 @@ void editTimerMode(int timerIdx, coord_t y, LcdFlags attr, uint8_t event) switch (m_posHorz) { case 0: { - int8_t timerMode = timer->mode; + swsrc_t timerMode = timer->mode; if (timerMode < 0) timerMode -= TMRMODE_COUNT-1; CHECK_INCDEC_MODELVAR_CHECK(event, timerMode, -TMRMODE_COUNT-SWSRC_LAST+1, TMRMODE_COUNT+SWSRC_LAST-1, isSwitchAvailableInTimers); if (timerMode < 0) timerMode += TMRMODE_COUNT-1; timer->mode = timerMode; #if defined(AUTOSWITCH) if (s_editMode>0) { - int8_t val = timer->mode - (TMRMODE_COUNT-1); - int8_t switchVal = checkIncDecMovedSwitch(val); + swsrc_t val = timer->mode - (TMRMODE_COUNT-1); + swsrc_t switchVal = checkIncDecMovedSwitch(val); if (val != switchVal) { timer->mode = switchVal + (TMRMODE_COUNT-1); eeDirty(EE_MODEL); diff --git a/radio/src/gui/Taranis/menus.h b/radio/src/gui/Taranis/menus.h index 489777aa2..ee5fced5f 100755 --- a/radio/src/gui/Taranis/menus.h +++ b/radio/src/gui/Taranis/menus.h @@ -176,7 +176,7 @@ extern const CheckIncDecStops &stopsSwitch; (val), (val+1) int checkIncDec(unsigned int event, int val, int i_min, int i_max, unsigned int i_flags=0, IsValueAvailable isValueAvailable=NULL, const CheckIncDecStops &stops=stops100); -int8_t checkIncDecMovedSwitch(int8_t val); +swsrc_t checkIncDecMovedSwitch(swsrc_t val); #define checkIncDecModel(event, i_val, i_min, i_max) checkIncDec(event, i_val, i_min, i_max, EE_MODEL) #define checkIncDecModelZero(event, i_val, i_max) checkIncDec(event, i_val, 0, i_max, EE_MODEL) #define checkIncDecGen(event, i_val, i_min, i_max) checkIncDec(event, i_val, i_min, i_max, EE_GENERAL) diff --git a/radio/src/gui/Taranis/navigation.cpp b/radio/src/gui/Taranis/navigation.cpp index 84925d464..3905fc144 100755 --- a/radio/src/gui/Taranis/navigation.cpp +++ b/radio/src/gui/Taranis/navigation.cpp @@ -45,10 +45,10 @@ uint8_t calibrationState; int checkIncDecSelection = 0; #if defined(AUTOSWITCH) -int8_t checkIncDecMovedSwitch(int8_t val) +swsrc_t checkIncDecMovedSwitch(swsrc_t val) { if (s_editMode>0) { - int8_t swtch = getMovedSwitch(); + swsrc_t swtch = getMovedSwitch(); if (swtch) { div_t info = switchInfo(swtch); if (IS_TOGGLE(info.quot)) { diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index bede9c1a9..bfd56ee68 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -116,7 +116,7 @@ #define MAX_FLIGHT_MODES 9 #define MAX_MIXERS 64 #define MAX_EXPOS 64 - #define NUM_LOGICAL_SWITCH 32 // number of custom switches + #define NUM_LOGICAL_SWITCH 32 // number of logical switches #define NUM_CFN 64 // number of functions assigned to switches #define MAX_SCRIPTS 7 #define MAX_INPUTS 32 diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 6ebc0bf68..b550a5004 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -416,6 +416,7 @@ typedef int32_t rotenc_t; typedef int32_t getvalue_t; typedef uint32_t mixsrc_t; + typedef int8_t swsrc_t; #else #define tmr10ms_t uint16_t extern volatile tmr10ms_t g_tmr10ms; @@ -430,6 +431,7 @@ typedef int8_t rotenc_t; typedef int16_t getvalue_t; typedef uint8_t mixsrc_t; + typedef int8_t swsrc_t; #endif #if defined(NAVIGATION_STICKS) @@ -766,7 +768,7 @@ void logicalSwitchesReset(); #endif extern swarnstate_t switches_states; -int8_t getMovedSwitch(); +swsrc_t getMovedSwitch(); #if defined(PCBTARANIS) #define GET_MOVED_SOURCE_PARAMS uint8_t min diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp index a9c522cff..7e1a44ce1 100644 --- a/radio/src/switches.cpp +++ b/radio/src/switches.cpp @@ -552,10 +552,10 @@ void evalLogicalSwitches(bool isCurrentPhase) #endif swarnstate_t switches_states = 0; -int8_t getMovedSwitch() +swsrc_t getMovedSwitch() { static tmr10ms_t s_move_last_time = 0; - int8_t result = 0; + swsrc_t result = 0; #if defined(PCBTARANIS) for (int i=0; i