From 21ed8a8391eb8bf112266cc75101804e94b44375 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 23 Sep 2017 03:03:35 +0200 Subject: [PATCH] PlutoSDR input: corected Fc pos processing --- plugins/samplesource/plutosdrinput/plutosdrinput.cpp | 2 +- plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp | 2 +- plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp | 2 +- plugins/samplesource/plutosdrinput/plutosdrinputsettings.h | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp index d769b50e9..c5593b426 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp @@ -372,7 +372,7 @@ bool PlutoSDRInput::applySettings(const PlutoSDRInputSettings& settings, bool fo if (m_plutoSDRInputThread != 0) { m_plutoSDRInputThread->setFcPos(settings.m_fcPos); - qDebug() << "PlutoSDRInput::applySettings: set fcPos to " << (1< 2 ? 2 : index); + m_settings.m_fcPos = (PlutoSDRInputSettings::fcPos_t) (index < (int) PlutoSDRInputSettings::FC_POS_END ? index : PlutoSDRInputSettings::FC_POS_CENTER); sendSettings(); } diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp index f0fb39074..e5a6a43d3 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp @@ -28,7 +28,7 @@ class DeviceSourceAPI; const PluginDescriptor PlutoSDRInputPlugin::m_pluginDescriptor = { QString("PlutoSDR Input"), - QString("3.7.1"), + QString("3.7.2"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputsettings.h b/plugins/samplesource/plutosdrinput/plutosdrinputsettings.h index 8dedec586..1003329e9 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputsettings.h +++ b/plugins/samplesource/plutosdrinput/plutosdrinputsettings.h @@ -24,7 +24,8 @@ struct PlutoSDRInputSettings { typedef enum { FC_POS_INFRA = 0, FC_POS_SUPRA, - FC_POS_CENTER + FC_POS_CENTER, + FC_POS_END } fcPos_t; enum RFPath