From 5556e65503862c7515c083a17b1799cf246ef1a2 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 23 Apr 2017 02:50:19 +0200 Subject: [PATCH] LimeSDR: corrected center frequency reporting --- plugins/samplesink/limesdroutput/limesdroutput.cpp | 8 ++++---- plugins/samplesource/limesdrinput/limesdrinput.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index 4d3fd5ec1..d19a1f34b 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -769,9 +769,8 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo for (; itSink != sinkBuddies.end(); ++itSink) { DeviceLimeSDRShared *buddySharedPtr = (DeviceLimeSDRShared *) (*itSink)->getBuddySharedPtr(); - uint64_t buddyCenterFreq = buddySharedPtr->m_centerFrequency; int buddyNCOFreq = buddySharedPtr->m_ncoFrequency; - DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, buddyCenterFreq + buddyNCOFreq); // do not change center frequency + DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency + buddyNCOFreq); // do not change center frequency (*itSink)->getDeviceInputMessageQueue()->push(notif); MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( m_settings.m_centerFrequency, @@ -787,11 +786,12 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo for (; itSource != sourceBuddies.end(); ++itSource) { DeviceLimeSDRShared *buddySharedPtr = (DeviceLimeSDRShared *) (*itSource)->getBuddySharedPtr(); + uint64_t buddyCenterFreq = buddySharedPtr->m_centerFrequency; int buddyNCOFreq = buddySharedPtr->m_ncoFrequency; - DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency + buddyNCOFreq); + DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, buddyCenterFreq + buddyNCOFreq); (*itSource)->getDeviceInputMessageQueue()->push(notif); MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( - m_settings.m_centerFrequency, + buddyCenterFreq, m_settings.m_devSampleRate, m_settings.m_log2HardInterp); (*itSource)->getDeviceOutputMessageQueue()->push(report); diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp index 99ddff811..c63109050 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -813,7 +813,7 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, buddyCenterFreq + buddyNCOFreq); // do not change center frequency (*itSink)->getDeviceInputMessageQueue()->push(notif); MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( - m_settings.m_centerFrequency, + buddyCenterFreq, m_settings.m_devSampleRate, m_settings.m_log2HardDecim); (*itSink)->getDeviceOutputMessageQueue()->push(report);