From 3ca49aa849d4d53924adf3612b3cdc3ac03dbe02 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Thu, 29 Mar 2018 12:15:33 +0200
Subject: [PATCH] LimeSDR: corrceted get/set center frequency taking NCO into
 account

---
 plugins/samplesink/limesdroutput/limesdroutput.cpp    | 4 ++--
 plugins/samplesink/limesdroutput/limesdroutputgui.cpp | 4 ++--
 plugins/samplesource/limesdrinput/limesdrinput.cpp    | 4 ++--
 plugins/samplesource/limesdrinput/limesdrinputgui.cpp | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp
index 29cbdc2b8..4b31712a1 100644
--- a/plugins/samplesink/limesdroutput/limesdroutput.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp
@@ -439,13 +439,13 @@ int LimeSDROutput::getSampleRate() const
 
 quint64 LimeSDROutput::getCenterFrequency() const
 {
-    return m_settings.m_centerFrequency;
+    return m_settings.m_centerFrequency + (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0);
 }
 
 void LimeSDROutput::setCenterFrequency(qint64 centerFrequency)
 {
     LimeSDROutputSettings settings = m_settings;
-    settings.m_centerFrequency = centerFrequency;
+    settings.m_centerFrequency = centerFrequency - (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0);
 
     MsgConfigureLimeSDR* message = MsgConfigureLimeSDR::create(settings, false);
     m_inputMessageQueue.push(message);
diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp
index 9e08cdaa4..953e4d01b 100644
--- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp
@@ -109,12 +109,12 @@ void LimeSDROutputGUI::resetToDefaults()
 
 qint64 LimeSDROutputGUI::getCenterFrequency() const
 {
-    return m_settings.m_centerFrequency;
+    return m_settings.m_centerFrequency + (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0);
 }
 
 void LimeSDROutputGUI::setCenterFrequency(qint64 centerFrequency)
 {
-    m_settings.m_centerFrequency = centerFrequency;
+    m_settings.m_centerFrequency = centerFrequency - (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0);
     displaySettings();
     sendSettings();
 }
diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp
index 0b2b61e6c..18e44da12 100644
--- a/plugins/samplesource/limesdrinput/limesdrinput.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp
@@ -458,13 +458,13 @@ int LimeSDRInput::getSampleRate() const
 
 quint64 LimeSDRInput::getCenterFrequency() const
 {
-    return m_settings.m_centerFrequency;
+    return m_settings.m_centerFrequency + (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0);
 }
 
 void LimeSDRInput::setCenterFrequency(qint64 centerFrequency)
 {
     LimeSDRInputSettings settings = m_settings;
-    settings.m_centerFrequency = centerFrequency;
+    settings.m_centerFrequency = centerFrequency - (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0);
 
     MsgConfigureLimeSDR* message = MsgConfigureLimeSDR::create(settings, false);
     m_inputMessageQueue.push(message);
diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
index 26b3b4824..911de2900 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
@@ -107,12 +107,12 @@ void LimeSDRInputGUI::resetToDefaults()
 
 qint64 LimeSDRInputGUI::getCenterFrequency() const
 {
-    return m_settings.m_centerFrequency;
+    return m_settings.m_centerFrequency + (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0);
 }
 
 void LimeSDRInputGUI::setCenterFrequency(qint64 centerFrequency)
 {
-    m_settings.m_centerFrequency = centerFrequency;
+    m_settings.m_centerFrequency = centerFrequency - (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0);
     displaySettings();
     sendSettings();
 }