Add mixer warning UI to Horus (#5780)
This commit is contained in:
@@ -155,7 +155,7 @@ enum MixFields {
|
|||||||
CASE_CURVES(MIX_FIELD_CURVE)
|
CASE_CURVES(MIX_FIELD_CURVE)
|
||||||
CASE_FLIGHT_MODES(MIX_FIELD_FLIGHT_MODE)
|
CASE_FLIGHT_MODES(MIX_FIELD_FLIGHT_MODE)
|
||||||
MIX_FIELD_SWITCH,
|
MIX_FIELD_SWITCH,
|
||||||
// MIX_FIELD_WARNING,
|
MIX_FIELD_WARNING,
|
||||||
MIX_FIELD_MLTPX,
|
MIX_FIELD_MLTPX,
|
||||||
MIX_FIELD_DELAY_UP,
|
MIX_FIELD_DELAY_UP,
|
||||||
MIX_FIELD_DELAY_DOWN,
|
MIX_FIELD_DELAY_DOWN,
|
||||||
@@ -188,7 +188,7 @@ bool menuModelMixOne(event_t event)
|
|||||||
|
|
||||||
for (int k=0; k<2*NUM_BODY_LINES; k++) {
|
for (int k=0; k<2*NUM_BODY_LINES; k++) {
|
||||||
coord_t y;
|
coord_t y;
|
||||||
if (k >= NUM_BODY_LINES) {
|
if (k > NUM_BODY_LINES) {
|
||||||
y = MENU_CONTENT_TOP - FH + (k-NUM_BODY_LINES)*FH;
|
y = MENU_CONTENT_TOP - FH + (k-NUM_BODY_LINES)*FH;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -244,6 +244,18 @@ bool menuModelMixOne(event_t event)
|
|||||||
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_SWITCH);
|
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_SWITCH);
|
||||||
md2->swtch = editSwitch(MIXES_2ND_COLUMN, y, md2->swtch, attr, event);
|
md2->swtch = editSwitch(MIXES_2ND_COLUMN, y, md2->swtch, attr, event);
|
||||||
break;
|
break;
|
||||||
|
case MIX_FIELD_WARNING:
|
||||||
|
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MIXWARNING);
|
||||||
|
if (md2->mixWarn) {
|
||||||
|
lcdDrawNumber(MIXES_2ND_COLUMN, y, md2->mixWarn, attr|LEFT);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
lcdDrawText(MIXES_2ND_COLUMN, y, STR_OFF, attr);
|
||||||
|
}
|
||||||
|
if (attr) {
|
||||||
|
CHECK_INCDEC_MODELVAR_ZERO(event, md2->mixWarn, 3);
|
||||||
|
}
|
||||||
|
break;
|
||||||
case MIX_FIELD_MLTPX:
|
case MIX_FIELD_MLTPX:
|
||||||
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MULTPX);
|
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MULTPX);
|
||||||
md2->mltpx = editChoice(MIXES_2ND_COLUMN, y, STR_VMLTPX, md2->mltpx, 0, 2, attr, event);
|
md2->mltpx = editChoice(MIXES_2ND_COLUMN, y, STR_VMLTPX, md2->mltpx, 0, 2, attr, event);
|
||||||
|
|||||||
Reference in New Issue
Block a user