VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 17:58:43 -05:00
Code Issues Projects Releases Wiki Activity

Test source: rework of center frequency setting

Browse Source
This commit is contained in:
f4exb 2018-05-10 13:16:27 +02:00
parent 17976cf058
commit de2e018e42
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/samplesource/testsource/testsourceinput.cpp
View File

@ -259,26 +259,25 @@ bool TestSourceInput::applySettings(const TestSourceSettings& settings, bool for
if ((m_settings.m_centerFrequency != settings.m_centerFrequency) if ((m_settings.m_centerFrequency != settings.m_centerFrequency)
|| (m_settings.m_fcPos != settings.m_fcPos) || (m_settings.m_fcPos != settings.m_fcPos)
|| (m_settings.m_frequencyShift != settings.m_frequencyShift) || (m_settings.m_frequencyShift != settings.m_frequencyShift)
|| (m_settings.m_sampleRate != settings.m_sampleRate)
|| (m_settings.m_log2Decim != settings.m_log2Decim) || force) || (m_settings.m_log2Decim != settings.m_log2Decim) || force)
{ {
qint64 deviceCenterFrequency = settings.m_centerFrequency; qint64 deviceCenterFrequency = DeviceSampleSource::calculateDeviceCenterFrequency(
settings.m_centerFrequency,
0, // no transverter mode
settings.m_log2Decim,
(DeviceSampleSource::fcPos_t) settings.m_fcPos,
settings.m_sampleRate);
int frequencyShift = settings.m_frequencyShift; int frequencyShift = settings.m_frequencyShift;
qint64 f_img = deviceCenterFrequency;
quint32 devSampleRate = settings.m_sampleRate; quint32 devSampleRate = settings.m_sampleRate;
if (settings.m_log2Decim != 0) if (settings.m_log2Decim != 0)
{ {
if (settings.m_fcPos == TestSourceSettings::FC_POS_INFRA) if (settings.m_fcPos == TestSourceSettings::FC_POS_INFRA) {
{
deviceCenterFrequency += (devSampleRate / 4);
frequencyShift -= (devSampleRate / 4); frequencyShift -= (devSampleRate / 4);
f_img = deviceCenterFrequency + devSampleRate/2; } else if (settings.m_fcPos == TestSourceSettings::FC_POS_SUPRA) {
}
else if (settings.m_fcPos == TestSourceSettings::FC_POS_SUPRA)
{
deviceCenterFrequency -= (devSampleRate / 4);
frequencyShift += (devSampleRate / 4); frequencyShift += (devSampleRate / 4);
f_img = deviceCenterFrequency - devSampleRate/2;
} }
} }
@ -291,7 +290,6 @@ bool TestSourceInput::applySettings(const TestSourceSettings& settings, bool for
<< " device center freq: " << deviceCenterFrequency << " Hz" << " device center freq: " << deviceCenterFrequency << " Hz"
<< " device sample rate: " << devSampleRate << "Hz" << " device sample rate: " << devSampleRate << "Hz"
<< " Actual sample rate: " << devSampleRate/(1<<m_settings.m_log2Decim) << "Hz" << " Actual sample rate: " << devSampleRate/(1<<m_settings.m_log2Decim) << "Hz"
<< " fc shift: " << f_img << "Hz"
<< " f shift: " << settings.m_frequencyShift; << " f shift: " << settings.m_frequencyShift;
} }
} }