Fixes 5602 Special Functions Inc/Dec Gvar (#6442)

Fixes #5602 (2.3)
This commit is contained in:
Neil Horne
2019-06-01 15:30:07 +02:00
committed by Bertrand Songis
parent 96e3bf0d70
commit 882e9638cc
6 changed files with 32 additions and 4 deletions
@@ -370,6 +370,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
break;
default: // FUNC_ADJUST_GVAR_INC
getMixSrcRange(CFN_GVAR_INDEX(cfn) + MIXSRC_FIRST_GVAR, val_min, val_max);
getGVarIncDecRange(val_min, val_max);
lcdDrawText(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, (val_displayed < 0 ? "-= " : "+= "), attr);
drawGVarValue(lcdNextPos, y, CFN_GVAR_INDEX(cfn), abs(val_displayed), attr|LEFT);
break;
@@ -364,6 +364,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
break;
default: // FUNC_ADJUST_GVAR_INC
getMixSrcRange(CFN_GVAR_INDEX(cfn) + MIXSRC_FIRST_GVAR, val_min, val_max);
getGVarIncDecRange(val_min, val_max);
lcdDrawText(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, (val_displayed < 0 ? "-= " : "+= "), attr);
drawGVarValue(lcdNextPos, y, CFN_GVAR_INDEX(cfn), abs(val_displayed), attr|LEFT);
break;
@@ -359,6 +359,7 @@ bool menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
break;
default: // FUNC_ADJUST_GVAR_INC
getMixSrcRange(CFN_GVAR_INDEX(cfn) + MIXSRC_FIRST_GVAR, val_min, val_max);
getGVarIncDecRange(val_min, val_max);
lcdDrawText(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, (val_displayed < 0 ? "-= " : "+= "), attr);
drawGVarValue(lcdNextPos, y, CFN_GVAR_INDEX(cfn), abs(val_displayed), attr|LEFT);
break;
+8
View File
@@ -801,6 +801,14 @@ inline void getMixSrcRange(const int source, int16_t & valMin, int16_t & valMax,
valMin = -valMax;
}
}
#if defined(GVAR_MAX)
inline void getGVarIncDecRange(int16_t & valMin, int16_t & valMax)
{
int16_t rng = abs(valMax - valMin);
valMin = -rng;
valMax = rng;
}
#endif
// Curves
enum BaseCurves {