piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Add mixer warning UI to Horus (#5780)

Browse Source
This commit is contained in:
3djc
2018-03-25 09:21:40 +02:00
committed by Bertrand Songis
parent 05c7fbeb0b
commit 0025c01024
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/480x272/model_mixes.cpp
+14 -2
View File
@@ -155,7 +155,7 @@ enum MixFields {
CASE_CURVES(MIX_FIELD_CURVE)
CASE_FLIGHT_MODES(MIX_FIELD_FLIGHT_MODE)
MIX_FIELD_SWITCH,
// MIX_FIELD_WARNING,
MIX_FIELD_WARNING,
MIX_FIELD_MLTPX,
MIX_FIELD_DELAY_UP,
MIX_FIELD_DELAY_DOWN,
@@ -188,7 +188,7 @@ bool menuModelMixOne(event_t event)
for (int k=0; k<2*NUM_BODY_LINES; k++) {
coord_t y;
if (k >= NUM_BODY_LINES) {
if (k > NUM_BODY_LINES) {
y = MENU_CONTENT_TOP - FH + (k-NUM_BODY_LINES)*FH;
}
else {
@@ -244,6 +244,18 @@ bool menuModelMixOne(event_t event)
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_SWITCH);
md2->swtch = editSwitch(MIXES_2ND_COLUMN, y, md2->swtch, attr, event);
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:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MULTPX);
md2->mltpx = editChoice(MIXES_2ND_COLUMN, y, STR_VMLTPX, md2->mltpx, 0, 2, attr, event);