VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

LimeSDR: corrceted get/set center frequency taking NCO into account

This commit is contained in:
f4exb 2018-03-29 12:15:33 +02:00
parent 6551c1cf5e
commit 3ca49aa849
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/samplesink/limesdroutput/limesdroutput.cpp
View File

@ -439,13 +439,13 @@ int LimeSDROutput::getSampleRate() const
quint64 LimeSDROutput::getCenterFrequency() 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) void LimeSDROutput::setCenterFrequency(qint64 centerFrequency)
{ {
LimeSDROutputSettings settings = m_settings; 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); MsgConfigureLimeSDR* message = MsgConfigureLimeSDR::create(settings, false);
m_inputMessageQueue.push(message); m_inputMessageQueue.push(message);

4
plugins/samplesink/limesdroutput/limesdroutputgui.cpp
View File

@ -109,12 +109,12 @@ void LimeSDROutputGUI::resetToDefaults()
qint64 LimeSDROutputGUI::getCenterFrequency() const 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) 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(); displaySettings();
sendSettings(); sendSettings();
} }

4
plugins/samplesource/limesdrinput/limesdrinput.cpp
View File

@ -458,13 +458,13 @@ int LimeSDRInput::getSampleRate() const
quint64 LimeSDRInput::getCenterFrequency() 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) void LimeSDRInput::setCenterFrequency(qint64 centerFrequency)
{ {
LimeSDRInputSettings settings = m_settings; 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); MsgConfigureLimeSDR* message = MsgConfigureLimeSDR::create(settings, false);
m_inputMessageQueue.push(message); m_inputMessageQueue.push(message);

4
plugins/samplesource/limesdrinput/limesdrinputgui.cpp
View File

@ -107,12 +107,12 @@ void LimeSDRInputGUI::resetToDefaults()
qint64 LimeSDRInputGUI::getCenterFrequency() const 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) 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(); displaySettings();
sendSettings(); sendSettings();
} }