Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 17:55:19 +03:00
Code Issues Wiki Activity

Some texts misplaced on screen

Browse source
This commit is contained in:
bsongis 2012-02-08 22:50:02 +00:00
parent 5da87a5f8d
commit 2e767943c4
3 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main_views.cpp
View file

@ -498,18 +498,14 @@ void menuMainView(uint8_t event)
// Speed // Speed
#define SPEED_LINE (6*FH) #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 '.' putsTelemetryValue(4*FW, SPEED_LINE, frskyHubData.gpsSpeed_bp, UNIT_KTS, LEFT|DBLSIZE); // before '.'
// lcd_putcAtt(lcd_lastPos-2, 5*FH, '.', DBLSIZE); // small decimal point putsTelemetryValue(16*FW, SPEED_LINE, frskyHubData.maxGpsSpeed, UNIT_KTS, LEFT); // before '.'
// 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 '.'
// Altitude // Altitude
#define ALTITUDE_LINE (4*FH-1) #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 '.' 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) { else if (g_model.frsky.usrProto == PROTO_FRSKY_HUB && view == e_telemetry+3*ALTERNATE_VIEW) {
// Temperature 1 // Temperature 1

4
src/translations/en.h
View file

@ -218,7 +218,7 @@
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_RX "Rx:" #define TR_RX "Rx:"
#define TR_TX "Tx:" #define TR_TX "Tx:"
#define TR_SPDnMAX "Spd:\008Max:" #define TR_SPDnMAX "Spd:\010Max:"
#define TR_TEMP1nTEMP2 "T@1:\007T@2:" #define TR_TEMP1nTEMP2 "T@1:\007T@2:"
#define TR_RPMnFUEL "RPM:\006Fuel:" #define TR_RPMnFUEL "RPM:\006Fuel:"
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
@ -229,7 +229,7 @@
#define TR_TMR1LATMAXUS "tmr1Lat max\004us" #define TR_TMR1LATMAXUS "tmr1Lat max\004us"
#define TR_TMR1LATMINUS "tmr1Lat min\004us" #define TR_TMR1LATMINUS "tmr1Lat min\004us"
#define TR_TMR1JITTERUS "tmr1 Jitter\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_T10MSUS "t10ms\010us"
#define TR_FREESTACKMINB "Free Stack min\004b" #define TR_FREESTACKMINB "Free Stack min\004b"
#define TR_MENUTORESET "[MENU] to reset" #define TR_MENUTORESET "[MENU] to reset"

4
src/translations/fr.h
View file

@ -218,7 +218,7 @@
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_RX "Rx:" #define TR_RX "Rx:"
#define TR_TX "Tx:" #define TR_TX "Tx:"
#define TR_SPDnMAX "Spd:\006Max:" #define TR_SPDnMAX "Spd:\010Max:"
#define TR_TEMP1nTEMP2 "T@1:\007T@2:" #define TR_TEMP1nTEMP2 "T@1:\007T@2:"
#define TR_RPMnFUEL "RPM:\006Fuel:" #define TR_RPMnFUEL "RPM:\006Fuel:"
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
@ -229,7 +229,7 @@
#define TR_TMR1LATMAXUS "tmr1Lat max\004us" #define TR_TMR1LATMAXUS "tmr1Lat max\004us"
#define TR_TMR1LATMINUS "tmr1Lat min\004us" #define TR_TMR1LATMINUS "tmr1Lat min\004us"
#define TR_TMR1JITTERUS "tmr1 Jitter\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_T10MSUS "t10ms\010us"
#define TR_FREESTACKMINB "Free Stack min\004b" #define TR_FREESTACKMINB "Free Stack min\004b"
#define TR_MENUTORESET "[MENU]pour reset" #define TR_MENUTORESET "[MENU]pour reset"