diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp index 7b535d6d9..d3259600f 100644 --- a/companion/src/modeledit/telemetry.cpp +++ b/companion/src/modeledit/telemetry.cpp @@ -586,7 +586,6 @@ void TelemetryPanel::setup() int varioCap = firmware->getCapability(HasVario); if (!varioCap) { ui->varioLimitMax_DSB->hide(); - ui->varioLimitMinOff_ChkB->hide(); ui->varioLimitMin_DSB->hide(); ui->varioLimitCenterMin_DSB->hide(); ui->varioLimitCenterMax_DSB->hide(); @@ -600,7 +599,6 @@ void TelemetryPanel::setup() } else { if (!firmware->getCapability(HasVarioSink)) { - ui->varioLimitMinOff_ChkB->hide(); ui->varioLimitMin_DSB->hide(); ui->varioLimitCenterMin_DSB->hide(); ui->VarioLabel_1->hide(); @@ -609,15 +607,7 @@ void TelemetryPanel::setup() ui->varioLimitMin_DSB->setValue(model->frsky.varioMin-10); ui->varioLimitMax_DSB->setValue(model->frsky.varioMax+10); ui->varioLimitCenterMax_DSB->setValue((model->frsky.varioCenterMax/10.0)+0.5); - if (model->frsky.varioCenterMin==-16) { - ui->varioLimitMinOff_ChkB->setChecked(true); - ui->varioLimitCenterMin_DSB->setValue(-2.0); - ui->varioLimitCenterMin_DSB->setDisabled(true); - } - else { - ui->varioLimitMinOff_ChkB->setChecked(false); - ui->varioLimitCenterMin_DSB->setValue((model->frsky.varioCenterMin/10.0)-0.5); - } + ui->varioLimitCenterMin_DSB->setValue((model->frsky.varioCenterMin/10.0)-0.5); } ui->altimetryGB->setVisible(firmware->getCapability(HasAltitudeSel) || firmware->getCapability(HasVario)), @@ -794,24 +784,6 @@ void TelemetryPanel::on_varioLimitCenterMin_DSB_editingFinished() } } -void TelemetryPanel::on_varioLimitMinOff_ChkB_toggled(bool checked) -{ - if (!lock) { - model->frsky.varioCenterMin = -16; - if (!checked) { - lock=true; - ui->varioLimitCenterMin_DSB->setValue(-2.0); - ui->varioLimitCenterMin_DSB->setEnabled(true); - lock=false; - } - else { - ui->varioLimitCenterMin_DSB->setValue(-2.0); - ui->varioLimitCenterMin_DSB->setDisabled(true); - } - emit modified(); - } -} - void TelemetryPanel::on_varioLimitCenterMax_DSB_editingFinished() { if (!lock) { diff --git a/companion/src/modeledit/telemetry.h b/companion/src/modeledit/telemetry.h index 68c1d8841..6cdd85535 100644 --- a/companion/src/modeledit/telemetry.h +++ b/companion/src/modeledit/telemetry.h @@ -97,7 +97,6 @@ class TelemetryPanel : public ModelPanel void on_varioLimitMin_DSB_editingFinished(); void on_varioLimitMax_DSB_editingFinished(); void on_varioLimitCenterMin_DSB_editingFinished(); - void on_varioLimitMinOff_ChkB_toggled(bool checked); void on_varioLimitCenterMax_DSB_editingFinished(); void on_fasOffset_DSB_editingFinished(); void on_mahCount_SB_editingFinished(); diff --git a/companion/src/modeledit/telemetry.ui b/companion/src/modeledit/telemetry.ui index 6237ed533..7772744b0 100644 --- a/companion/src/modeledit/telemetry.ui +++ b/companion/src/modeledit/telemetry.ui @@ -281,10 +281,10 @@ 1 - -2.000000000000000 + -2.100000000000000 - 0.000000000000000 + 1.000000000000000 0.100000000000000 @@ -363,19 +363,6 @@ - - - - - 0 - 0 - - - - Off - - -