diff --git a/radio/src/fonts/std/font_04x06.png b/radio/src/fonts/std/font_04x06.png index 7afcb839e..0b3cd8824 100644 Binary files a/radio/src/fonts/std/font_04x06.png and b/radio/src/fonts/std/font_04x06.png differ diff --git a/radio/src/fonts/std/font_08x10.png b/radio/src/fonts/std/font_08x10.png index b1dff4e1e..b23de973b 100644 Binary files a/radio/src/fonts/std/font_08x10.png and b/radio/src/fonts/std/font_08x10.png differ diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index 81aa86fc2..09673710a 100644 --- a/radio/src/gui/128x64/lcd.cpp +++ b/radio/src/gui/128x64/lcd.cpp @@ -815,7 +815,7 @@ void drawTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2 #endif lcdDrawNumber(x, y, qr.quot, att|LEADING0|LEFT, 2); #if defined(CPUARM) - if (att & MIDSIZE) { + if (FONTSIZE(att) == MIDSIZE) { lcdLastRightPos--; } if (separator == CHR_HOUR) diff --git a/radio/src/gui/common/arm/widgets.cpp b/radio/src/gui/common/arm/widgets.cpp index b8b1ed382..3e9bee876 100644 --- a/radio/src/gui/common/arm/widgets.cpp +++ b/radio/src/gui/common/arm/widgets.cpp @@ -28,16 +28,16 @@ void drawCurveRef(coord_t x, coord_t y, CurveRef & curve, LcdFlags att) lcdDrawText(x, y, "D", att); GVAR_MENU_ITEM(lcdNextPos, y, curve.value, -100, 100, LEFT|att, 0, 0); break; - + case CURVE_REF_EXPO: lcdDrawText(x, y, "E", att); GVAR_MENU_ITEM(lcdNextPos, y, curve.value, -100, 100, LEFT|att, 0, 0); break; - + case CURVE_REF_FUNC: lcdDrawTextAtIndex(x, y, STR_VCURVEFUNC, curve.value, att); break; - + case CURVE_REF_CUSTOM: drawCurveName(x, y, curve.value, att); break; @@ -51,10 +51,10 @@ void drawSensorCustomValue(coord_t x, coord_t y, uint8_t sensor, int32_t value, // Lua luaLcdDrawChannel() can call us with a bad value return; } - + TelemetryItem & telemetryItem = telemetryItems[sensor]; TelemetrySensor & telemetrySensor = g_model.telemetrySensors[sensor]; - + if (telemetrySensor.unit == UNIT_DATETIME) { drawDate(x, y, telemetryItem, flags); } @@ -126,6 +126,7 @@ void drawSourceCustomValue(coord_t x, coord_t y, source_t source, int32_t value, drawSensorCustomValue(x, y, source, value, flags); } else if (source >= MIXSRC_FIRST_TIMER || source == MIXSRC_TX_TIME) { + if (value < 0) flags |= BLINK|INVERS; drawTimer(x, y, value, flags); } else if (source == MIXSRC_TX_VOLTAGE) {