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

Allow more the 2 hours digits for TIMEHOUR (#5715)

Browse Source 
* Handle 3 digits or more in TIMEHOUR

* Cleanup
This commit is contained in:
3djc
2018-03-04 13:09:59 +01:00
committed by Andre Bernet
parent da5af2cac2
commit 4a88660a3d
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/lcd.cpp
+6 -1
View File
@@ -813,7 +813,12 @@ void drawTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2
#else
#define separator ':'
#endif
lcdDrawNumber(x, y, qr.quot, att|LEADING0|LEFT, 2);
if(qr.quot < 100) {
lcdDrawNumber(x, y, qr.quot, att|LEADING0|LEFT, 2);
}
else {
lcdDrawNumber(x, y, qr.quot, att|LEFT);
}
#if defined(CPUARM)
if (FONTSIZE(att) == MIDSIZE) {
lcdLastRightPos--;
radio/src/gui/212x64/lcd.cpp
+7 -7
View File
@@ -540,15 +540,15 @@ void drawTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2
#define separator ':'
if (att & TIMEHOUR) {
div_t qr2 = div(qr.quot, 60);
lcdDrawNumber(x, y, qr2.quot, att|LEADING0|LEFT, 2);
if (qr2.quot < 100) {
lcdDrawNumber(x, y, qr2.quot, att|LEADING0|LEFT, 2);
}
else {
lcdDrawNumber(x, y, qr2.quot, att|LEFT);
}
lcdDrawChar(lcdNextPos, y, separator, att);
qr.quot = qr2.rem;
if (att & MIDSIZE)
x += 17;
else if (att & BOLD)
x += 15;
else
x += 13;
x = lcdNextPos;
}
lcdDrawNumber(x, y, qr.quot, att|LEADING0|LEFT, 2);