From 052252ae37a4982c533f99bef56a9bca77411932 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 16 Mar 2012 18:24:04 +0000
Subject: [PATCH] Bad alignement in the last Telemetry screen

---
 src/frsky.cpp         | 29 ++++++++++-------------------
 src/o9xstrings.cpp    |  6 ++++++
 src/o9xstrings.h      |  6 ++++++
 src/translations/en.h |  3 +++
 src/translations/fr.h |  3 +++
 src/translations/se.h |  3 +++
 6 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/frsky.cpp b/src/frsky.cpp
index d77e6a298..f67275054 100644
--- a/src/frsky.cpp
+++ b/src/frsky.cpp
@@ -966,9 +966,9 @@ void menuProcFrsky(uint8_t event)
 #ifdef FRSKY_HUB
     else if (s_frsky_view == e_frsky_after_flight) {
       // Latitude
-#define LAT_LINE (1*FH)
-      lcd_putsLeft( LAT_LINE, PSTR("Lat"));
-      lcd_outdezAtt(4*FW, LAT_LINE, frskyHubData.gpsLatitude_bp / 100, LEFT); // ddd before '.'
+#define LAT_LINE (1*FH+1)
+      lcd_putsLeft( LAT_LINE, STR_LATITUDE);
+      lcd_outdezAtt(10*FW, LAT_LINE, frskyHubData.gpsLatitude_bp / 100, LEFT); // ddd before '.'
       lcd_putc(lcd_lastPos, LAT_LINE, '@');
       uint8_t mn = frskyHubData.gpsLatitude_bp % 100;
       lcd_outdezNAtt(lcd_lastPos+FW, LAT_LINE, mn, LEFT|LEADING0, 2); // mm before '.'
@@ -977,9 +977,9 @@ void menuProcFrsky(uint8_t event)
       lcd_putc(lcd_lastPos+1, LAT_LINE, frskyHubData.gpsLatitudeNS ? frskyHubData.gpsLatitudeNS : '-');
 
       // Longitude
-#define LONG_LINE (2*FH)
-      lcd_putsLeft(LONG_LINE, PSTR("Lon"));
-      lcd_outdezAtt(5*FW, LONG_LINE, frskyHubData.gpsLongitude_bp / 100, LEFT); // ddd before '.'
+#define LONG_LINE (2*FH+2)
+      lcd_putsLeft(LONG_LINE, STR_LONGITUDE);
+      lcd_outdezAtt(10*FW, LONG_LINE, frskyHubData.gpsLongitude_bp / 100, LEFT); // ddd before '.'
       lcd_putc(lcd_lastPos, LONG_LINE, '@');
       mn = frskyHubData.gpsLongitude_bp % 100;
       lcd_outdezNAtt(lcd_lastPos+FW, LONG_LINE, mn, LEFT|LEADING0, 2); // mm before '.'
@@ -987,26 +987,17 @@ void menuProcFrsky(uint8_t event)
       lcd_outdezNAtt(lcd_lastPos+2, LONG_LINE, frskyHubData.gpsLongitude_ap, LEFT|UNSIGN|LEADING0, 4); // after '.'
       lcd_putc(lcd_lastPos+1, LONG_LINE, frskyHubData.gpsLongitudeEW ? frskyHubData.gpsLongitudeEW : '-');
 
-#define COURSE_LINE (3*FH)
-      // Course / Heading
-      lcd_putsLeft(COURSE_LINE, PSTR("Hdg"));
-      lcd_outdezNAtt(5*FW, COURSE_LINE, frskyHubData.gpsCourse_bp, LEFT|LEADING0, 3); // before '.'
-      lcd_plot(lcd_lastPos, COURSE_LINE+6, 0); // small decimal point
-      lcd_outdezAtt(lcd_lastPos+2, COURSE_LINE, frskyHubData.gpsCourse_ap, LEFT); // after '.'
-      lcd_putc(lcd_lastPos, COURSE_LINE, '@');
-
-#define RSSI_LINE (4*FH)
       // Rssi
-      lcd_putsLeft(RSSI_LINE, PSTR("Rssi"));
-      lcd_puts(5*FW, RSSI_LINE, STR_TX);
+#define RSSI_LINE (3*FH+3)
+      lcd_putsLeft(RSSI_LINE, STR_MINRSSI);
+      lcd_puts(10*FW, RSSI_LINE, STR_TX);
       lcd_outdezNAtt(lcd_lastPos, RSSI_LINE, frskyRSSI[1].min, LEFT|LEADING0, 2);
-      lcd_puts(10*FW, RSSI_LINE, STR_RX);
+      lcd_puts(16*FW, RSSI_LINE, STR_RX);
       lcd_outdezNAtt(lcd_lastPos, RSSI_LINE, frskyRSSI[0].min, LEFT|LEADING0, 2);
 
       displayGpsTime();
     }
 #endif
-
   }
   else {
     lcd_putsAtt(22, 40, STR_NODATA, DBLSIZE);
diff --git a/src/o9xstrings.cpp b/src/o9xstrings.cpp
index 7592d1dce..9b67a40a3 100644
--- a/src/o9xstrings.cpp
+++ b/src/o9xstrings.cpp
@@ -282,6 +282,12 @@ const pm_char STR_MINLIMIT[] PROGMEM = TR_MINLIMIT;
 const pm_char STR_MAXLIMIT[] PROGMEM = TR_MAXLIMIT;
 #endif
 
+#if defined(FRSKY_HUB)
+const pm_char STR_MINRSSI[] PROGMEM = TR_MINRSSI;
+const pm_char STR_LATITUDE[] PROGMEM = TR_LATITUDE;
+const pm_char STR_LONGITUDE[] PROGMEM = TR_LONGITUDE;
+#endif
+
 const pm_uchar font[] PROGMEM = {
 #include "font.lbm"
 #ifdef TRANSLATIONS_SE
diff --git a/src/o9xstrings.h b/src/o9xstrings.h
index 116d35ff1..0f6b10438 100644
--- a/src/o9xstrings.h
+++ b/src/o9xstrings.h
@@ -341,5 +341,11 @@ extern const pm_char STR_MINLIMIT[];
 extern const pm_char STR_MAXLIMIT[];
 #endif
 
+#ifdef FRSKY_HUB
+extern const pm_char STR_MINRSSI[];
+extern const pm_char STR_LATITUDE[];
+extern const pm_char STR_LONGITUDE[];
+#endif
+
 extern const pm_uchar font[];
 extern const pm_uchar font_dblsize[];
diff --git a/src/translations/en.h b/src/translations/en.h
index e3d02eeb2..231f88cd1 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -318,3 +318,6 @@
 #define TR_BACK          "Back"
 #define TR_MINLIMIT      "Min Limit"
 #define TR_MAXLIMIT      "Max Limit"
+#define TR_MINRSSI       "Min Rssi"
+#define TR_LATITUDE      "Latitude"
+#define TR_LONGITUDE     "Longitude"
diff --git a/src/translations/fr.h b/src/translations/fr.h
index f5bda6b1b..2cc5c9045 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -318,3 +318,6 @@
 #define TR_BACK          "Back"
 #define TR_MINLIMIT      "Min Limit"
 #define TR_MAXLIMIT      "Max Limit"
+#define TR_MINRSSI       "Min Rssi"
+#define TR_LATITUDE      "Latitude"
+#define TR_LONGITUDE     "Longitude"
diff --git a/src/translations/se.h b/src/translations/se.h
index 641394e77..1078b6e74 100644
--- a/src/translations/se.h
+++ b/src/translations/se.h
@@ -318,3 +318,6 @@
 #define TR_BACK          "EXIT"
 #define TR_MINLIMIT      "Mininiv\200"
 #define TR_MAXLIMIT      "Maxiniv\200"
+#define TR_MINRSSI       "Min Rssi"
+#define TR_LATITUDE      "Latitude"
+#define TR_LONGITUDE     "Longitude"