From 124db1cc7facf7213678bc5b6cbbd7876a9503fc Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 27 Apr 2012 16:05:04 +0000
Subject: [PATCH] No more vario on GPS. Too poor precision. Too poor update
 frequency. It cannot work.

---
 src/frsky.cpp         | 5 +----
 src/myeeprom.h        | 1 -
 src/translations/en.h | 2 +-
 src/translations/fr.h | 2 +-
 src/translations/se.h | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/frsky.cpp b/src/frsky.cpp
index 700bf6f42..8bc9e3869 100644
--- a/src/frsky.cpp
+++ b/src/frsky.cpp
@@ -167,7 +167,7 @@ int16_t applyChannelRatio(uint8_t channel, int16_t val)
   return ((int32_t)val+g_model.frsky.channels[channel].offset) * (g_model.frsky.channels[channel].ratio << g_model.frsky.channels[channel].multiplier) * 2 / 51;
 }
 
-void evalVario(int16_t altitude_bp, uint8_t altitude_ap)
+inline void evalVario(int16_t altitude_bp, uint8_t altitude_ap)
 {
    int16_t varioAltitude_cm = altitude_bp * 100 + (altitude_bp > 0 ? altitude_ap : -altitude_ap);
    
@@ -293,9 +293,6 @@ void parseTelemHubByte(uint8_t byte)
       else if (frskyHubData.gpsDistNeeded || g_menuStack[0] == menuProcFrsky) {
         getGpsDistance();
       }
-      if (g_model.varioSource == VARIO_SOURCE_GPS) {
-        evalVario(frskyHubData.gpsAltitude_bp, frskyHubData.gpsAltitude_ap);
-      }
       break;
 
     case offsetof(FrskyHubData, gpsSpeed_bp):
diff --git a/src/myeeprom.h b/src/myeeprom.h
index bd297b6fc..6a2933de5 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -377,7 +377,6 @@ enum TelemetrySource {
 enum VarioSource {
   VARIO_SOURCE_NONE = 0,
   VARIO_SOURCE_BARO,
-  VARIO_SOURCE_GPS,
   VARIO_SOURCE_A1,
   VARIO_SOURCE_A2,
   VARIO_SOURCE_LAST
diff --git a/src/translations/en.h b/src/translations/en.h
index dd7e1ae82..259fab5ad 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -144,7 +144,7 @@
 #endif
 
 #define LEN_VARIOSRC     "\004"
-#define TR_VARIOSRC      "None""Baro""GPS ""A1  ""A2  "
+#define TR_VARIOSRC      "None""Baro""A1  ""A2  "
 
 #define LEN_GPSFORMAT    "\004"
 #define TR_GPSFORMAT     "HMS NMEA"
diff --git a/src/translations/fr.h b/src/translations/fr.h
index 256695bf1..9a9ce1a34 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -144,7 +144,7 @@
 #endif
 
 #define LEN_VARIOSRC     "\004"
-#define TR_VARIOSRC      "None""Baro""GPS ""A1  ""A2  "
+#define TR_VARIOSRC      "None""Baro""A1  ""A2  "
 
 #define LEN_GPSFORMAT    "\004"
 #define TR_GPSFORMAT     "HMS NMEA"
diff --git a/src/translations/se.h b/src/translations/se.h
index 12bdf1f11..64d4dc15a 100644
--- a/src/translations/se.h
+++ b/src/translations/se.h
@@ -144,7 +144,7 @@
 #endif
 
 #define LEN_VARIOSRC     "\004"
-#define TR_VARIOSRC      "None""Baro""GPS ""A1  ""A2  "
+#define TR_VARIOSRC      "None""Baro""A1  ""A2  "
 
 #define LEN_GPSFORMAT    "\004"
 #define TR_GPSFORMAT     "HMS NMEA"