diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 3ea84d1d8..86c17f319 100644
--- a/companion/src/eeprominterface.cpp
+++ b/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;
}
diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 2850b3ff4..7b2aa8e76 100644
--- a/companion/src/eeprominterface.h
+++ b/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,
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 2847f76a4..7e72ed3fa 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/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:
diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp
index 9b32d0dcd..2c7e1c927 100644
--- a/companion/src/modeledit/telemetry.cpp
+++ b/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 (!firmware->getCapability(TelemetryRSSIModel) ) {
- ui->RSSIGB->hide();
+ if (IS_ARM(firmware->getBoard())) {
+ ui->rxbattAlarm1DSB->setValue(0.05*model.frsky.rxBattAlarms[0]);
+ 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);
diff --git a/companion/src/modeledit/telemetry.h b/companion/src/modeledit/telemetry.h
index 8c381bf99..2c1a0f833 100644
--- a/companion/src/modeledit/telemetry.h
+++ b/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();
diff --git a/companion/src/modeledit/telemetry.ui b/companion/src/modeledit/telemetry.ui
index a4a4b8a97..034f6c682 100644
--- a/companion/src/modeledit/telemetry.ui
+++ b/companion/src/modeledit/telemetry.ui
@@ -418,18 +418,77 @@
3
- -
-
-
- Qt::Vertical
+
-
+
+
+
+ 0
+ 0
+
-
+
- 20
+ 0
0
-
+
+ Alarm 2
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ Alarm 1
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ RxBatt
+
+
+
+ -
+
+
+ false
+
+
+
+ 0
+ 0
+
+
+
-
+
+ Red
+
+
+
-
@@ -589,7 +648,7 @@
-
-
+
75
@@ -601,6 +660,87 @@
+ -
+
+
+ false
+
+
+
+ 0
+ 0
+
+
+
-
+
+ Orange
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 0
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 2
+
+
+ 0.000000000000000
+
+
+ 13.199999999999999
+
+
+ 0.050000000000000
+
+
+ 4.300000000000000
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 2
+
+
+ 0.000000000000000
+
+
+ 13.199999999999999
+
+
+ 0.050000000000000
+
+
+ 4.300000000000000
+
+
+
@@ -930,7 +1070,7 @@
0
-
-
+
3
@@ -1039,6 +1179,19 @@
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+