From 0b356b18866f0e90c89531cd009c10b8d3b6ccee Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Tue, 8 May 2012 21:58:24 +0000
Subject: [PATCH] Vario flash saving (8bytes) A1 and A2 values displayed in
 TELEMETRY menu (to avoid switching screen for calibration)

---
 src/frsky.cpp       | 6 +++---
 src/model_menus.cpp | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/frsky.cpp b/src/frsky.cpp
index e900c0109..01785a6ed 100644
--- a/src/frsky.cpp
+++ b/src/frsky.cpp
@@ -648,7 +648,7 @@ void check_frsky()
 #if defined(AUDIO)
     int16_t varioSpeedUpMin = (g_model.varioSpeedUpMin - VARIO_SPEED_LIMIT_UP_CENTER)*VARIO_SPEED_LIMIT_MUL;
     int16_t varioSpeedDownMin = (VARIO_SPEED_LIMIT_DOWN_OFF - g_model.varioSpeedDownMin)*(-VARIO_SPEED_LIMIT_MUL);
-    int16_t verticalSpeed = limit((int16_t)(-VARIO_SPEED_LIMIT*100), (int16_t)frskyHubData.varioSpeed, (int16_t)(+VARIO_SPEED_LIMIT*100));
+    int16_t verticalSpeed = limit((int16_t)(-VARIO_SPEED_LIMIT*100), frskyHubData.varioSpeed, (int16_t)(+VARIO_SPEED_LIMIT*100));
 
     uint8_t SoundAltBeepNextFreq = 0;
     uint8_t SoundAltBeepNextTime = 0;
@@ -660,12 +660,12 @@ void check_frsky()
     }
     else {
       if((varioSpeedUpMin < 0) & (verticalSpeed >= varioSpeedUpMin)){
-        verticalSpeed = verticalSpeed - varioSpeedUpMin;
+        verticalSpeed -= varioSpeedUpMin;
       }		  
       SoundAltBeepNextFreq = (verticalSpeed * 10 + 16000) >> 8;
       SoundAltBeepNextTime = (1600 - verticalSpeed) / 100;
       if (verticalSpeed > 0) {
-        if ((int16_t)(g_tmr10ms - s_varioTmr) > (int16_t)((int16_t)SoundAltBeepTime*2)) {
+        if ((uint16_t)(g_tmr10ms - s_varioTmr) > (uint16_t)SoundAltBeepTime*2) {
           s_varioTmr = g_tmr10ms;
           SoundAltBeepTime = SoundAltBeepNextTime;
           SoundAltBeepFreq = SoundAltBeepNextFreq;
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index a12d41622..c66cb8e2b 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -2212,6 +2212,7 @@ void menuProcTelemetry(uint8_t event)
       case ITEM_TELEMETRY_A2_LABEL:
         lcd_putsLeft(y, STR_ACHANNEL);
         lcd_outdezAtt(2*FW, y, ch+1, 0);
+        putsTelemetryChannel(TELEM_COL2+6*FW, y, ch+MAX_TIMERS, frskyTelemetry[ch].value, LEFT);
         break;
 
       case ITEM_TELEMETRY_A1_RANGE: