From f1d46c440ad3494e2244b678a4c95441b6ec81eb Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 25 Apr 2020 12:25:50 +0200 Subject: [PATCH] Fixed incorrect frequency display when transverter is engaged. Fixes issue #509 --- .../samplesink/bladerf2output/bladerf2outputgui.cpp | 6 ++++-- .../bladerf2output/bladerf2outputplugin.cpp | 2 +- plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp | 11 ++++++++--- .../samplesink/hackrfoutput/hackrfoutputplugin.cpp | 2 +- plugins/samplesink/limesdroutput/limesdroutputgui.cpp | 1 + .../samplesink/limesdroutput/limesdroutputplugin.cpp | 2 +- .../samplesink/soapysdroutput/soapysdroutputgui.cpp | 5 +++++ .../soapysdroutput/soapysdroutputplugin.cpp | 2 +- .../samplesource/bladerf2input/bladerf2inputgui.cpp | 9 +++++---- .../bladerf2input/bladerf2inputplugin.cpp | 2 +- plugins/samplesource/hackrfinput/hackrfinputgui.cpp | 8 +++----- .../samplesource/hackrfinput/hackrfinputplugin.cpp | 2 +- plugins/samplesource/limesdrinput/limesdrinputgui.cpp | 1 + .../samplesource/limesdrinput/limesdrinputplugin.cpp | 2 +- .../samplesource/soapysdrinput/soapysdrinputgui.cpp | 5 +++++ .../soapysdrinput/soapysdrinputplugin.cpp | 2 +- 16 files changed, 40 insertions(+), 22 deletions(-) diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp index 88c5fd8f7..50aa56a2a 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp @@ -284,14 +284,16 @@ void BladeRF2OutputGui::displaySettings() ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency); ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode); + updateFrequencyLimits(); + ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); ui->LOppm->setValue(m_settings.m_LOppmTenths); ui->LOppmText->setText(QString("%1").arg(QString::number(m_settings.m_LOppmTenths/10.0, 'f', 1))); + displaySampleRate(); + ui->bandwidth->setValue(m_settings.m_bandwidth / 1000); - ui->interp->setCurrentIndex(m_settings.m_log2Interp); - ui->gainText->setText(tr("%1 dB").arg(m_settings.m_globalGain)); ui->gain->setValue(m_settings.m_globalGain); ui->biasTee->setChecked(m_settings.m_biasTee); diff --git a/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp b/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp index 046b6cb1e..ccc9af620 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp @@ -32,7 +32,7 @@ const PluginDescriptor BladeRF2OutputPlugin::m_pluginDescriptor = { QString("BladeRF2"), QString("BladeRF2 Output"), - QString("4.12.3"), + QString("4.14.5"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp index 2baaa9cda..5707ba083 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp @@ -256,8 +256,13 @@ void HackRFOutputGui::displayFcTooltip() void HackRFOutputGui::displaySettings() { blockApplySettings(true); - ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); + ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency); + ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode); + + updateFrequencyLimits(); + + ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); ui->LOppm->setValue(m_settings.m_LOppmTenths); ui->LOppmText->setText(QString("%1").arg(QString::number(m_settings.m_LOppmTenths/10.0, 'f', 1))); @@ -267,14 +272,14 @@ void HackRFOutputGui::displaySettings() ui->interp->setCurrentIndex(m_settings.m_log2Interp); ui->fcPos->setCurrentIndex((int) m_settings.m_fcPos); - ui->lnaExt->setChecked(m_settings.m_lnaExt); ui->txvgaGainText->setText(tr("%1dB").arg(m_settings.m_vgaGain)); ui->txvga->setValue(m_settings.m_vgaGain); unsigned int bandwidthIndex = HackRFBandwidths::getBandwidthIndex(m_settings.m_bandwidth/1000); ui->bbFilter->setCurrentIndex(bandwidthIndex); - blockApplySettings(false); + + blockApplySettings(false); } void HackRFOutputGui::displayBandwidths() diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp index 56a275514..f4fd61b23 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp @@ -32,7 +32,7 @@ const PluginDescriptor HackRFOutputPlugin::m_pluginDescriptor = { QString("HackRF"), QString("HackRF Output"), - QString("4.12.3"), + QString("4.14.5"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 0341cf55c..04dbb59e1 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -368,6 +368,7 @@ void LimeSDROutputGUI::displaySettings() ui->extClock->setExternalClockFrequency(m_settings.m_extClockFreq); ui->extClock->setExternalClockActive(m_settings.m_extClock); + updateFrequencyLimits(); setCenterFrequencyDisplay(); displaySampleRate(); diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp index 00ece20c5..b4be8ee4d 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp @@ -35,7 +35,7 @@ const PluginDescriptor LimeSDROutputPlugin::m_pluginDescriptor = { QString("LimeSDR"), QString("LimeSDR Output"), - QString("4.14.4"), + QString("4.14.5"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp index 308c2940f..32f9a3050 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp @@ -685,6 +685,11 @@ void SoapySDROutputGui::displaySettings() { blockApplySettings(true); + ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency); + ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode); + + updateFrequencyLimits(); + ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); if (m_antennas) { diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp index 32b694480..3039faad6 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp @@ -33,7 +33,7 @@ const PluginDescriptor SoapySDROutputPlugin::m_pluginDescriptor = { QString("SoapySDR"), QString("SoapySDR Output"), - QString("4.12.3"), + QString("4.14.5"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp index 702375262..8c0f665e4 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp @@ -331,19 +331,20 @@ void BladeRF2InputGui::displaySettings() ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency); ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode); + updateFrequencyLimits(); + ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); ui->LOppm->setValue(m_settings.m_LOppmTenths); ui->LOppmText->setText(QString("%1").arg(QString::number(m_settings.m_LOppmTenths/10.0, 'f', 1))); - displaySampleRate(); - ui->bandwidth->setValue(m_settings.m_bandwidth / 1000); + displaySampleRate(); + + ui->bandwidth->setValue(m_settings.m_bandwidth / 1000); ui->dcOffset->setChecked(m_settings.m_dcBlock); ui->iqImbalance->setChecked(m_settings.m_iqCorrection); ui->biasTee->setChecked(m_settings.m_biasTee); - ui->decim->setCurrentIndex(m_settings.m_log2Decim); ui->fcPos->setCurrentIndex((int) m_settings.m_fcPos); - ui->gainMode->setCurrentIndex(m_settings.m_gainMode); ui->gainText->setText(tr("%1 dB").arg(m_settings.m_globalGain)); ui->gain->setValue(m_settings.m_globalGain); diff --git a/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp b/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp index ddd9bdb99..10f97716a 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp @@ -32,7 +32,7 @@ const PluginDescriptor Blderf2InputPlugin::m_pluginDescriptor = { QString("BladeRF2"), QString("BladeRF2 Input"), - QString("4.12.3"), + QString("4.14.5"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp index eb8272593..bfa9d6d0d 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -277,24 +277,22 @@ void HackRFInputGui::displaySettings() { blockApplySettings(true); - ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency); ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode); + updateFrequencyLimits(); + + ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); ui->LOppm->setValue(m_settings.m_LOppmTenths); ui->LOppmText->setText(QString("%1").arg(QString::number(m_settings.m_LOppmTenths/10.0, 'f', 1))); - ui->dcOffset->setChecked(m_settings.m_dcBlock); ui->iqImbalance->setChecked(m_settings.m_iqCorrection); displaySampleRate(); ui->biasT->setChecked(m_settings.m_biasT); - ui->decim->setCurrentIndex(m_settings.m_log2Decim); - ui->fcPos->setCurrentIndex((int) m_settings.m_fcPos); - ui->lnaExt->setChecked(m_settings.m_lnaExt); ui->lnaGainText->setText(tr("%1dB").arg(m_settings.m_lnaGain)); ui->lna->setValue(m_settings.m_lnaGain); diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp index 6b61bd8e4..cf2c28f56 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp @@ -33,7 +33,7 @@ const PluginDescriptor HackRFInputPlugin::m_pluginDescriptor = { QString("HackRF"), QString("HackRF Input"), - QString("4.12.3"), + QString("4.14.5"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index 38433df5e..67c1b4750 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -395,6 +395,7 @@ void LimeSDRInputGUI::displaySettings() ui->extClock->setExternalClockFrequency(m_settings.m_extClockFreq); ui->extClock->setExternalClockActive(m_settings.m_extClock); + updateFrequencyLimits(); setCenterFrequencyDisplay(); displaySampleRate(); diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp index d69b099a8..917e34341 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp @@ -35,7 +35,7 @@ const PluginDescriptor LimeSDRInputPlugin::m_pluginDescriptor = { QString("LimeSDR"), QString("LimeSDR Input"), - QString("4.14.4"), + QString("4.14.5"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp index 721ccb572..f49b7e992 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp @@ -747,6 +747,11 @@ void SoapySDRInputGui::displaySettings() { blockApplySettings(true); + ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency); + ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode); + + updateFrequencyLimits(); + ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); if (m_antennas) { diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp index 88b9edebd..7541da020 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp @@ -32,7 +32,7 @@ const PluginDescriptor SoapySDRInputPlugin::m_pluginDescriptor = { QString("SoapySDR"), QString("SoapySDR Input"), - QString("4.12.3"), + QString("4.14.5"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true,