diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index d36896b6a..3674673f4 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -93,7 +93,7 @@ void ATVDemodGUI::resetToDefaults() ui->rfBW->setValue(10); ui->rfOppBW->setValue(10); ui->bfo->setValue(0); - ui->fmDeviation->setValue(100); + ui->fmDeviation->setValue(250); blockApplySettings(false); lineTimeUpdate(); @@ -184,7 +184,7 @@ bool ATVDemodGUI::deserialize(const QByteArray& arrData) ui->invertVideo->setChecked(booltmp); d.readS32(16, &tmp, 0); ui->nbLines->setCurrentIndex(tmp); - d.readS32(17, &tmp, 100); + d.readS32(17, &tmp, 250); ui->fmDeviation->setValue(tmp); d.readS32(18, &tmp, 1); ui->standard->setCurrentIndex(tmp); @@ -400,7 +400,7 @@ void ATVDemodGUI::applyRFSettings() ui->rfFiltering->isChecked(), ui->decimatorEnable->isChecked(), ui->bfo->value(), - ui->fmDeviation->value() / 100.0f); + ui->fmDeviation->value() / 500.0f); } } @@ -633,7 +633,7 @@ void ATVDemodGUI::on_bfo_valueChanged(int value) void ATVDemodGUI::on_fmDeviation_valueChanged(int value) { - ui->fmDeviationText->setText(QString("%1").arg(value)); + ui->fmDeviationText->setText(QString("%1").arg(value / 10.0, 0, 'f', 1)); applyRFSettings(); } diff --git a/plugins/channelrx/demodatv/atvdemodgui.ui b/plugins/channelrx/demodatv/atvdemodgui.ui index f97bc0745..2736cb74b 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.ui +++ b/plugins/channelrx/demodatv/atvdemodgui.ui @@ -331,17 +331,20 @@ 24 + + FM deviation as % of full bandwidth + 1 - 125 + 500 1 - 100 + 250 @@ -349,12 +352,15 @@ - 20 + 30 0 + + FM deviation as % of full bandwidth + - 100 + 25.0 Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp index 15fb5941c..9f028363b 100644 --- a/plugins/channeltx/modatv/atvmodgui.cpp +++ b/plugins/channeltx/modatv/atvmodgui.cpp @@ -154,7 +154,7 @@ bool ATVModGUI::deserialize(const QByteArray& data) ui->fps->setCurrentIndex(tmp); d.readS32(12, &tmp, 80); ui->rfScaling->setValue(tmp); - d.readS32(13, &tmp, 50); + d.readS32(13, &tmp, 250); ui->fmExcursion->setValue(tmp); blockApplySettings(false); @@ -400,7 +400,7 @@ void ATVModGUI::on_rfScaling_valueChanged(int value) void ATVModGUI::on_fmExcursion_valueChanged(int value) { - ui->fmExcursionText->setText(tr("%1").arg(value)); + ui->fmExcursionText->setText(tr("%1").arg(value / 10.0, 0, 'f', 1)); applySettings(); } @@ -713,7 +713,7 @@ void ATVModGUI::applySettings() ui->channelMute->isChecked(), ui->invertVideo->isChecked(), ui->rfScaling->value() * 327.68f, - ui->fmExcursion->value() / 100.0f, + ui->fmExcursion->value() / 1000.0f, // percentage of full bandwidth. Value in pro milli ui->forceDecimator->isChecked()); } } diff --git a/plugins/channeltx/modatv/atvmodgui.ui b/plugins/channeltx/modatv/atvmodgui.ui index 64144eca5..1ef1bfc96 100644 --- a/plugins/channeltx/modatv/atvmodgui.ui +++ b/plugins/channeltx/modatv/atvmodgui.ui @@ -299,16 +299,16 @@ FM excursion in % of total bandwidth - 0 + 1 - 100 + 500 1 - 50 + 250 @@ -316,15 +316,15 @@ - 20 + 30 0 - FM deviation percentage of total bandwidth + FM excursion in % of total bandwidth - 50 + 25.0 Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter