diff --git a/radio/src/gui/colorlcd/draw_functions.cpp b/radio/src/gui/colorlcd/draw_functions.cpp index 6bb28c525..0069329b1 100644 --- a/radio/src/gui/colorlcd/draw_functions.cpp +++ b/radio/src/gui/colorlcd/draw_functions.cpp @@ -167,16 +167,10 @@ void drawHorizontalSlider(BitmapBuffer * dc, coord_t x, coord_t y, int len, int else { dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_OUT, DEFAULT_COLOR); dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_MID, DEFAULT_BGCOLOR); - if ((options & INVERS) && (!(options & BLINK) || !BLINK_ON_PHASE)) - dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_IN, FOCUS_BGCOLOR); + dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_IN, FOCUS_BGCOLOR); } } -bool noZero(int val) -{ - return val != 0; -} - void drawGVarValue(BitmapBuffer * dc, coord_t x, coord_t y, uint8_t gvar, gvar_t value, LcdFlags flags) { uint8_t prec = g_model.gvars[gvar].prec; @@ -487,7 +481,7 @@ void drawSourceCustomValue(BitmapBuffer * dc, coord_t x, coord_t y, source_t sou drawSensorCustomValue(dc, y, source, value, flags); } else if (source >= MIXSRC_FIRST_TIMER || source == MIXSRC_TX_TIME) { - if (value < 0) flags |= BLINK|INVERS; + // TODO if (value < 0) flags |= BLINK|INVERS; // TODO drawTimer(dc, x, y, value, flags); } else if (source == MIXSRC_TX_VOLTAGE) { diff --git a/radio/src/gui/colorlcd/radio_diagkeys.cpp b/radio/src/gui/colorlcd/radio_diagkeys.cpp index 3ace84dee..f4c4e54ff 100644 --- a/radio/src/gui/colorlcd/radio_diagkeys.cpp +++ b/radio/src/gui/colorlcd/radio_diagkeys.cpp @@ -48,8 +48,8 @@ class RadioKeyDiagsWindow : public Window char status[2]; status[0] = t + '0'; status[1] = '\0'; - - dc->drawText(x, y, status, t ? INVERS : 0); + // TODO INVERS? + dc->drawText(x, y, status, 0); } void paint(BitmapBuffer * dc) override @@ -70,7 +70,7 @@ class RadioKeyDiagsWindow : public Window dc->drawText(TRIM_PLUS_COLUMN, 1, "+"); #if !defined(PCBNV14) - //KEYS + // KEYS for (uint8_t i = KEY_START; i <= 6; i++) { coord_t y = 1 + FH * (i - KEY_START); dc->drawTextAtIndex(KEY_COLUMN, y, STR_VKEYS, i, 0); diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index a2aff466c..d1f0d77d9 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit a2aff466ca9776b4fe156d823111eac8d667ae71 +Subproject commit d1f0d77d9c7b79735103a9af11a5b23cafd7db64