From d97697b253eb97a90781cb66b2584efcf2db22a1 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 18 Nov 2016 03:01:47 +0100 Subject: [PATCH] SDRPlay plugin: fixed gains settings in displaySettings method --- plugins/samplesource/sdrplay/sdrplaygui.cpp | 33 ++++++++++++++++++++- plugins/samplesource/sdrplay/sdrplaygui.ui | 7 +++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp index ac308fa22..aceead916 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.cpp +++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp @@ -241,7 +241,38 @@ void SDRPlayGui::displaySettings() ui->decim->setCurrentIndex(m_settings.m_log2Decim); ui->fcPos->setCurrentIndex((int) m_settings.m_fcPos); - ui->gainTunerOn->setChecked(true); + ui->gainTunerOn->setChecked(m_settings.m_tunerGainMode); + + if (m_settings.m_tunerGainMode) + { + ui->gainTuner->setEnabled(true); + ui->gainLNA->setEnabled(false); + ui->gainMixer->setEnabled(false); + ui->gainBaseband->setEnabled(false); + + int gain = m_settings.m_tunerGain; + ui->gainTuner->setValue(gain); + QString gainText; + gainText.sprintf("%03d", gain); + ui->gainTunerText->setText(gainText); + m_settings.m_tunerGain = gain; + } + else + { + ui->gainTuner->setEnabled(false); + ui->gainLNA->setEnabled(true); + ui->gainMixer->setEnabled(true); + ui->gainBaseband->setEnabled(true); + + ui->gainLNA->setChecked(m_settings.m_lnaOn != 0); + ui->gainMixer->setChecked(m_settings.m_mixerAmpOn != 0); + + int gain = m_settings.m_basebandGain; + ui->gainBaseband->setValue(gain); + QString gainText; + gainText.sprintf("%02d", gain); + ui->gainBasebandText->setText(gainText); + } } void SDRPlayGui::sendSettings() diff --git a/plugins/samplesource/sdrplay/sdrplaygui.ui b/plugins/samplesource/sdrplay/sdrplaygui.ui index 8b87bb805..65f9740f5 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.ui +++ b/plugins/samplesource/sdrplay/sdrplaygui.ui @@ -540,8 +540,11 @@ + + true + - LNA toggle + LNA toggle (gain depends on frequency) LNA @@ -587,7 +590,7 @@ - Mixer amplifier toggle + Mixer amplifier toggle (+19 dB) MIX