From 929e0d34dcbe62f032caa040e0c5858b8f9e6165 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 17 Oct 2022 13:43:32 +0100 Subject: [PATCH 1/3] Adjust number of frequency digits depending whether transverter is enabled --- .../bladerf2mimo/bladerf2mimogui.cpp | 38 +++++++++++++------ .../samplemimo/limesdrmimo/limesdrmimogui.cpp | 19 +++++++--- .../plutosdrmimo/plutosdrmimogui.cpp | 17 ++++++--- plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp | 2 +- .../bladerf1output/bladerf1outputgui.cpp | 14 +++++-- .../bladerf2output/bladerf2outputgui.cpp | 19 +++++++--- .../hackrfoutput/hackrfoutputgui.cpp | 19 +++++++--- .../limesdroutput/limesdroutputgui.cpp | 19 +++++++--- .../plutosdroutput/plutosdroutputgui.cpp | 17 ++++++--- .../soapysdroutput/soapysdroutputgui.cpp | 19 +++++++--- .../samplesink/usrpoutput/usrpoutputgui.cpp | 19 +++++++--- .../samplesink/xtrxoutput/xtrxoutputgui.cpp | 2 +- .../bladerf1input/bladerf1inputgui.cpp | 14 +++++-- .../bladerf2input/bladerf2inputgui.cpp | 19 +++++++--- plugins/samplesource/fcdpro/fcdprogui.cpp | 17 ++++++--- .../samplesource/fcdproplus/fcdproplusgui.cpp | 17 ++++++--- .../hackrfinput/hackrfinputgui.cpp | 19 +++++++--- .../limesdrinput/limesdrinputgui.cpp | 17 ++++++--- plugins/samplesource/perseus/perseusgui.cpp | 17 ++++++--- .../plutosdrinput/plutosdrinputgui.cpp | 17 ++++++--- .../remotetcpinput/remotetcpinputgui.cpp | 5 +++ .../remotetcpinputtcphandler.cpp | 2 +- plugins/samplesource/rtlsdr/rtlsdrinput.cpp | 1 + .../soapysdrinput/soapysdrinputgui.cpp | 19 +++++++--- .../samplesource/usrpinput/usrpinputgui.cpp | 2 +- .../samplesource/xtrxinput/xtrxinputgui.cpp | 2 +- 26 files changed, 260 insertions(+), 112 deletions(-) diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp index 2b747c179..f65a25933 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp @@ -159,7 +159,7 @@ void BladeRF2MIMOGui::displaySettings() ui->transverter->setDeltaFrequency(m_settings.m_rxTransverterDeltaFrequency); ui->transverter->setDeltaFrequencyActive(m_settings.m_rxTransverterMode); ui->transverter->setIQOrder(m_settings.m_iqOrder); - ui->centerFrequency->setValueRange(9, m_fMinRx / 1000, m_fMaxRx / 1000); + ui->centerFrequency->setValueRange(7, m_fMinRx / 1000, m_fMaxRx / 1000); ui->centerFrequency->setValue(m_settings.m_rxCenterFrequency / 1000); ui->bandwidth->setValueRange(5, m_bwMinRx / 1000, m_bwMaxRx / 1000); ui->bandwidth->setValue(m_settings.m_rxBandwidth / 1000); @@ -187,7 +187,7 @@ void BladeRF2MIMOGui::displaySettings() ui->transverter->setDeltaFrequency(m_settings.m_txTransverterDeltaFrequency); ui->transverter->setDeltaFrequencyActive(m_settings.m_txTransverterMode); ui->transverter->setIQOrder(m_settings.m_iqOrder); - ui->centerFrequency->setValueRange(9, m_fMinTx / 1000, m_fMaxTx / 1000); + ui->centerFrequency->setValueRange(7, m_fMinTx / 1000, m_fMaxTx / 1000); ui->centerFrequency->setValue(m_settings.m_txCenterFrequency / 1000); ui->bandwidth->setValueRange(5, m_bwMinTx / 1000, m_bwMaxTx / 1000); ui->bandwidth->setValue(m_settings.m_txBandwidth / 1000); @@ -705,12 +705,19 @@ void BladeRF2MIMOGui::updateFrequencyLimits() qint64 minLimit = f_min/1000 + deltaFrequency; qint64 maxLimit = f_max/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_txTransverterMode || m_settings.m_rxTransverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("BladeRF2MIMOGui::updateFrequencyLimits: Rx: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } else { @@ -719,12 +726,19 @@ void BladeRF2MIMOGui::updateFrequencyLimits() qint64 minLimit = f_min/1000 + deltaFrequency; qint64 maxLimit = f_max/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_txTransverterMode || m_settings.m_rxTransverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("BladeRF2MIMOGui::updateFrequencyLimits: Rx: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } } diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp index 68c9d7e05..7e00d4932 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp @@ -586,19 +586,26 @@ void LimeSDRMIMOGUI::updateFrequencyLimits() { minF = m_fMinTx; maxF = m_fMaxTx; - deltaFrequency = m_settings.m_rxTransverterMode ? m_settings.m_txTransverterDeltaFrequency/1000 : 0; + deltaFrequency = m_settings.m_txTransverterMode ? m_settings.m_txTransverterDeltaFrequency/1000 : 0; } qint64 minLimit = minF/1000 + deltaFrequency; qint64 maxLimit = maxF/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_txTransverterMode || m_settings.m_rxTransverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("LimeSDRMIMOGUI::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void LimeSDRMIMOGUI::updateLPFLimits() diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp index 046b47668..17d9822c9 100644 --- a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp +++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp @@ -383,12 +383,19 @@ void PlutoSDRMIMOGUI::updateFrequencyLimits() minLimit = minLimit/1000 + deltaFrequency; maxLimit = maxLimit/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_txTransverterMode || m_settings.m_rxTransverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("PlutoSDRMIMOGUI::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } bool PlutoSDRMIMOGUI::handleMessage(const Message& message) diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp index f6c3c965a..1f66fa5d0 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp +++ b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp @@ -76,7 +76,7 @@ XTRXMIMOGUI::XTRXMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_xtrxMIMO->getLORange(minF, maxF, stepF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_xtrxMIMO->getSRRange(minF, maxF, stepF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); diff --git a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp index 2e8820459..08194e61f 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp @@ -50,7 +50,7 @@ Bladerf1OutputGui::Bladerf1OutputGui(DeviceUISet *deviceUISet, QWidget* parent) setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet("#Bladerf1OutputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "/plugins/samplesink/bladerf1output/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); + ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(8, BLADERF_SAMPLERATE_MIN, BLADERF_SAMPLERATE_REC_MAX); @@ -348,11 +348,19 @@ void Bladerf1OutputGui::on_xb200_currentIndexChanged(int index) if (m_settings.m_xb200) { - ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); + if (m_settings.m_transverterMode) { + ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); + } else { + ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); + } } else { - ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); + if (m_settings.m_transverterMode) { + ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); + } else { + ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); + } } sendSettings(); diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp index 5e5af29be..2274c0e4f 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp @@ -57,7 +57,7 @@ BladeRF2OutputGui::BladeRF2OutputGui(DeviceUISet *deviceUISet, QWidget* parent) m_sampleSink->getFrequencyRange(f_min, f_max, step, scale); qDebug("BladeRF2OutputGui::BladeRF2OutputGui: getFrequencyRange: [%lu,%lu] step: %d", f_min, f_max, step); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(9, f_min/1000, f_max/1000); + ui->centerFrequency->setValueRange(7, f_min/1000, f_max/1000); m_sampleSink->getSampleRateRange(min, max, step, scale); qDebug("BladeRF2OutputGui::BladeRF2OutputGui: getSampleRateRange: [%d,%d] step: %d", min, max, step); @@ -143,12 +143,19 @@ void BladeRF2OutputGui::updateFrequencyLimits() qint64 minLimit = f_min/1000 + deltaFrequency; qint64 maxLimit = f_max/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("BladeRF2OutputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void BladeRF2OutputGui::setCenterFrequencySetting(uint64_t kHzValue) diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp index a80a6fabb..ea8cd8931 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp @@ -53,7 +53,7 @@ HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : getContents()->setStyleSheet("#HackRFOutputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/hackrfoutput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(9, 0U, 999999999U); + ui->centerFrequency->setValueRange(7, 0U, 999999999U); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(8, 1000000U, 20000000U); @@ -226,12 +226,19 @@ void HackRFOutputGui::updateFrequencyLimits() qint64 minLimit = (0U) + deltaFrequency; qint64 maxLimit = (7250000U) + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("HackRFOutputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void HackRFOutputGui::displayFcTooltip() diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 5c79b01cc..8cba2b7a5 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -54,7 +54,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_limeSDROutput->getLORange(minF, maxF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_limeSDROutput->getSRRange(minF, maxF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); @@ -156,12 +156,19 @@ void LimeSDROutputGUI::updateFrequencyLimits() // Min freq is 30MHz - NCO must be used to go below this qint64 minFreq = m_settings.m_ncoEnable ? 30000 + m_settings.m_ncoFrequency/1000 : 30000; - minLimit = minLimit < minFreq ? minFreq : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < minFreq ? minFreq : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < minFreq ? minFreq : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("LimeSDROutputGUI::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } bool LimeSDROutputGUI::handleMessage(const Message& message) diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp index cae0480af..c84fc40fc 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp @@ -443,12 +443,19 @@ void PlutoSDROutputGUI::updateFrequencyLimits() minLimit = minLimit/1000 + deltaFrequency; maxLimit = maxLimit/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("PlutoSDRInputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void PlutoSDROutputGUI::handleInputMessages() diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp index 86d37ef64..4e9b59a5c 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp @@ -67,7 +67,7 @@ SoapySDROutputGui::SoapySDROutputGui(DeviceUISet *deviceUISet, QWidget* parent) ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); uint64_t f_min, f_max; m_sampleSink->getFrequencyRange(f_min, f_max); - ui->centerFrequency->setValueRange(9, f_min/1000, f_max/1000); + ui->centerFrequency->setValueRange(7, f_min/1000, f_max/1000); createCorrectionsControl(); createAntennasControl(m_sampleSink->getAntennas()); @@ -819,12 +819,19 @@ void SoapySDROutputGui::updateFrequencyLimits() qint64 minLimit = f_min/1000 + deltaFrequency; qint64 maxLimit = f_max/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("SoapySDRInputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void SoapySDROutputGui::setCenterFrequencySetting(uint64_t kHzValue) diff --git a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp index e24bb8471..50b2e5866 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp +++ b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp @@ -55,7 +55,7 @@ USRPOutputGUI::USRPOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_usrpOutput->getLORange(minF, maxF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_usrpOutput->getSRRange(minF, maxF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); @@ -167,12 +167,19 @@ void USRPOutputGUI::updateFrequencyLimits() qint64 minLimit = minF/1000 + deltaFrequency; qint64 maxLimit = maxF/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("USRPOutputGUI::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } bool USRPOutputGUI::handleMessage(const Message& message) diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp index d8becf57b..bbb2874d0 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp @@ -56,7 +56,7 @@ XTRXOutputGUI::XTRXOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_XTRXOutput->getLORange(minF, maxF, stepF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_XTRXOutput->getSRRange(minF, maxF, stepF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); diff --git a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp index 04d92ac60..3090c2d30 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp @@ -53,7 +53,7 @@ Bladerf1InputGui::Bladerf1InputGui(DeviceUISet *deviceUISet, QWidget* parent) : getContents()->setStyleSheet("#Bladerf1InputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/bladerf1input/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); + ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); // BladeRF can go as low as 80 kS/s but because of buffering in practice experience is not good below 330 kS/s @@ -406,11 +406,19 @@ void Bladerf1InputGui::on_xb200_currentIndexChanged(int index) if (m_settings.m_xb200) { - ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); + if (m_settings.m_transverterMode) { + ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); + } else { + ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); + } } else { - ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); + if (m_settings.m_transverterMode) { + ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); + } else { + ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); + } } sendSettings(); diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp index 9ace95cfe..577fefaa6 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp @@ -58,7 +58,7 @@ BladeRF2InputGui::BladeRF2InputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource->getFrequencyRange(f_min, f_max, step, scale); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(9, f_min/1000, f_max/1000); + ui->centerFrequency->setValueRange(7, f_min/1000, f_max/1000); m_sampleSource->getSampleRateRange(min, max, step, scale); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); @@ -156,12 +156,19 @@ void BladeRF2InputGui::updateFrequencyLimits() qint64 minLimit = f_min/1000 + deltaFrequency; qint64 maxLimit = f_max/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("BladeRF2OutputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void BladeRF2InputGui::setCenterFrequencySetting(uint64_t kHzValue) diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index 2c35bba09..aca90651c 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -274,12 +274,19 @@ void FCDProGui::updateFrequencyLimits() qint64 minLimit = fcd_traits::loLowLimitFreq/1000 + deltaFrequency; qint64 maxLimit = fcd_traits::loHighLimitFreq/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("FCDProGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void FCDProGui::displaySettings() diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index 1fe32a7cf..87af8db2d 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -190,12 +190,19 @@ void FCDProPlusGui::updateFrequencyLimits() qint64 minLimit = fcd_traits::loLowLimitFreq/1000 + deltaFrequency; qint64 maxLimit = fcd_traits::loHighLimitFreq/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("FCDProPlusGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void FCDProPlusGui::displaySettings() diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp index 199b6c855..4e6073207 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -54,7 +54,7 @@ HackRFInputGui::HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent) : getContents()->setStyleSheet("#HackRFInputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/hackrfinput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(9, 0U, 999999999U); + ui->centerFrequency->setValueRange(7, 0U, 9999999U); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(8, 1000000U, 20000000U); @@ -196,12 +196,19 @@ void HackRFInputGui::updateFrequencyLimits() qint64 minLimit = (0U) + deltaFrequency; qint64 maxLimit = (7250000U) + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("HackRFInputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void HackRFInputGui::displaySampleRate() diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index 960951c7d..dcb49875e 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -279,12 +279,19 @@ void LimeSDRInputGUI::updateFrequencyLimits() // Min freq is 30MHz - NCO must be used to go below this qint64 minFreq = m_settings.m_ncoEnable ? 30000 + m_settings.m_ncoFrequency/1000 : 30000; - minLimit = minLimit < minFreq ? minFreq : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < minFreq ? minFreq : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < minFreq ? minFreq : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("LimeSDRInputGUI::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void LimeSDRInputGUI::handleInputMessages() diff --git a/plugins/samplesource/perseus/perseusgui.cpp b/plugins/samplesource/perseus/perseusgui.cpp index 67e4d690f..58e06d85a 100644 --- a/plugins/samplesource/perseus/perseusgui.cpp +++ b/plugins/samplesource/perseus/perseusgui.cpp @@ -229,12 +229,19 @@ void PerseusGui::updateFrequencyLimits() qint64 minLimit = 10 + deltaFrequency; qint64 maxLimit = 40000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("PerseusGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void PerseusGui::sendSettings() diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp index e311e76b5..9541308b7 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp @@ -515,12 +515,19 @@ void PlutoSDRInputGui::updateFrequencyLimits() minLimit = minLimit/1000 + deltaFrequency; maxLimit = maxLimit/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("PlutoSDRInputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void PlutoSDRInputGui::handleInputMessages() diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp b/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp index 721d93698..8150e08f3 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp +++ b/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp @@ -260,6 +260,11 @@ bool RemoteTCPInputGui::handleMessage(const Message& message) ui->deltaFrequency->setEnabled(sdra); ui->channelGain->setEnabled(sdra); ui->decimation->setEnabled(sdra); + if (sdra) { + ui->centerFrequency->setValueRange(9, 0, 999999999); // Should add transverter control to protocol in the future + } else { + ui->centerFrequency->setValueRange(7, 0, 9999999); + } displayGains(); return true; diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp b/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp index 4e1dc8d57..80009e957 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp +++ b/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp @@ -420,7 +420,7 @@ void RemoteTCPInputTCPHandler::applySettings(const RemoteTCPInputSettings& setti for (int i = 1; i < 3; i++) { if ((settings.m_gain[i] != m_settings.m_gain[i]) || force) { - setIFGain(i, settings.m_gain[i]); + //setIFGain(i, 20 + settings.m_gain[i]); } } if ((settings.m_rfBW != m_settings.m_rfBW) || force) { diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp index 64b7a1dd7..e716dd1f3 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp @@ -538,6 +538,7 @@ bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, bool force) if(m_dev != 0) { + qDebug() << "Set tuner gain " << settings.m_gain; if (rtlsdr_set_tuner_gain(m_dev, settings.m_gain) != 0) { qCritical("RTLSDRInput::applySettings: rtlsdr_set_tuner_gain() failed"); } else { diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp index 4221cc11a..5ccb2beb0 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp @@ -69,7 +69,7 @@ SoapySDRInputGui::SoapySDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); uint64_t f_min, f_max; m_sampleSource->getFrequencyRange(f_min, f_max); - ui->centerFrequency->setValueRange(9, f_min/1000, f_max/1000); + ui->centerFrequency->setValueRange(7, f_min/1000, f_max/1000); createCorrectionsControl(); createAntennasControl(m_sampleSource->getAntennas()); @@ -856,12 +856,19 @@ void SoapySDRInputGui::updateFrequencyLimits() qint64 minLimit = f_min/1000 + deltaFrequency; qint64 maxLimit = f_max/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; - + if (m_settings.m_transverterMode) + { + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); + } + else + { + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + } qDebug("SoapySDRInputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - - ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void SoapySDRInputGui::setCenterFrequencySetting(uint64_t kHzValue) diff --git a/plugins/samplesource/usrpinput/usrpinputgui.cpp b/plugins/samplesource/usrpinput/usrpinputgui.cpp index 73b99bcce..76d0cceca 100644 --- a/plugins/samplesource/usrpinput/usrpinputgui.cpp +++ b/plugins/samplesource/usrpinput/usrpinputgui.cpp @@ -59,7 +59,7 @@ USRPInputGUI::USRPInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_usrpInput->getLORange(minF, maxF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_usrpInput->getSRRange(minF, maxF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp index 0763231a1..e2ef6bf57 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp @@ -59,7 +59,7 @@ XTRXInputGUI::XTRXInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_XTRXInput->getLORange(minF, maxF, stepF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_XTRXInput->getSRRange(minF, maxF, stepF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); From 549d448ba7707fad5af880febeacdfaf5553ad78 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 17 Oct 2022 14:25:02 +0100 Subject: [PATCH 2/3] BladeRF doesn't support transverter, so fix to 7 digits --- .../samplesource/bladerf1input/bladerf1inputgui.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp index 3090c2d30..7ec88c7b0 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp @@ -406,19 +406,11 @@ void Bladerf1InputGui::on_xb200_currentIndexChanged(int index) if (m_settings.m_xb200) { - if (m_settings.m_transverterMode) { - ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); - } else { - ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); - } + ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); } else { - if (m_settings.m_transverterMode) { - ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); - } else { - ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); - } + ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); } sendSettings(); From 025dddc637db845eae5e125c83a4db18cee62863 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 17 Oct 2022 15:04:01 +0100 Subject: [PATCH 3/3] BladeRF doesn't support transverter, so fix to 7 digits --- .../samplesink/bladerf1output/bladerf1outputgui.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp index 08194e61f..7fdc6a030 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp @@ -348,19 +348,11 @@ void Bladerf1OutputGui::on_xb200_currentIndexChanged(int index) if (m_settings.m_xb200) { - if (m_settings.m_transverterMode) { - ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); - } else { - ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); - } + ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); } else { - if (m_settings.m_transverterMode) { - ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); - } else { - ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); - } + ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); } sendSettings();