From 5baab1d5bda53ac9c0fce18922543bb7de3ba584 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 20 Jan 2018 03:44:44 +0100 Subject: [PATCH] TestSource: fixed fc infra and supra --- plugins/samplesource/testsource/testsourceinput.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/samplesource/testsource/testsourceinput.cpp b/plugins/samplesource/testsource/testsourceinput.cpp index 57d092d7d..213176a3b 100644 --- a/plugins/samplesource/testsource/testsourceinput.cpp +++ b/plugins/samplesource/testsource/testsourceinput.cpp @@ -254,7 +254,7 @@ bool TestSourceInput::applySettings(const TestSourceSettings& settings, bool for || (m_settings.m_log2Decim != settings.m_log2Decim) || force) { qint64 deviceCenterFrequency = settings.m_centerFrequency; - deviceCenterFrequency = deviceCenterFrequency < 0 ? 0 : deviceCenterFrequency; + int frequencyShift = settings.m_frequencyShift; qint64 f_img = deviceCenterFrequency; quint32 devSampleRate = settings.m_sampleRate; @@ -263,11 +263,13 @@ bool TestSourceInput::applySettings(const TestSourceSettings& settings, bool for if (settings.m_fcPos == TestSourceSettings::FC_POS_INFRA) { deviceCenterFrequency += (devSampleRate / 4); + frequencyShift -= (devSampleRate / 4); f_img = deviceCenterFrequency + devSampleRate/2; } else if (settings.m_fcPos == TestSourceSettings::FC_POS_SUPRA) { deviceCenterFrequency -= (devSampleRate / 4); + frequencyShift += (devSampleRate / 4); f_img = deviceCenterFrequency - devSampleRate/2; } } @@ -275,7 +277,7 @@ bool TestSourceInput::applySettings(const TestSourceSettings& settings, bool for if (m_testSourceThread != 0) { m_testSourceThread->setFcPos((int) settings.m_fcPos); - m_testSourceThread->setFrequencyShift(deviceCenterFrequency - settings.m_centerFrequency + settings.m_frequencyShift); + m_testSourceThread->setFrequencyShift(frequencyShift); qDebug() << "TestSourceInput::applySettings:" << " center freq: " << settings.m_centerFrequency << " Hz" << " device center freq: " << deviceCenterFrequency << " Hz"