Compilation fix
This commit is contained in:
@@ -149,7 +149,6 @@ extern const CheckIncDecStops &stopsSwitch;
|
|||||||
(val), (val+1)
|
(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);
|
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 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 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)
|
#define checkIncDecGen(event, i_val, i_min, i_max) checkIncDec(event, i_val, i_min, i_max, EE_GENERAL)
|
||||||
|
|||||||
@@ -27,28 +27,6 @@ int8_t s_editMode;
|
|||||||
uint8_t noHighlightCounter;
|
uint8_t noHighlightCounter;
|
||||||
uint8_t menuCalibrationState; // TODO rename this variable
|
uint8_t menuCalibrationState; // TODO rename this variable
|
||||||
int checkIncDecSelection = 0;
|
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;
|
int8_t checkIncDec_Ret;
|
||||||
|
|
||||||
INIT_STOPS(stops100, 3, -100, 0, 100)
|
INIT_STOPS(stops100, 3, -100, 0, 100)
|
||||||
|
|||||||
Reference in New Issue
Block a user