mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-28 07:46:37 -04:00
LimeSDR: corrceted get/set center frequency taking NCO into account
This commit is contained in:
parent
6551c1cf5e
commit
3ca49aa849
@ -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);
|
||||||
|
@ -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();
|
||||||
}
|
}
|
||||||
|
@ -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);
|
||||||
|
@ -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();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user