Fixes #2476

companion/src/eeprominterface.h

@@ -769,6 +769,7 @@ class FrSkyData {
     FrSkyScreenData screens[4];
     FrSkyRSSIAlarm rssiAlarms[2];
     unsigned int varioSource;
+    bool varioCenterSilent;
     int varioMin;
     int varioCenterMin;    // if increment in 0.2m/s = 3.0m/s max
     int varioCenterMax;

companion/src/firmwares/opentx/opentxeeprom.cpp

@@ -2708,7 +2708,13 @@ class FrskyField: public StructField {
           }
         }
 
-        Append(new ConversionField< UnsignedField<8> >(frsky.varioSource, &telemetryVarioSourceConversionTable, "Vario Source"));
+        if (version >= 217) {
+          Append(new UnsignedField<7>(frsky.varioSource, "Vario Source"));
+          Append(new BoolField<1>(frsky.varioCenterSilent));
+        }
+        else {
+          Append(new ConversionField< UnsignedField<8> >(frsky.varioSource, &telemetryVarioSourceConversionTable, "Vario Source"));
+        }
         Append(new SignedField<8>(frsky.varioCenterMax));
         Append(new SignedField<8>(frsky.varioCenterMin));
         Append(new SignedField<8>(frsky.varioMin));

companion/src/modeledit/telemetry.cpp

@@ -697,6 +697,8 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
   if (IS_TARANIS(firmware->getBoard())) {
     ui->voltsSource->setField(model.frsky.voltsSource);
     ui->altitudeSource->setField(model.frsky.altitudeSource);
+    ui->varioSource->setField(model.frsky.varioSource);
+    ui->varioCenterSilent->setField(model.frsky.varioCenterSilent);
   }
   else {
     ui->topbarGB->hide();
@@ -731,6 +733,7 @@ void TelemetryPanel::update()
 
     populateTelemetrySourcesComboBox(ui->voltsSource, model, false);
     populateTelemetrySourcesComboBox(ui->altitudeSource, model, false);
+    populateTelemetrySourcesComboBox(ui->varioSource, model, false);
   }
 
   if (IS_ARM(firmware->getBoard())) {
@@ -794,7 +797,7 @@ void TelemetryPanel::setup()
       ui->VarioLabel_2->hide();
       ui->VarioLabel_3->hide();
       ui->VarioLabel_4->hide();
-      ui->varioSourceCB->hide();
+      ui->varioSource->hide();
       ui->varioSource_label->hide();
     }
     else {
@@ -860,18 +863,13 @@ void TelemetryPanel::setup()
 
 void TelemetryPanel::populateVarioSource()
 {
-  AutoComboBox * cb = ui->varioSourceCB;
+  AutoComboBox * cb = ui->varioSource;
   cb->setField(model->frsky.varioSource, this);
-  if (!IS_TARANIS(firmware->getBoard())) {
-    cb->addItem(tr("Alti"), TELEMETRY_VARIO_SOURCE_ALTI);
-    cb->addItem(tr("Alti+"), TELEMETRY_VARIO_SOURCE_ALTI_PLUS);
-  }
+  cb->addItem(tr("Alti"), TELEMETRY_VARIO_SOURCE_ALTI);
+  cb->addItem(tr("Alti+"), TELEMETRY_VARIO_SOURCE_ALTI_PLUS);
   cb->addItem(tr("VSpeed"), TELEMETRY_VARIO_SOURCE_VSPEED);
   cb->addItem(tr("A1"), TELEMETRY_VARIO_SOURCE_A1);
   cb->addItem(tr("A2"), TELEMETRY_VARIO_SOURCE_A2);
-  if (IS_TARANIS(firmware->getBoard())) {
-    cb->addItem(tr("dTE"), TELEMETRY_VARIO_SOURCE_DTE);
-  }
 }
 
 void TelemetryPanel::populateVoltsSource()

companion/src/modeledit/telemetry.ui

@@ -329,7 +329,7 @@
        <number>6</number>
       </property>
       <item row="2" column="1">
-       <layout class="QGridLayout" name="gridLayout_66" columnstretch="1,0,0,0">
+       <layout class="QGridLayout" name="gridLayout_66" columnstretch="1,1,1,1,1">
         <item row="0" column="0">
          <widget class="QLabel" name="VarioLabel_1">
           <property name="sizePolicy">
@@ -488,6 +488,32 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="4">
+         <widget class="QLabel" name="VarioLabel_6">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Center Silent</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="4">
+         <widget class="AutoCheckBox" name="varioCenterSilent">
+          <property name="layoutDirection">
+           <enum>Qt::LeftToRight</enum>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
       <item row="2" column="0">
@@ -511,7 +537,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="AutoComboBox" name="varioSourceCB">
+       <widget class="AutoComboBox" name="varioSource">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -920,6 +946,11 @@
    <extends>QComboBox</extends>
    <header>autocombobox.h</header>
   </customwidget>
+  <customwidget>
+   <class>AutoCheckBox</class>
+   <extends>QCheckBox</extends>
+   <header>autocheckbox.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>telemetryProtocol</tabstop>
@@ -927,7 +958,7 @@
   <tabstop>rssiAlarm1SB</tabstop>
   <tabstop>rssiAlarm2CB</tabstop>
   <tabstop>rssiAlarm2SB</tabstop>
-  <tabstop>varioSourceCB</tabstop>
+  <tabstop>varioSource</tabstop>
   <tabstop>varioLimitMin_DSB</tabstop>
   <tabstop>varioLimitCenterMin_DSB</tabstop>
   <tabstop>varioLimitCenterMax_DSB</tabstop>