From a38d92f64b5c403a6ce1d1e7293c27bba0eacefa Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sun, 16 Mar 2014 10:27:32 +0100
Subject: [PATCH] Adapt telemetry alarm settings for Taranis (Fixes #517)

---
 companion/src/modeledit/telemetry.cpp       | 30 ++++++++++++++++-----
 companion/src/modeledit/telemetry.ui        |  4 +--
 companion/src/modeledit/telemetry_analog.ui |  4 +--
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp
index e06fe96a3..675b9a2be 100644
--- a/companion/src/modeledit/telemetry.cpp
+++ b/companion/src/modeledit/telemetry.cpp
@@ -28,10 +28,20 @@ TelemetryAnalog::TelemetryAnalog(QWidget *parent, FrSkyChannelData & analog):
   update();
 
   ui->UnitCB->setCurrentIndex(analog.type);
-  ui->alarm1LevelCB->setCurrentIndex(analog.alarms[0].level);
-  ui->alarm1GreaterCB->setCurrentIndex(analog.alarms[0].greater);
-  ui->alarm2LevelCB->setCurrentIndex(analog.alarms[1].level);
-  ui->alarm2GreaterCB->setCurrentIndex(analog.alarms[1].greater);
+  if (!IS_TARANIS(GetEepromInterface()->getBoard())) {
+    ui->alarm1LevelCB->setCurrentIndex(analog.alarms[0].level);
+    ui->alarm1GreaterCB->setCurrentIndex(analog.alarms[0].greater);
+    ui->alarm2LevelCB->setCurrentIndex(analog.alarms[1].level);
+    ui->alarm2GreaterCB->setCurrentIndex(analog.alarms[1].greater);
+  }
+  else {
+    ui->alarm1LevelCB->hide();
+    ui->alarm2LevelCB->hide();
+    ui->alarm1GreaterCB->hide();
+    ui->alarm2GreaterCB->hide();
+    ui->alarm1Label->setText(tr("Low Alarm"));
+    ui->alarm2Label->setText(tr("Critical Alarm"));
+  }
 
   if (!(GetEepromInterface()->getCapability(Telemetry) & TM_HASOFFSET)) {
     ui->CalibSB->hide();
@@ -467,8 +477,16 @@ void TelemetryPanel::setup()
     }
     ui->rssiAlarm1SB->setValue(model.frsky.rssiAlarms[0].value);
     ui->rssiAlarm2SB->setValue(model.frsky.rssiAlarms[1].value);
-    ui->rssiAlarm1CB->setCurrentIndex(model.frsky.rssiAlarms[0].level);
-    ui->rssiAlarm2CB->setCurrentIndex(model.frsky.rssiAlarms[1].level);
+    if (!IS_TARANIS(GetEepromInterface()->getBoard())) {
+      ui->rssiAlarm1CB->setCurrentIndex(model.frsky.rssiAlarms[0].level);
+      ui->rssiAlarm2CB->setCurrentIndex(model.frsky.rssiAlarms[1].level);
+    }
+    else {
+      ui->rssiAlarm1CB->hide();
+      ui->rssiAlarm2CB->hide();
+      ui->rssiAlarm1Label->setText(tr("Low Alarm"));
+      ui->rssiAlarm2Label->setText(tr("Critical Alarm"));
+    }
 
     if (!GetEepromInterface()->getCapability(HasAltitudeSel)) {
       ui->AltitudeGPS_ChkB->hide();
diff --git a/companion/src/modeledit/telemetry.ui b/companion/src/modeledit/telemetry.ui
index 6a3a6d618..6034d2c4e 100644
--- a/companion/src/modeledit/telemetry.ui
+++ b/companion/src/modeledit/telemetry.ui
@@ -77,7 +77,7 @@
        </property>
        <layout class="QGridLayout" name="gridLayout_7">
         <item row="0" column="0">
-         <widget class="QLabel" name="label_927">
+         <widget class="QLabel" name="rssiAlarm1Label">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
@@ -157,7 +157,7 @@
          </widget>
         </item>
         <item row="1" column="0">
-         <widget class="QLabel" name="label_928">
+         <widget class="QLabel" name="rssiAlarm2Label">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
diff --git a/companion/src/modeledit/telemetry_analog.ui b/companion/src/modeledit/telemetry_analog.ui
index d8b713105..d09c7b421 100644
--- a/companion/src/modeledit/telemetry_analog.ui
+++ b/companion/src/modeledit/telemetry_analog.ui
@@ -43,7 +43,7 @@
       </widget>
      </item>
      <item row="2" column="0">
-      <widget class="QLabel" name="label_919">
+      <widget class="QLabel" name="alarm1Label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -106,7 +106,7 @@
       </widget>
      </item>
      <item row="3" column="0">
-      <widget class="QLabel" name="label_921">
+      <widget class="QLabel" name="alarm2Label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
          <horstretch>0</horstretch>