3djc/x7 draw timer (#4764)

* Use drawText with tiem string like x12s. Change font ':' which where way to large for SMLSIZE

* MIDSIZE ':' lower dot was not horizontaly symetrical, moving it up one pixel

* Make it all ARM

* Let's try not to brake timer adjust

* Fix
This commit is contained in:
3djc
2017-04-08 16:59:21 +02:00
committed by Bertrand Songis
parent d04cb84c5b
commit d4c3ff743b
4 changed files with 7 additions and 6 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 755 B

After

Width:  |  Height:  |  Size: 762 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1003 B

After

Width:  |  Height:  |  Size: 1.3 KiB

+1 -1
View File
@@ -815,7 +815,7 @@ void drawTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2
#endif #endif
lcdDrawNumber(x, y, qr.quot, att|LEADING0|LEFT, 2); lcdDrawNumber(x, y, qr.quot, att|LEADING0|LEFT, 2);
#if defined(CPUARM) #if defined(CPUARM)
if (att & MIDSIZE) { if (FONTSIZE(att) == MIDSIZE) {
lcdLastRightPos--; lcdLastRightPos--;
} }
if (separator == CHR_HOUR) if (separator == CHR_HOUR)
+1
View File
@@ -126,6 +126,7 @@ void drawSourceCustomValue(coord_t x, coord_t y, source_t source, int32_t value,
drawSensorCustomValue(x, y, source, value, flags); drawSensorCustomValue(x, y, source, value, flags);
} }
else if (source >= MIXSRC_FIRST_TIMER || source == MIXSRC_TX_TIME) { else if (source >= MIXSRC_FIRST_TIMER || source == MIXSRC_TX_TIME) {
if (value < 0) flags |= BLINK|INVERS;
drawTimer(x, y, value, flags); drawTimer(x, y, value, flags);
} }
else if (source == MIXSRC_TX_VOLTAGE) { else if (source == MIXSRC_TX_VOLTAGE) {