VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-17 13:12:25 -04:00
Code Issues Projects Releases Wiki Activity

HackRF input: rework of center frequency setting

Browse Source
This commit is contained in:
f4exb 2018-05-10 15:06:46 +02:00
parent 73c0b5516a
commit 8759536506
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/samplesource/hackrfinput/hackrfinput.cpp
View File

@ -366,10 +366,6 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force)
} }
} }
qint64 deviceCenterFrequency = settings.m_centerFrequency;
qint64 f_img = deviceCenterFrequency;
quint32 devSampleRate = settings.m_devSampleRate;
if (force || (m_settings.m_centerFrequency != settings.m_centerFrequency)) // forward delta to buddy if necessary if (force || (m_settings.m_centerFrequency != settings.m_centerFrequency)) // forward delta to buddy if necessary
{ {
if (m_settings.m_linkTxFrequency && (m_deviceAPI->getSinkBuddies().size() > 0)) if (m_settings.m_linkTxFrequency && (m_deviceAPI->getSinkBuddies().size() > 0))
@ -389,38 +385,20 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force)
} }
if ((m_settings.m_centerFrequency != settings.m_centerFrequency) || if ((m_settings.m_centerFrequency != settings.m_centerFrequency) ||
(m_settings.m_devSampleRate != settings.m_devSampleRate) ||
(m_settings.m_LOppmTenths != settings.m_LOppmTenths) || (m_settings.m_LOppmTenths != settings.m_LOppmTenths) ||
(m_settings.m_log2Decim != settings.m_log2Decim) || (m_settings.m_log2Decim != settings.m_log2Decim) ||
(m_settings.m_fcPos != settings.m_fcPos) || force) (m_settings.m_fcPos != settings.m_fcPos) || force)
{ {
if ((settings.m_log2Decim == 0) || (settings.m_fcPos == HackRFInputSettings::FC_POS_CENTER)) qint64 deviceCenterFrequency = DeviceSampleSource::calculateDeviceCenterFrequency(
{ settings.m_centerFrequency,
deviceCenterFrequency = settings.m_centerFrequency; 0,
f_img = deviceCenterFrequency; settings.m_log2Decim,
} (DeviceSampleSource::fcPos_t) settings.m_fcPos,
else settings.m_devSampleRate);
{
if (settings.m_fcPos == HackRFInputSettings::FC_POS_INFRA)
{
deviceCenterFrequency = settings.m_centerFrequency + (devSampleRate / 4);
f_img = deviceCenterFrequency + devSampleRate/2;
}
else if (settings.m_fcPos == HackRFInputSettings::FC_POS_SUPRA)
{
deviceCenterFrequency = settings.m_centerFrequency - (devSampleRate / 4);
f_img = deviceCenterFrequency - devSampleRate/2;
}
}
if (m_dev != 0) if (m_dev != 0) {
{
setDeviceCenterFrequency(deviceCenterFrequency); setDeviceCenterFrequency(deviceCenterFrequency);
qDebug() << "HackRFInput::applySettings: center freq: " << settings.m_centerFrequency << " Hz"
<< " device center freq: " << deviceCenterFrequency << " Hz"
<< " device sample rate: " << devSampleRate << "Hz"
<< " Actual sample rate: " << devSampleRate/(1<<settings.m_log2Decim) << "Hz"
<< " img: " << f_img << "Hz";
} }
forwardChange = true; forwardChange = true;
@ -523,7 +501,7 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force)
if (forwardChange) if (forwardChange)
{ {
int sampleRate = devSampleRate/(1<<settings.m_log2Decim); int sampleRate = settings.m_devSampleRate/(1<<settings.m_log2Decim);
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, settings.m_centerFrequency); DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, settings.m_centerFrequency);
m_fileSink->handleMessage(*notif); // forward to file sink m_fileSink->handleMessage(*notif); // forward to file sink
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);