From 9d600f6119d7a369265c1f618d4beadcbdf1da3d Mon Sep 17 00:00:00 2001
From: "bsongis@gmail.com"
 <bsongis@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 26 Jul 2013 19:13:46 +0000
Subject: [PATCH] [Taranis] Vario source choice removed

---
 src/gui/menu_model.cpp | 14 ++++++++++++--
 src/lcd.cpp            |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/gui/menu_model.cpp b/src/gui/menu_model.cpp
index 824c778bd..d1fb67141 100644
--- a/src/gui/menu_model.cpp
+++ b/src/gui/menu_model.cpp
@@ -4560,7 +4560,9 @@ enum menuModelTelemetryItems {
   ITEM_TELEMETRY_USR_VOLTAGE_SOURCE,
   ITEM_TELEMETRY_USR_CURRENT_SOURCE,
   IF_VARIO(ITEM_TELEMETRY_VARIO_LABEL)
-  IF_VARIO(ITEM_TELEMETRY_VARIO_SOURCE)
+#if defined(VARIO) && !defined(FRSKY_SPORT)
+  ITEM_TELEMETRY_VARIO_SOURCE,
+#endif
   IF_VARIO(ITEM_TELEMETRY_VARIO_RANGE)
   ITEM_TELEMETRY_SCREEN_LABEL1,
   ITEM_TELEMETRY_SCREEN_LINE1,
@@ -4590,6 +4592,12 @@ enum menuModelTelemetryItems {
   #define USRDATA_LINES
 #endif
 
+#if defined(VARIO) && !defined(FRSKY_SPORT)
+  #define VARIO_SOURCE_ROWS 0,
+#else
+  #define VARIO_SOURCE_ROWS
+#endif
+
 #if defined(FRSKY)
 #if LCD_W >= 212
   #define TELEM_COL1        (1*FW)
@@ -4632,7 +4640,7 @@ enum menuModelTelemetryItems {
 
 void menuModelTelemetry(uint8_t event)
 {
-  MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, CHANNEL_ROWS CHANNEL_ROWS RSSI_ROWS USRDATA_LINES 0, 0, IF_VARIO((uint8_t)-1) IF_VARIO(0) IF_VARIO(VARIO_RANGE_ROWS) SCREEN_TYPE_ROWS, 2, 2, 2, 2, SCREEN_TYPE_ROWS, 2, 2, 2, 2, IF_CPUARM(SCREEN_TYPE_ROWS) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) });
+  MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, CHANNEL_ROWS CHANNEL_ROWS RSSI_ROWS USRDATA_LINES 0, 0, IF_VARIO((uint8_t)-1) VARIO_SOURCE_ROWS IF_VARIO(VARIO_RANGE_ROWS) SCREEN_TYPE_ROWS, 2, 2, 2, 2, SCREEN_TYPE_ROWS, 2, 2, 2, 2, IF_CPUARM(SCREEN_TYPE_ROWS) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) });
 
   uint8_t sub = m_posVert - 1;
 
@@ -4808,11 +4816,13 @@ void menuModelTelemetry(uint8_t event)
         lcd_putsLeft(y, STR_VARIO);
         break;
 
+#if !defined(FRSKY_SPORT)
       case ITEM_TELEMETRY_VARIO_SOURCE:
         lcd_putsLeft(y, STR_SOURCE);
         lcd_putsiAtt(TELEM_COL2, y, STR_VARIOSRC, g_model.frsky.varioSource, attr);
         if (attr) CHECK_INCDEC_MODELVAR(event, g_model.frsky.varioSource, VARIO_SOURCE_FIRST, VARIO_SOURCE_LAST);
         break;
+#endif
 
       case ITEM_TELEMETRY_VARIO_RANGE:
         lcd_putsLeft(y, STR_LIMIT);
diff --git a/src/lcd.cpp b/src/lcd.cpp
index 637835de7..e6c9fc751 100644
--- a/src/lcd.cpp
+++ b/src/lcd.cpp
@@ -937,7 +937,7 @@ void putsCurve(xcoord_t x, uint8_t y, int8_t idx, LcdFlags att)
 {
   if (idx < 0) {
     lcd_putcAtt(x-1*FW, y, '!', att);
-    idx = -idx + 6;
+    idx = -idx+CURVE_BASE-1;
   }
   if (idx < CURVE_BASE)
     lcd_putsiAtt(x, y, STR_VCURVEFUNC, idx, att);