From 9a7861eaad22902d131c5d3ce5a4bf2d30731af7 Mon Sep 17 00:00:00 2001
From: "romolo.manfredini@gmail.com"
 <romolo.manfredini@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Tue, 27 Mar 2012 15:15:43 +0000
Subject: [PATCH] Support for different GPS coordinates

---
 src/general_menus.cpp | 9 ++++++++-
 src/o9xstrings.cpp    | 2 ++
 src/o9xstrings.h      | 5 ++++-
 src/translations/en.h | 3 +++
 src/translations/fr.h | 3 +++
 src/translations/se.h | 3 +++
 6 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/general_menus.cpp b/src/general_menus.cpp
index b730dbf4f..4a7204af4 100644
--- a/src/general_menus.cpp
+++ b/src/general_menus.cpp
@@ -111,7 +111,7 @@ void menuProcSetup(uint8_t event)
 #define SPLASH_ZEROS
 #endif
 #ifdef FRSKY
-#define FRSKY_ZEROS  0, 0,
+#define FRSKY_ZEROS  0, 0, 0,
 #else
 #define FRSKY_ZEROS
 #endif
@@ -327,6 +327,13 @@ void menuProcSetup(uint8_t event)
       CHECK_INCDEC_GENVAR(event, g_eeGeneral.timezone, -12, 12);
     if((y+=FH)>7*FH) return;
     }subN++;
+    
+  if(s_pgOfs<subN) {
+    lcd_putsLeft( y, STR_GPSCOORD);
+    lcd_putsiAtt(PARAM_OFS, y, STR_GPSFORMAT, g_eeGeneral.gpsFormat, (sub==subN ? INVERS:0));
+    if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.gpsFormat, 0, 1);
+    if((y+=FH)>7*FH) return;
+  }subN++;   
 #endif
 
   if(s_pgOfs<subN) {
diff --git a/src/o9xstrings.cpp b/src/o9xstrings.cpp
index 48add8102..bff949f26 100644
--- a/src/o9xstrings.cpp
+++ b/src/o9xstrings.cpp
@@ -66,6 +66,7 @@ const pm_char STR_OPEN9X[] PROGMEM =
     ISTR(VALARM)
     ISTR(VALARMFN)
     ISTR(VTELPROTO)
+    ISTR(GPSFORMAT)
 #endif
 #ifdef TEMPLATES
     ISTR(VTEMPLATES)
@@ -176,6 +177,7 @@ const pm_char STR_ALARMWARNING[] PROGMEM = TR_ALARMWARNING;
 #ifdef FRSKY
 const pm_char STR_NODATAALARM[] PROGMEM = TR_NODATAALARM;
 const pm_char STR_TIMEZONE[] PROGMEM = TR_TIMEZONE;
+const pm_char STR_GPSCOORD[] PROGMEM = TR_GPSCOORD;
 #endif
 const pm_char STR_RXCHANNELORD[] PROGMEM = TR_RXCHANNELORD;
 const pm_char STR_SLAVE[] PROGMEM = TR_SLAVE;
diff --git a/src/o9xstrings.h b/src/o9xstrings.h
index e2df762be..8bbaeeca8 100644
--- a/src/o9xstrings.h
+++ b/src/o9xstrings.h
@@ -83,7 +83,8 @@ extern const pm_char STR_OPEN9X[];
 #define OFS_VALARM     (OFS_VTELEMUNIT + sizeof(TR_VTELEMUNIT))
 #define OFS_VALARMFN   (OFS_VALARM + sizeof(TR_VALARM))
 #define OFS_VTELPROTO  (OFS_VALARMFN + sizeof(TR_VALARMFN))
-#define OFS_ENDTELEM   (OFS_VTELPROTO + sizeof(TR_VTELPROTO))
+#define OFS_GPSFORMAT   (OFS_VTELPROTO + sizeof(TR_VTELPROTO))
+#define OFS_ENDTELEM   (OFS_GPSFORMAT + sizeof(TR_GPSFORMAT))
 #else
 #define OFS_ENDTELEM   (OFS_VTELEMCHNS + sizeof(TR_VTELEMCHNS))
 #endif
@@ -146,6 +147,7 @@ extern const pm_char STR_OPEN9X[];
 #define STR_VALARM     (STR_OPEN9X + OFS_VALARM)
 #define STR_VALARMFN   (STR_OPEN9X + OFS_VALARMFN)
 #define STR_VTELPROTO  (STR_OPEN9X + OFS_VTELPROTO)
+#define STR_GPSFORMAT  (STR_OPEN9X + OFS_GPSFORMAT)
 #define STR_TELEMCHNS  (STR_OPEN9X + OFS_TELEMCHNS)
 #endif
 
@@ -257,6 +259,7 @@ extern const pm_char STR_MEMORYWARNING[];
 extern const pm_char STR_ALARMWARNING[];
 extern const pm_char STR_NODATAALARM[];
 extern const pm_char STR_TIMEZONE[];
+extern const pm_char STR_GPSCOORD[];
 extern const pm_char STR_RXCHANNELORD[];
 extern const pm_char STR_SLAVE[];
 extern const pm_char STR_MODESRC[];
diff --git a/src/translations/en.h b/src/translations/en.h
index b1e9d58f3..abf48a9b4 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -117,6 +117,9 @@
 #define TR_VTELPROTO     "NoneHub "
 #endif
 
+#define LEN_GPSFORMAT     "\004"
+#define TR_GPSFORMAT   "NMEAhms "
+
 #define LEN2_VTEMPLATES  13
 #define LEN_VTEMPLATES   "\015"
 #define TR_VTEMPLATES    "Clear Mixes\0\0""Simple 4-CH \0""T-Cut       \0""V-Tail      \0""Elevon\\Delta\0""eCCPM       \0""Heli Setup  \0""Servo Test  \0"
diff --git a/src/translations/fr.h b/src/translations/fr.h
index 160903521..4dc7ea090 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -117,6 +117,9 @@
 #define TR_VTELPROTO     "NoneHub "
 #endif
 
+#define LEN_GPSFORMAT     "\004"
+#define TR_GPSFORMAT   "NMEAhms "
+
 #define LEN2_VTEMPLATES  15
 #define LEN_VTEMPLATES   "\017"
 #define TR_VTEMPLATES    "Suppr Mixages\0\0""4 Voies simple\0""Coupure Gaz   \0""Empennage V   \0""Elevon\\Delta  \0""eCCPM         \0""Conf. Helico  \0""Servo Test    \0"
diff --git a/src/translations/se.h b/src/translations/se.h
index f754563d1..d9a0fe25b 100644
--- a/src/translations/se.h
+++ b/src/translations/se.h
@@ -117,6 +117,9 @@
 #define TR_VTELPROTO     "--- Hub "
 #endif
 
+#define LEN_GPSFORMAT     "\004"
+#define TR_GPSFORMAT   "NMEAhms "
+
 #define LEN2_VTEMPLATES  13
 #define LEN_VTEMPLATES   "\015"
 #define TR_VTEMPLATES    "Nolla Mixar\0\0""Enkel 4kanal\0""Gasklippning\0""V-Stj\201rt    \0""Deltavinge  \0""eCCPM       \0""Helikopter  \0""Servotest   \0"