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

Fixes #3206

Browse Source
This commit is contained in:
Bertrand Songis
2016-01-06 23:29:20 +01:00
parent 3d9553d5f3
commit bbe4e7d4c3
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/taranis/lcd.cpp
+2
View File
@@ -577,6 +577,8 @@ void putsTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2
qr.quot = qr2.rem; qr.quot = qr2.rem;
if (att & MIDSIZE) if (att & MIDSIZE)
x += 17; x += 17;
else if (att & BOLD)
x += 15;
else else
x += 13; x += 13;
} }
radio/src/gui/taranis/view_telemetry.cpp
+9 -3
View File
@@ -105,6 +105,7 @@ void displayGaugesTelemetryScreen(FrSkyScreenData & screen)
bool displayNumbersTelemetryScreen(FrSkyScreenData & screen) bool displayNumbersTelemetryScreen(FrSkyScreenData & screen)
{ {
// Custom Screen with numbers // Custom Screen with numbers
const coord_t pos[] = {0, 71, 143, 214};
uint8_t fields_count = 0; uint8_t fields_count = 0;
for (uint8_t i=0; i<4; i++) { for (uint8_t i=0; i<4; i++) {
for (uint8_t j=0; j<NUM_LINE_ITEMS; j++) { for (uint8_t j=0; j<NUM_LINE_ITEMS; j++) {
@@ -121,11 +122,17 @@ bool displayNumbersTelemetryScreen(FrSkyScreenData & screen)
} }
} }
if (field) { if (field) {
coord_t x = pos[j+1]-2;
coord_t y = (i==3 ? 1+FH+2*FH*i:FH+2*FH*i);
LcdFlags att = (i==3 ? NO_UNIT : DBLSIZE|NO_UNIT); LcdFlags att = (i==3 ? NO_UNIT : DBLSIZE|NO_UNIT);
coord_t pos[] = {0, 71, 143, 214};
if (field >= MIXSRC_FIRST_TIMER && field <= MIXSRC_LAST_TIMER && i!=3) { if (field >= MIXSRC_FIRST_TIMER && field <= MIXSRC_LAST_TIMER && i!=3) {
// there is not enough space on LCD for displaying "Tmr1" or "Tmr2" and still see the - sign, we write "T1" or "T2" instead // there is not enough space on LCD for displaying "Tmr1" or "Tmr2" and still see the - sign, we write "T1" or "T2" instead
putsStrIdx(pos[j], 1+FH+2*FH*i, "T", field-MIXSRC_FIRST_TIMER+1, 0); putsStrIdx(pos[j], 1+FH+2*FH*i, "T", field-MIXSRC_FIRST_TIMER+1, 0);
if (timersStates[field-MIXSRC_FIRST_TIMER].val > 3600) {
att += TIMEHOUR - DBLSIZE;
x -= 3*FW;
y += FH/2;
}
} }
else if (field >= MIXSRC_FIRST_TELEM && isGPSSensor(1+(field-MIXSRC_FIRST_TELEM)/3) && telemetryItems[(field-MIXSRC_FIRST_TELEM)/3].isAvailable()) { else if (field >= MIXSRC_FIRST_TELEM && isGPSSensor(1+(field-MIXSRC_FIRST_TELEM)/3) && telemetryItems[(field-MIXSRC_FIRST_TELEM)/3].isAvailable()) {
// we don't display GPS name, no space for it // we don't display GPS name, no space for it
@@ -144,8 +151,7 @@ bool displayNumbersTelemetryScreen(FrSkyScreenData & screen)
} }
} }
putsChannel(pos[j+1]-2, (i==3 ? 1+FH+2*FH*i:FH+2*FH*i), field, att); putsChannel(x, y, field, att);
} }
} }
} }