From fa0cc546e4dcfc81760f60e46304faade662c464 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 18 Dec 2016 09:45:37 +0100 Subject: [PATCH] Compilation fix --- radio/src/gui/212x64/gui.h | 1 - radio/src/gui/480x272/navigation.cpp | 22 ---------------------- 2 files changed, 23 deletions(-) diff --git a/radio/src/gui/212x64/gui.h b/radio/src/gui/212x64/gui.h index faaa52ecf..a6ed622b0 100644 --- a/radio/src/gui/212x64/gui.h +++ b/radio/src/gui/212x64/gui.h @@ -149,7 +149,6 @@ extern const CheckIncDecStops &stopsSwitch; (val), (val+1) int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_flags=0, IsValueAvailable isValueAvailable=NULL, const CheckIncDecStops &stops=stops100); -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/480x272/navigation.cpp b/radio/src/gui/480x272/navigation.cpp index 3b8a846d0..fc32fdd61 100644 --- a/radio/src/gui/480x272/navigation.cpp +++ b/radio/src/gui/480x272/navigation.cpp @@ -27,28 +27,6 @@ int8_t s_editMode; uint8_t noHighlightCounter; uint8_t menuCalibrationState; // TODO rename this variable int checkIncDecSelection = 0; - -#if defined(AUTOSWITCH) -swsrc_t checkIncDecMovedSwitch(swsrc_t val) -{ - if (s_editMode > 0) { - swsrc_t swtch = getMovedSwitch(); - if (swtch) { - div_t info = switchInfo(swtch); - if (IS_CONFIG_TOGGLE(info.quot)) { - if (info.rem != 0) { - val = (val == swtch ? swtch-2 : swtch); - } - } - else { - val = swtch; - } - } - } - return val; -} -#endif - int8_t checkIncDec_Ret; INIT_STOPS(stops100, 3, -100, 0, 100)