From 17dd0f5dafb4c28a869922d90c5e61bd33cbc361 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 5 Nov 2017 10:31:41 +0100 Subject: [PATCH] LimeSDR: optimize external clock frequency change by not doing it if the frequency is changed and external clock is disabled --- plugins/samplesink/limesdroutput/limesdroutput.cpp | 6 +++--- plugins/samplesource/limesdrinput/limesdrinput.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index e43e5edef..426591e15 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -835,7 +835,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo } if ((m_settings.m_extClock != settings.m_extClock) || - (m_settings.m_extClockFreq != settings.m_extClockFreq) || force) + (settings.m_extClock && (m_settings.m_extClockFreq != settings.m_extClockFreq)) || force) { if (DeviceLimeSDR::setClockSource(m_deviceShared.m_deviceParams->getDevice(), @@ -844,13 +844,13 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo { forwardClockSource = true; doCalibration = true; - qDebug("LimeSDRInput::applySettings: clock set to %s (Ext: %d Hz)", + qDebug("LimeSDROutput::applySettings: clock set to %s (Ext: %d Hz)", settings.m_extClock ? "external" : "internal", settings.m_extClockFreq); } else { - qCritical("LimeSDRInput::applySettings: could not set clock to %s (Ext: %d Hz)", + qCritical("LimeSDROutput::applySettings: could not set clock to %s (Ext: %d Hz)", settings.m_extClock ? "external" : "internal", settings.m_extClockFreq); } diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp index 275bd2c7d..f3b528390 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -987,7 +987,7 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc } if ((m_settings.m_extClock != settings.m_extClock) || - (m_settings.m_extClockFreq != settings.m_extClockFreq) || force) + (settings.m_extClock && (m_settings.m_extClockFreq != settings.m_extClockFreq)) || force) { if (DeviceLimeSDR::setClockSource(m_deviceShared.m_deviceParams->getDevice(),