fix(firmware): global variable value and range may not be correct (#7009)

This commit is contained in:
philmoz
2026-01-25 13:43:02 +10:00
committed by GitHub
parent 06509ac5ca
commit 61ce1a2d18
9 changed files with 74 additions and 19 deletions
@@ -184,9 +184,7 @@ void menuModelLogicalSwitchOne(event_t event)
else
{
LcdFlags lf = attr | LEFT;
getMixSrcRange(cs->v1, v2_min, v2_max, &lf);
if ((cs->func == LS_FUNC_APOS) || (cs->func == LS_FUNC_ANEG) || (cs->func == LS_FUNC_ADIFFEGREATER))
v2_min = 0;
if (validateLSV2Range(cs, v2_min, v2_max, &lf)) storageDirty(EE_MODEL);
drawSourceCustomValue(CSWONE_2ND_COLUMN, y, cs->v1, (abs(cs->v1) <= MIXSRC_LAST_CH ? calc100toRESX(cs->v2) : cs->v2), lf);
}
}
@@ -261,6 +261,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
}
#if defined(GVARS)
else if (func == FUNC_ADJUST_GVAR) {
if (validateSFGV(cfn)) storageDirty(eeFlags);
maxParam = MAX_GVARS - 1;
drawStringWithIndex(lcdNextPos + 2, y, STR_GV, CFN_GVAR_INDEX(cfn)+1, attr);
if (active) CFN_GVAR_INDEX(cfn) = checkIncDec(event, CFN_GVAR_INDEX(cfn), 0, maxParam, eeFlags);
@@ -173,9 +173,7 @@ void menuModelLogicalSwitches(event_t event)
INCDEC_ENABLE_CHECK(nullptr);
}
LcdFlags lf = attr2 | LEFT;
getMixSrcRange(v1_val, v2_min, v2_max, &lf);
if ((cs->func == LS_FUNC_APOS) || (cs->func == LS_FUNC_ANEG) || (cs->func == LS_FUNC_ADIFFEGREATER))
v2_min = 0;
if (validateLSV2Range(cs, v2_min, v2_max, &lf)) storageDirty(EE_MODEL);
drawSourceCustomValue(CSW_3RD_COLUMN, y, v1_val, (abs(v1_val) <= MIXSRC_LAST_CH ? calc100toRESX(cs->v2) : cs->v2), lf);
}
@@ -249,6 +249,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
}
#if defined(GVARS)
else if (func == FUNC_ADJUST_GVAR) {
if (validateSFGV(cfn)) storageDirty(eeFlags);
maxParam = MAX_GVARS-1;
drawStringWithIndex(lcdNextPos + 2, y, STR_GV, CFN_GVAR_INDEX(cfn)+1, attr);
if (active) CFN_GVAR_INDEX(cfn) = checkIncDec(event, CFN_GVAR_INDEX(cfn), 0, maxParam, eeFlags);
@@ -90,14 +90,6 @@ class LogicalSwitchEditPage : public Page
etx_font(headerSwitchName->getLvObj(), FONT_BOLD_INDEX, ETX_STATE_LS_ACTIVE);
}
void getV2Range(LogicalSwitchData* cs, int16_t& v2_min, int16_t& v2_max)
{
getMixSrcRange(cs->v1, v2_min, v2_max);
if ((cs->func == LS_FUNC_APOS) || (cs->func == LS_FUNC_ANEG) ||
(cs->func == LS_FUNC_ADIFFEGREATER))
v2_min = 0;
}
void updateLogicalSwitchOneWindow()
{
SwitchChoice* choice;
@@ -141,7 +133,7 @@ class LogicalSwitchEditPage : public Page
cs->v1 = newValue;
if (v2Edit != nullptr) {
int16_t v2_min = 0, v2_max = 0;
getV2Range(cs, v2_min, v2_max);
validateLSV2Range(cs, v2_min, v2_max, nullptr);
v2Edit->setMin(v2_min);
v2Edit->setMax(v2_max);
v2Edit->setValue(cs->v2);
@@ -206,7 +198,7 @@ class LogicalSwitchEditPage : public Page
break;
default:
int16_t v2_min = 0, v2_max = 0;
getV2Range(cs, v2_min, v2_max);
if (validateLSV2Range(cs, v2_min, v2_max, nullptr)) SET_DIRTY();
v2Edit = new NumberEdit(line, rect_t{}, v2_min, v2_max,
GET_SET_DEFAULT(cs->v2));
@@ -528,9 +528,15 @@ void FunctionEditPage::updateSpecialFunctionOneWindow()
break;
case FUNC_ADJUST_GVAR: {
if (validateSFGV(cfn)) SET_DIRTY();
new StaticText(line, rect_t{}, STR_GLOBALVAR);
auto gvarchoice = new Choice(line, rect_t{}, 0, MAX_GVARS - 1,
GET_SET_DEFAULT(CFN_GVAR_INDEX(cfn)));
GET_DEFAULT(CFN_GVAR_INDEX(cfn)),
[=](int32_t newValue){
CFN_GVAR_INDEX(cfn) = newValue;
SET_DIRTY();
updateSpecialFunctionOneWindow();
});
gvarchoice->setTextHandler([](int32_t value) {
return std::string(getSourceString(value + MIXSRC_FIRST_GVAR));
});
@@ -136,9 +136,16 @@ void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t fl
vmax = GVAR_MAX + MAX_FLIGHT_MODES - 1;
}
else {
drawGVarValue(x, y, gvar, *v, flags);
vmin = GVAR_MIN + g_model.gvars[gvar].min;
vmax = GVAR_MAX - g_model.gvars[gvar].max;
if (*v < vmin) {
*v = vmin;
storageDirty(EE_MODEL);
} else if (*v > vmax) {
*v = vmax;
storageDirty(EE_MODEL);
}
drawGVarValue(x, y, gvar, *v, flags);
}
if (flags & INVERS) {