From 9e1139c4e3b4c736cbc9ceac3eb32b985806ae47 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Tue, 21 Jan 2014 21:36:43 +0100
Subject: [PATCH] 'next' EEPROM support continued. Altitude in Top Bar

---
 companion/src/firmwares/opentx/opentxeeprom.cpp |  3 +--
 companion/src/modeledit/telemetry.cpp           | 14 ++++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 5a7fc5312..892dcdd01 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -1688,8 +1688,7 @@ class FrskyField: public StructField {
         Append(new UnsignedField<8>(frsky.usrProto));
         if (version >= 216) {
           Append(new UnsignedField<7>(frsky.voltsSource));
-          // TODO altitude displayed
-          Append(new SpareBitsField<1>());
+          Append(new BoolField<1>(frsky.altitudeDisplayed));
         }
         else {
           Append(new UnsignedField<8>(frsky.voltsSource));
diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp
index 3a2c63660..5a429b8b1 100644
--- a/companion/src/modeledit/telemetry.cpp
+++ b/companion/src/modeledit/telemetry.cpp
@@ -371,16 +371,19 @@ void TelemetryPanel::setup()
 
     if (!GetEepromInterface()->getCapability(HasAltitudeSel)) {
       ui->AltitudeGPS_ChkB->hide();
-    } else {
+    }
+    else {
       ui->AltitudeGPS_ChkB->setChecked(model.frsky.FrSkyGpsAlt);
     }
-    int varioCap=GetEepromInterface()->getCapability(HasVario);
-  //  if (IS_TARANIS(GetEepromInterface()->getBoard())) {
-    if (false) {
+
+    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
       ui->AltitudeToolbar_ChkB->setChecked(model.frsky.altitudeDisplayed);
-    } else {
+    }
+    else {
       ui->AltitudeToolbar_ChkB->hide();
     }
+
+    int varioCap = GetEepromInterface()->getCapability(HasVario);
     if (!varioCap) {
       ui->varioLimitMax_DSB->hide();
       ui->varioLimitMinOff_ChkB->hide();
@@ -649,7 +652,6 @@ void TelemetryPanel::on_AltitudeGPS_ChkB_toggled(bool checked)
     if (lock) return;
     model.frsky.FrSkyGpsAlt = checked;
     emit modified();
-    //AltitudeGPS_CB
 }
 
 void TelemetryPanel::on_AltitudeToolbar_ChkB_toggled(bool checked)