From 924eddd3b83feadf15d0756959b53aff5a0377eb Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 10 Sep 2017 17:18:08 +0200 Subject: [PATCH] PlutoSDR input: restored LO ppm correction --- devices/plutosdr/deviceplutosdrbox.cpp | 16 ++++++++-------- .../samplesource/plutosdrinput/plutosdrinput.cpp | 8 ++++---- .../plutosdrinput/plutosdrinputgui.cpp | 2 ++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/devices/plutosdr/deviceplutosdrbox.cpp b/devices/plutosdr/deviceplutosdrbox.cpp index 9df8c4964..085924ee2 100644 --- a/devices/plutosdr/deviceplutosdrbox.cpp +++ b/devices/plutosdr/deviceplutosdrbox.cpp @@ -41,14 +41,14 @@ DevicePlutoSDRBox::DevicePlutoSDRBox(const std::string& uri) : if (m_valid) { getXO(); setTracking(); - int nb_channels = iio_device_get_channels_count(m_devRx); - for (int i = 0; i < nb_channels; i++) { - iio_channel_disable(iio_device_get_channel(m_devRx, i)); - } - nb_channels = iio_device_get_channels_count(m_devTx); - for (int i = 0; i < nb_channels; i++) { - iio_channel_disable(iio_device_get_channel(m_devTx, i)); - } +// int nb_channels = iio_device_get_channels_count(m_devRx); +// for (int i = 0; i < nb_channels; i++) { +// iio_channel_disable(iio_device_get_channel(m_devRx, i)); +// } +// nb_channels = iio_device_get_channels_count(m_devTx); +// for (int i = 0; i < nb_channels; i++) { +// iio_channel_disable(iio_device_get_channel(m_devTx, i)); +// } } } diff --git a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp index c11606f90..9fe52c6c6 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp @@ -358,10 +358,10 @@ bool PlutoSDRInput::applySettings(const PlutoSDRInputSettings& settings, bool fo } } -// if ((m_settings.m_LOppmTenths != settings.m_LOppmTenths) || force) -// { -// plutoBox->setLOPPMTenths(settings.m_LOppmTenths); -// } + if ((m_settings.m_LOppmTenths != settings.m_LOppmTenths) || force) + { + plutoBox->setLOPPMTenths(settings.m_LOppmTenths); + } std::vector params; bool paramsToSet = false; diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp index 73ded9b03..5ba50253f 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp @@ -168,6 +168,7 @@ void PlutoSDRInputGui::on_centerFrequency_changed(quint64 value) void PlutoSDRInputGui::on_loPPM_valueChanged(int value) { + ui->loPPMText->setText(QString("%1").arg(QString::number(value/10.0, 'f', 1))); m_settings.m_LOppmTenths = value; sendSettings(); } @@ -258,6 +259,7 @@ void PlutoSDRInputGui::displaySettings() ui->dcOffset->setChecked(m_settings.m_dcBlock); ui->iqImbalance->setChecked(m_settings.m_iqCorrection); + ui->loPPMText->setText(QString("%1").arg(QString::number(m_settings.m_LOppmTenths/10.0, 'f', 1))); ui->swDecim->setCurrentIndex(m_settings.m_log2Decim);