RxBatt now configurable in Companion

companion/src/eeprominterface.cpp

@@ -991,6 +991,7 @@ void FrSkyData::clear()
   memset(this, 0, sizeof(FrSkyData));
   rssiAlarms[0].clear(2, 45);
   rssiAlarms[1].clear(3, 42);
+  rxBattAlarms[1] = round(4.3/0.05);
   varioSource = 2/*VARIO*/;
   blades = 2;
 }

companion/src/eeprominterface.h

@@ -1105,7 +1105,6 @@ enum Capability {
  DSM2Indexes,
  Telemetry,
  TelemetryUnits,
- TelemetryBlades,
  TelemetryBars,
  Gvars,
  GvarsInCS,
@@ -1115,7 +1114,6 @@ enum Capability {
  NoTelemetryProtocol,
  TelemetryCustomScreens,
  TelemetryCustomScreensFieldsPerLine,
- TelemetryRSSIModel,
  TelemetryTimeshift,
  TelemetryMaxMultiplier,
  HasAltitudeSel,

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -610,10 +610,6 @@ int OpenTxFirmware::getCapability(const Capability capability)
       return IS_TARANIS(board) ? 1 : 0;
     case TelemetryUnits:
       return 0;
-    case TelemetryBlades:
-      return 1;
-    case TelemetryRSSIModel:
-      return 1;
     case TelemetryTimeshift:
       return 1;
     case TelemetryMaxMultiplier:

companion/src/modeledit/telemetry.cpp

@@ -520,12 +520,22 @@ void TelemetryPanel::setup()
 {
     QString firmware_id = g.profile[g.id()].fwType();
 
-    lock=true;
+    lock = true;
 
-    //frsky Settings
+    if (IS_ARM(firmware->getBoard())) {
-    if (!firmware->getCapability(TelemetryRSSIModel) ) {
+      ui->rxbattAlarm1DSB->setValue(0.05*model.frsky.rxBattAlarms[0]);
-      ui->RSSIGB->hide();
+      ui->rxbattAlarm2DSB->setValue(0.05*model.frsky.rxBattAlarms[1]);
     }
+    else {
+      ui->rxbattLabel->hide();
+      ui->rxbattAlarm1Label->hide();
+      ui->rxbattAlarm2Label->hide();
+      ui->rxbattAlarm1CB->hide();
+      ui->rxbattAlarm2CB->hide();
+      ui->rxbattAlarm1DSB->hide();
+      ui->rxbattAlarm2DSB->hide();
+    }
+
     ui->rssiAlarm1SB->setValue(model.frsky.rssiAlarms[0].value);
     ui->rssiAlarm2SB->setValue(model.frsky.rssiAlarms[1].value);
     if (!IS_TARANIS(GetEepromInterface()->getBoard())) {
@@ -546,7 +556,7 @@ void TelemetryPanel::setup()
       ui->AltitudeGPS_ChkB->setChecked(model.frsky.FrSkyGpsAlt);
     }
     
-    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+    if (IS_TARANIS(firmware->getBoard())) {
       ui->AltitudeToolbar_ChkB->setChecked(model.frsky.altitudeDisplayed);
     }
     else {
@@ -764,6 +774,18 @@ void TelemetryPanel::on_varioLimitMin_DSB_editingFinished()
   emit modified();
 }
 
+void TelemetryPanel::on_rxbattAlarm1DSB_editingFinished()
+{
+  model.frsky.rxBattAlarms[0] = round(ui->rxbattAlarm1DSB->value()/0.05);
+  emit modified();
+}
+
+void TelemetryPanel::on_rxbattAlarm2DSB_editingFinished()
+{
+  model.frsky.rxBattAlarms[1] = round(ui->rxbattAlarm2DSB->value()/0.05);
+  emit modified();
+}
+
 void TelemetryPanel::on_varioLimitMax_DSB_editingFinished()
 {
   model.frsky.varioMax = round(ui->varioLimitMax_DSB->value()-10);

companion/src/modeledit/telemetry.h

@@ -92,6 +92,8 @@ class TelemetryPanel : public ModelPanel
     void on_rssiAlarm2CB_currentIndexChanged(int index);
     void on_rssiAlarm1SB_editingFinished();
     void on_rssiAlarm2SB_editingFinished();
+    void on_rxbattAlarm1DSB_editingFinished();
+    void on_rxbattAlarm2DSB_editingFinished();
     void on_AltitudeGPS_ChkB_toggled(bool checked);
     void on_varioSourceCB_currentIndexChanged(int index);
     void on_varioLimitMin_DSB_editingFinished();

companion/src/modeledit/telemetry.ui

@@ -418,18 +418,77 @@
         <property name="bottomMargin">
          <number>3</number>
         </property>
-        <item row="3" column="1">
+        <item row="5" column="0">
-         <spacer name="verticalSpacer_16">
+         <widget class="QLabel" name="rxbattAlarm2Label">
-          <property name="orientation">
+          <property name="sizePolicy">
-           <enum>Qt::Vertical</enum>
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
           </property>
-          <property name="sizeHint" stdset="0">
+          <property name="minimumSize">
            <size>
-            <width>20</width>
+            <width>0</width>
             <height>0</height>
            </size>
           </property>
-         </spacer>
+          <property name="text">
+           <string>Alarm 2</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="rxbattAlarm1Label">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"/>
+          </property>
+          <property name="text">
+           <string>Alarm 1</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="rxbattLabel">
+          <property name="font">
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>RxBatt</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="1">
+         <widget class="QComboBox" name="rxbattAlarm2CB">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <item>
+           <property name="text">
+            <string>Red</string>
+           </property>
+          </item>
+         </widget>
         </item>
         <item row="1" column="0">
          <widget class="QLabel" name="rssiAlarm1Label">
@@ -589,7 +648,7 @@
          </widget>
         </item>
         <item row="0" column="0">
-         <widget class="QLabel" name="label_5">
+         <widget class="QLabel" name="rssiLabel">
           <property name="font">
            <font>
             <weight>75</weight>
@@ -601,6 +660,87 @@
           </property>
          </widget>
         </item>
+        <item row="4" column="1">
+         <widget class="QComboBox" name="rxbattAlarm1CB">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <item>
+           <property name="text">
+            <string>Orange</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="6" column="0">
+         <spacer name="verticalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="5" column="2">
+         <widget class="QDoubleSpinBox" name="rxbattAlarm2DSB">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="decimals">
+           <number>2</number>
+          </property>
+          <property name="minimum">
+           <double>0.000000000000000</double>
+          </property>
+          <property name="maximum">
+           <double>13.199999999999999</double>
+          </property>
+          <property name="singleStep">
+           <double>0.050000000000000</double>
+          </property>
+          <property name="value">
+           <double>4.300000000000000</double>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="2">
+         <widget class="QDoubleSpinBox" name="rxbattAlarm1DSB">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="decimals">
+           <number>2</number>
+          </property>
+          <property name="minimum">
+           <double>0.000000000000000</double>
+          </property>
+          <property name="maximum">
+           <double>13.199999999999999</double>
+          </property>
+          <property name="singleStep">
+           <double>0.050000000000000</double>
+          </property>
+          <property name="value">
+           <double>4.300000000000000</double>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -930,7 +1070,7 @@
          <number>0</number>
         </property>
         <item row="0" column="0">
-         <layout class="QGridLayout" name="gridLayout" rowstretch="0,0">
+         <layout class="QGridLayout" name="gridLayout" rowstretch="0,1">
           <property name="horizontalSpacing">
            <number>3</number>
           </property>
@@ -1039,6 +1179,19 @@
           </item>
          </layout>
         </item>
+        <item row="1" column="0">
+         <spacer name="verticalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </widget>
      </item>