From 981e402e6818f23f77d9581766e2561f29b62520 Mon Sep 17 00:00:00 2001 From: "bernet.andre@gmail.com" Date: Sun, 14 Jul 2013 19:17:47 +0000 Subject: [PATCH] [Taranis] - sign not visible on timers on custom telemtry screens Double - in logs for Baro alt/Vspd when value < -1 --- src/gui/view_telemetry.cpp | 5 ++--- src/telemetry/frsky_sport.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gui/view_telemetry.cpp b/src/gui/view_telemetry.cpp index 85378dcd9..2adf3eb0a 100644 --- a/src/gui/view_telemetry.cpp +++ b/src/gui/view_telemetry.cpp @@ -313,12 +313,11 @@ void menuTelemetryFrsky(uint8_t event) xcoord_t pos[] = {0, 65, 130}; #endif putsTelemetryChannel(pos[j+1]-2, 1+FH+2*FH*i, field-1, value, att); -#if LCD_W < 212 + if (field >= TELEM_TM1 && field <= TELEM_TM2 && i!=3) { - // there is not enough space on LCD for displaying "Tmr1" or "Tmr2", 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 field = field-TELEM_TM1+TELEM_T1; } -#endif lcd_putsiAtt(pos[j], 1+FH+2*FH*i, STR_VTELEMCHNS, field, 0); } } diff --git a/src/telemetry/frsky_sport.h b/src/telemetry/frsky_sport.h index 8962bb909..19bd73bf3 100644 --- a/src/telemetry/frsky_sport.h +++ b/src/telemetry/frsky_sport.h @@ -177,7 +177,7 @@ void resetTelemetry(); #define TELEMETRY_GPS_SPEED_AP frskyData.hub.gpsSpeed_ap #define TELEMETRY_GPS_ALT_AP frskyData.hub.gpsAltitude_ap #define TELEMETRY_GPS_ALT_BP frskyData.hub.gpsAltitude_bp -#define TELEMETRY_ALT frskyData.hub.baroAltitude < 0 ? '-' : ' ', frskyData.hub.baroAltitude / 100, abs(frskyData.hub.baroAltitude % 100) +#define TELEMETRY_ALT frskyData.hub.baroAltitude < 0 ? '-' : ' ', abs(frskyData.hub.baroAltitude / 100), abs(frskyData.hub.baroAltitude % 100) #define TELEMETRY_ALT_FORMAT "%c%d.%02d," #define TELEMETRY_CELLS frskyData.hub.cellsSum / 10, frskyData.hub.cellsSum % 10, frskyData.hub.cellVolts[0]*2/100, frskyData.hub.cellVolts[0]*2%100, frskyData.hub.cellVolts[1]*2/100, frskyData.hub.cellVolts[1]*2%100, frskyData.hub.cellVolts[2]*2/100, frskyData.hub.cellVolts[2]*2%100, frskyData.hub.cellVolts[3]*2/100, frskyData.hub.cellVolts[3]*2%100, frskyData.hub.cellVolts[4]*2/100, frskyData.hub.cellVolts[4]*2%100, frskyData.hub.cellVolts[5]*2/100, frskyData.hub.cellVolts[5]*2%100 #define TELEMETRY_CELLS_FORMAT "%d.%d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d," @@ -185,7 +185,7 @@ void resetTelemetry(); #define TELEMETRY_CURRENT_FORMAT "%d.%d," #define TELEMETRY_VFAS frskyData.hub.vfas / 10, frskyData.hub.vfas % 10 #define TELEMETRY_VFAS_FORMAT "%d.%d," -#define TELEMETRY_VSPEED frskyData.hub.varioSpeed < 0 ? '-' : ' ', frskyData.hub.varioSpeed / 100, abs(frskyData.hub.varioSpeed % 100) +#define TELEMETRY_VSPEED frskyData.hub.varioSpeed < 0 ? '-' : ' ', abs(frskyData.hub.varioSpeed / 100), abs(frskyData.hub.varioSpeed % 100) #define TELEMETRY_VSPEED_FORMAT "%c%d.%02d," /* Would be great, but f_printf() doesn't take floats...