chore: cleanup GVAR code (#6332)
This commit is contained in:
@@ -158,7 +158,7 @@ void OutputChannelBar::drawLimitLines(bool forced)
|
||||
int32_t ldMin;
|
||||
int32_t ldMax;
|
||||
|
||||
if (GV_IS_GV_VALUE(ld->min, -CHANNELS_LIMIT, 0)) {
|
||||
if (GV_IS_GV_VALUE(ld->min)) {
|
||||
ldMin =
|
||||
GET_GVAR_PREC1(ld->min, -CHANNELS_LIMIT, 0, mixerCurrentFlightMode) +
|
||||
LIMIT_STD_MAX;
|
||||
@@ -170,7 +170,7 @@ void OutputChannelBar::drawLimitLines(bool forced)
|
||||
limMin = ldMin;
|
||||
}
|
||||
|
||||
if (GV_IS_GV_VALUE(ld->max, 0, CHANNELS_LIMIT)) {
|
||||
if (GV_IS_GV_VALUE(ld->max)) {
|
||||
ldMax =
|
||||
GET_GVAR_PREC1(ld->max, 0, CHANNELS_LIMIT, mixerCurrentFlightMode) -
|
||||
LIMIT_STD_MAX;
|
||||
|
||||
@@ -40,15 +40,10 @@ GVarNumberEdit::GVarNumberEdit(Window* parent, int32_t vmin,
|
||||
gvar_field = new Choice(
|
||||
this, {0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, 0}, -MAX_GVARS, MAX_GVARS - 1,
|
||||
[=]() {
|
||||
uint16_t gvar1 = GV_GET_GV1_VALUE(vmin, vmax);
|
||||
return GV_INDEX_CALC_DELTA(getValue(), gvar1);
|
||||
return GV_INDEX_FROM_VALUE(getValue());
|
||||
},
|
||||
[=](int idx) {
|
||||
uint16_t gvar1 = GV_GET_GV1_VALUE(vmin, vmax);
|
||||
if (idx < 0)
|
||||
setValue(GV_CALC_VALUE_IDX_NEG(idx, gvar1));
|
||||
else
|
||||
setValue(GV_CALC_VALUE_IDX_POS(idx, gvar1));
|
||||
setValue(GV_VALUE_FROM_INDEX(idx));
|
||||
});
|
||||
gvar_field->setTextHandler(
|
||||
[=](int32_t value) { return getGVarString(value); });
|
||||
@@ -63,9 +58,9 @@ GVarNumberEdit::GVarNumberEdit(Window* parent, int32_t vmin,
|
||||
if (modelGVEnabled()) {
|
||||
m_gvBtn = new TextButton(this, {EdgeTxStyles::EDIT_FLD_WIDTH_NARROW + PAD_TINY, 0, GV_BTN_W, 0}, STR_GV, [=]() {
|
||||
switchGVarMode();
|
||||
return GV_IS_GV_VALUE(getValue(), vmin, vmax);
|
||||
return GV_IS_GV_VALUE(getValue());
|
||||
});
|
||||
m_gvBtn->check(GV_IS_GV_VALUE(getValue(), vmin, vmax));
|
||||
m_gvBtn->check(GV_IS_GV_VALUE(getValue()));
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -79,13 +74,13 @@ void GVarNumberEdit::switchGVarMode()
|
||||
if (modelGVEnabled()) {
|
||||
int32_t value = getValue();
|
||||
setValue(
|
||||
GV_IS_GV_VALUE(value, vmin, vmax)
|
||||
GV_IS_GV_VALUE(value)
|
||||
? ((textFlags & PREC1)
|
||||
? GET_GVAR_PREC1(value, vmin, vmax, mixerCurrentFlightMode)
|
||||
: GET_GVAR(value, vmin, vmax, mixerCurrentFlightMode))
|
||||
: GV_GET_GV1_VALUE(vmin, vmax));
|
||||
: GV_VALUE_FROM_INDEX(0));
|
||||
|
||||
m_gvBtn->check(GV_IS_GV_VALUE(value, vmin, vmax));
|
||||
m_gvBtn->check(GV_IS_GV_VALUE(value));
|
||||
|
||||
// update field type based on value
|
||||
update();
|
||||
@@ -115,7 +110,7 @@ void GVarNumberEdit::update()
|
||||
num_field->hide();
|
||||
|
||||
int32_t value = getValue();
|
||||
if (GV_IS_GV_VALUE(value, vmin, vmax)) {
|
||||
if (GV_IS_GV_VALUE(value)) {
|
||||
// GVAR mode
|
||||
act_field = gvar_field;
|
||||
num_field->setSetValueHandler(nullptr);
|
||||
|
||||
@@ -84,7 +84,7 @@ void InputMixButtonBase::setWeight(gvar_t value, gvar_t min, gvar_t max)
|
||||
}
|
||||
|
||||
char s[32];
|
||||
getValueOrSrcVarString(s, sizeof(s), value, min, max, 0, "%");
|
||||
getValueOrSrcVarString(s, sizeof(s), value, 0, "%");
|
||||
if (getTextWidth(s, 0, FONT(STD)) > WGT_W)
|
||||
lv_obj_add_state(weight, LV_STATE_USER_1);
|
||||
else
|
||||
|
||||
@@ -148,16 +148,15 @@ class OutputLineButton : public ListLineButton
|
||||
}
|
||||
|
||||
char s[32];
|
||||
getValueOrGVarString(s, sizeof(s), output->min, -GV_RANGELARGE, 0, PREC1,
|
||||
getValueOrGVarString(s, sizeof(s), output->min, PREC1,
|
||||
nullptr, -LIMITS_MIN_MAX_OFFSET, true);
|
||||
lv_label_set_text(min, s);
|
||||
|
||||
getValueOrGVarString(s, sizeof(s), output->max, 0, GV_RANGELARGE, PREC1,
|
||||
getValueOrGVarString(s, sizeof(s), output->max, PREC1,
|
||||
nullptr, +LIMITS_MIN_MAX_OFFSET, true);
|
||||
lv_label_set_text(max, s);
|
||||
|
||||
getValueOrGVarString(s, sizeof(s), output->offset, -LIMIT_STD_MAX,
|
||||
+LIMIT_STD_MAX, PREC1, nullptr, 0, true);
|
||||
getValueOrGVarString(s, sizeof(s), output->offset, PREC1, nullptr, 0, true);
|
||||
lv_label_set_text(offset, s);
|
||||
|
||||
lv_label_set_text_fmt(center, "%d%s", PPM_CENTER + output->ppmCenter,
|
||||
|
||||
Reference in New Issue
Block a user