feat: add precision setting for mix delay up & down (#5314)

This commit is contained in:
philmoz
2024-07-29 20:07:58 +10:00
committed by GitHub
parent e323bd6821
commit bdfb94ae83
42 changed files with 242 additions and 129 deletions
+7 -2
View File
@@ -33,6 +33,7 @@ enum MixFields {
MIX_FIELD_SWITCH,
MIX_FIELD_WARNING,
MIX_FIELD_MLTPX,
MIX_FIELD_DELAY_PREC,
MIX_FIELD_DELAY_UP,
MIX_FIELD_DELAY_DOWN,
MIX_FIELD_SLOW_PREC,
@@ -185,12 +186,16 @@ void menuModelMixOne(event_t event)
md2->mltpx = editChoice(MIXES_2ND_COLUMN, y, STR_MULTPX, STR_VMLTPX, md2->mltpx, 0, 2, attr, event);
break;
case MIX_FIELD_DELAY_PREC:
md2->delayPrec = editChoice(MIXES_2ND_COLUMN, y, STR_MIX_DELAY_PREC, &STR_VPREC[1], md2->delayPrec, 0, 1, attr, event);
break;
case MIX_FIELD_DELAY_UP:
md2->delayUp = EDIT_DELAY(0, y, event, attr, STR_DELAYUP, md2->delayUp, PREC1);
md2->delayUp = EDIT_DELAY(0, y, event, attr, STR_DELAYUP, md2->delayUp, (md2->delayPrec ? PREC2 : PREC1));
break;
case MIX_FIELD_DELAY_DOWN:
md2->delayDown = EDIT_DELAY(0, y, event, attr, STR_DELAYDOWN, md2->delayDown, PREC1);
md2->delayDown = EDIT_DELAY(0, y, event, attr, STR_DELAYDOWN, md2->delayDown, (md2->delayPrec ? PREC2 : PREC1));
break;
case MIX_FIELD_SLOW_PREC:
+7 -2
View File
@@ -33,6 +33,7 @@ enum MixFields {
MIX_FIELD_SWITCH,
MIX_FIELD_WARNING,
MIX_FIELD_MLTPX,
MIX_FIELD_DELAY_PREC,
MIX_FIELD_DELAY_UP,
MIX_FIELD_DELAY_DOWN,
MIX_FIELD_SLOW_PREC,
@@ -181,12 +182,16 @@ void menuModelMixOne(event_t event)
md2->mltpx = editChoice(MIXES_2ND_COLUMN, y, STR_MULTPX, STR_VMLTPX, md2->mltpx, 0, 2, attr, event);
break;
case MIX_FIELD_DELAY_PREC:
md2->delayPrec = editChoice(MIXES_2ND_COLUMN, y, STR_MIX_DELAY_PREC, &STR_VPREC[1], md2->delayPrec, 0, 1, attr, event);
break;
case MIX_FIELD_DELAY_UP:
md2->delayUp = EDIT_DELAY(y, event, attr, STR_DELAYUP, md2->delayUp, PREC1);
md2->delayUp = EDIT_DELAY(y, event, attr, STR_DELAYUP, md2->delayUp, (md2->delayPrec ? PREC2 : PREC1));
break;
case MIX_FIELD_DELAY_DOWN:
md2->delayDown = EDIT_DELAY(y, event, attr, STR_DELAYDOWN, md2->delayDown, PREC1);
md2->delayDown = EDIT_DELAY(y, event, attr, STR_DELAYDOWN, md2->delayDown, (md2->delayPrec ? PREC2 : PREC1));
break;
case MIX_FIELD_SLOW_PREC:
+30 -8
View File
@@ -84,20 +84,42 @@ void MixEditAdvanced::buildBody(Window* form)
GET_SET_DEFAULT(mix->mixWarn));
edit->setZeroText(STR_OFF);
// Delay up/down precision
#if !PORTRAIT_LCD
grid.setColSpan(2);
#endif
line = form->newLine(grid);
new StaticText(line, rect_t{}, STR_MIX_DELAY_PREC);
new Choice(line, rect_t{}, &STR_VPREC[1], 0, 1,
GET_DEFAULT(mix->delayPrec),
[=](int newValue) {
mix->delayPrec = newValue;
delayUp->clearTextFlag(PREC2);
delayUp->setTextFlag(mix->delayPrec ? PREC2 : PREC1);
delayUp->update();
delayDn->clearTextFlag(PREC2);
delayDn->setTextFlag(mix->delayPrec ? PREC2 : PREC1);
delayDn->update();
SET_DIRTY();
});
#if !PORTRAIT_LCD
grid.setColSpan(1);
#endif
// Delay up
line = form->newLine(grid);
new StaticText(line, rect_t{}, STR_DELAYUP);
edit = new NumberEdit(line, rect_t{0, 0, NUM_EDIT_W, 0}, 0, DELAY_MAX,
GET_DEFAULT(mix->delayUp),
SET_VALUE(mix->delayUp, newValue), PREC1);
edit->setSuffix("s");
delayUp = new NumberEdit(line, rect_t{0, 0, NUM_EDIT_W, 0}, 0, DELAY_MAX,
GET_DEFAULT(mix->delayUp),
SET_VALUE(mix->delayUp, newValue), mix->delayPrec ? PREC2 : PREC1);
delayUp->setSuffix("s");
// Delay down
new StaticText(line, rect_t{}, STR_DELAYDOWN);
edit = new NumberEdit(line, rect_t{0, 0, NUM_EDIT_W, 0}, 0, DELAY_MAX,
GET_DEFAULT(mix->delayDown),
SET_VALUE(mix->delayDown, newValue), PREC1);
edit->setSuffix("s");
delayDn = new NumberEdit(line, rect_t{0, 0, NUM_EDIT_W, 0}, 0, DELAY_MAX,
GET_DEFAULT(mix->delayDown),
SET_VALUE(mix->delayDown, newValue), mix->delayPrec ? PREC2 : PREC1);
delayDn->setSuffix("s");
// Slow up/down precision
#if !PORTRAIT_LCD
+2
View File
@@ -38,6 +38,8 @@ class MixEditAdvanced : public Page
protected:
uint8_t channel;
uint8_t index;
NumberEdit* delayUp;
NumberEdit* delayDn;
NumberEdit* slowUp;
NumberEdit* slowDn;