VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed incorrect frequency display when transverter is engaged. Fixes issue #509

This commit is contained in:
f4exb 2020-04-25 12:25:50 +02:00
parent 44d8f8022b
commit f1d46c440a
16 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/samplesink/bladerf2output/bladerf2outputgui.cpp
View File

@ -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);

2
plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp
View File

@ -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,

11
plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
View File

@ -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()

2
plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp
View File

@ -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,

1
plugins/samplesink/limesdroutput/limesdroutputgui.cpp
View File

@ -368,6 +368,7 @@ void LimeSDROutputGUI::displaySettings()
ui->extClock->setExternalClockFrequency(m_settings.m_extClockFreq);
ui->extClock->setExternalClockActive(m_settings.m_extClock);
updateFrequencyLimits();
setCenterFrequencyDisplay();
displaySampleRate();

2
plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
View File

@ -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,

5
plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp
View File

@ -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) {

2
plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp
View File

@ -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,

9
plugins/samplesource/bladerf2input/bladerf2inputgui.cpp
View File

@ -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);

2
plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp
View File

@ -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,

8
plugins/samplesource/hackrfinput/hackrfinputgui.cpp
View File

@ -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);

2
plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
View File

@ -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,

1
plugins/samplesource/limesdrinput/limesdrinputgui.cpp
View File

@ -395,6 +395,7 @@ void LimeSDRInputGUI::displaySettings()
ui->extClock->setExternalClockFrequency(m_settings.m_extClockFreq);
ui->extClock->setExternalClockActive(m_settings.m_extClock);
updateFrequencyLimits();
setCenterFrequencyDisplay();
displaySampleRate();

2
plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
View File

@ -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,

5
plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp
View File

@ -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) {

2
plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp
View File

@ -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,