From 2e767943c421d4bd0bf1edfc7b9b35d222bc6d37 Mon Sep 17 00:00:00 2001 From: bsongis Date: Wed, 8 Feb 2012 22:50:02 +0000 Subject: [PATCH] Some texts misplaced on screen --- src/main_views.cpp | 10 +++------- src/translations/en.h | 4 ++-- src/translations/fr.h | 4 ++-- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main_views.cpp b/src/main_views.cpp index 5d73655d4..21725653b 100644 --- a/src/main_views.cpp +++ b/src/main_views.cpp @@ -498,18 +498,14 @@ void menuMainView(uint8_t event) // Speed #define SPEED_LINE (6*FH) - lcd_putsLeft( SPEED_LINE, STR_SPDnMAX); + lcd_putsLeft(SPEED_LINE, STR_SPDnMAX); putsTelemetryValue(4*FW, SPEED_LINE, frskyHubData.gpsSpeed_bp, UNIT_KTS, LEFT|DBLSIZE); // before '.' - // lcd_putcAtt(lcd_lastPos-2, 5*FH, '.', DBLSIZE); // small decimal point - // lcd_outdezAtt(lcd_lastPos+FW, 5*FH, frskyHubData.gpsSpeed_ap, LEFT|UNSIGN|DBLSIZE); // after '.' - putsTelemetryValue(17*FW, SPEED_LINE, frskyHubData.maxGpsSpeed, UNIT_KTS, LEFT); // before '.' + putsTelemetryValue(16*FW, SPEED_LINE, frskyHubData.maxGpsSpeed, UNIT_KTS, LEFT); // before '.' // Altitude #define ALTITUDE_LINE (4*FH-1) - lcd_putsLeft( ALTITUDE_LINE, STR_ALT); + lcd_putsLeft(ALTITUDE_LINE, STR_ALT); putsTelemetryValue(4*FW, ALTITUDE_LINE, frskyHubData.gpsAltitude_bp, UNIT_METERS, LEFT); // before '.' - // lcd_plot(lcd_lastPos, 8*FH-2, 0); // small decimal point - // lcd_outdezAtt(lcd_lastPos+2, 7*FH, frskyHubData.gpsAltitude_ap, LEFT|UNSIGN); // after '.' } else if (g_model.frsky.usrProto == PROTO_FRSKY_HUB && view == e_telemetry+3*ALTERNATE_VIEW) { // Temperature 1 diff --git a/src/translations/en.h b/src/translations/en.h index 50a5685e2..e3cecd84d 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -218,7 +218,7 @@ #define TR_RXBATT "Rx Batt:" #define TR_RX "Rx:" #define TR_TX "Tx:" -#define TR_SPDnMAX "Spd:\008Max:" +#define TR_SPDnMAX "Spd:\010Max:" #define TR_TEMP1nTEMP2 "T@1:\007T@2:" #define TR_RPMnFUEL "RPM:\006Fuel:" #define TR_ACCEL "Acc:" @@ -229,7 +229,7 @@ #define TR_TMR1LATMAXUS "tmr1Lat max\004us" #define TR_TMR1LATMINUS "tmr1Lat min\004us" #define TR_TMR1JITTERUS "tmr1 Jitter\004us" -#define TR_TMAINMAXMS "tmain max\010ms" +#define TR_TMAINMAXMS "tmain max\006ms" #define TR_T10MSUS "t10ms\010us" #define TR_FREESTACKMINB "Free Stack min\004b" #define TR_MENUTORESET "[MENU] to reset" diff --git a/src/translations/fr.h b/src/translations/fr.h index 62b7b9ef2..8fafcf22f 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -218,7 +218,7 @@ #define TR_RXBATT "Rx Batt:" #define TR_RX "Rx:" #define TR_TX "Tx:" -#define TR_SPDnMAX "Spd:\006Max:" +#define TR_SPDnMAX "Spd:\010Max:" #define TR_TEMP1nTEMP2 "T@1:\007T@2:" #define TR_RPMnFUEL "RPM:\006Fuel:" #define TR_ACCEL "Acc:" @@ -229,7 +229,7 @@ #define TR_TMR1LATMAXUS "tmr1Lat max\004us" #define TR_TMR1LATMINUS "tmr1Lat min\004us" #define TR_TMR1JITTERUS "tmr1 Jitter\004us" -#define TR_TMAINMAXMS "tmain max\010ms" +#define TR_TMAINMAXMS "tmain max\006ms" #define TR_T10MSUS "t10ms\010us" #define TR_FREESTACKMINB "Free Stack min\004b" #define TR_MENUTORESET "[MENU]pour reset"