From 97fa96979acc909da6efd2d951ddf8b48341a47b Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 25 Sep 2017 20:39:14 +0200 Subject: [PATCH] FunCube Pro+ input: implemented transverter feature --- fcdlib/fcdtraits.cpp | 4 +-- .../samplesource/fcdproplus/fcdproplusgui.cpp | 31 ++++++++++++++++++- .../samplesource/fcdproplus/fcdproplusgui.h | 2 ++ .../samplesource/fcdproplus/fcdproplusgui.ui | 21 +++++++++++++ .../fcdproplus/fcdproplusinput.cpp | 23 +++++++++----- .../fcdproplus/fcdproplussettings.cpp | 6 ++++ .../fcdproplus/fcdproplussettings.h | 2 ++ 7 files changed, 78 insertions(+), 11 deletions(-) diff --git a/fcdlib/fcdtraits.cpp b/fcdlib/fcdtraits.cpp index eb7342d1f..638727513 100644 --- a/fcdlib/fcdtraits.cpp +++ b/fcdlib/fcdtraits.cpp @@ -26,7 +26,7 @@ const char *fcd_traits::pluginVersion = "3.7.3"; const char *fcd_traits::pluginVersion = "3.5.0"; const int64_t fcd_traits::loLowLimitFreq = 64000000L; -const int64_t fcd_traits::loLowLimitFreq = 64000000L; +const int64_t fcd_traits::loLowLimitFreq = 150000L; const int64_t fcd_traits::loHighLimitFreq = 1700000000L; -const int64_t fcd_traits::loHighLimitFreq = 1700000000L; +const int64_t fcd_traits::loHighLimitFreq = 2000000000L; diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index 1d2c56798..01221162b 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -26,6 +26,7 @@ #include #include "fcdproplusconst.h" +#include "fcdtraits.h" FCDProPlusGui::FCDProPlusGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : QWidget(parent), @@ -40,7 +41,7 @@ FCDProPlusGui::FCDProPlusGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 150U, 2000000U); + updateFrequencyLimits(); ui->filterIF->clear(); for (int i = 0; i < FCDProPlusConstants::fcdproplus_if_filter_nb_values(); i++) @@ -155,8 +156,26 @@ void FCDProPlusGui::updateSampleRateAndFrequency() ui->deviceRateText->setText(tr("%1k").arg((float)m_sampleRate / 1000)); } +void FCDProPlusGui::updateFrequencyLimits() +{ + // values in kHz + qint64 deltaFrequency = m_settings.m_transverterMode ? m_settings.m_transverterDeltaFrequency/1000 : 0; + qint64 minLimit = fcd_traits::loLowLimitFreq/1000 + deltaFrequency; + qint64 maxLimit = fcd_traits::loHighLimitFreq/1000 + deltaFrequency; + + minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + + qDebug("FCDProPlusGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); + + ui->centerFrequency->setValueRange(7, minLimit, maxLimit); +} + void FCDProPlusGui::displaySettings() { + ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency); + ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode); + updateFrequencyLimits(); ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); ui->dcOffset->setChecked(m_settings.m_dcBlock); ui->iqImbalance->setChecked(m_settings.m_iqImbalance); @@ -303,3 +322,13 @@ void FCDProPlusGui::on_record_toggled(bool checked) FCDProPlusInput::MsgFileRecord* message = FCDProPlusInput::MsgFileRecord::create(checked); m_sampleSource->getInputMessageQueue()->push(message); } + +void FCDProPlusGui::on_transverter_clicked() +{ + m_settings.m_transverterMode = ui->transverter->getDeltaFrequencyAcive(); + m_settings.m_transverterDeltaFrequency = ui->transverter->getDeltaFrequency(); + qDebug("FCDProPlusGui::on_transverter_clicked: %lld Hz %s", m_settings.m_transverterDeltaFrequency, m_settings.m_transverterMode ? "on" : "off"); + updateFrequencyLimits(); + m_settings.m_centerFrequency = ui->centerFrequency->getValueNew()*1000; + sendSettings(); +} diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.h b/plugins/samplesource/fcdproplus/fcdproplusgui.h index 8628df0af..4dbd77ad9 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.h +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.h @@ -67,6 +67,7 @@ private: void displaySettings(); void sendSettings(); void updateSampleRateAndFrequency(); + void updateFrequencyLimits(); private slots: void handleInputMessages(); @@ -82,6 +83,7 @@ private slots: void on_ppm_valueChanged(int value); void on_startStop_toggled(bool checked); void on_record_toggled(bool checked); + void on_transverter_clicked(); void updateHardware(); void updateStatus(); }; diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.ui b/plugins/samplesource/fcdproplus/fcdproplusgui.ui index cc0720819..270db02c2 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.ui +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.ui @@ -238,6 +238,22 @@ + + + + + 24 + 24 + + + + Transverter frequency translation dialog + + + X + + + @@ -391,6 +407,11 @@ QToolButton
gui/buttonswitch.h
+ + TransverterButton + QPushButton +
gui/transverterbutton.h
+ diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp index d17641487..e860f88fe 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp @@ -195,17 +195,24 @@ void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, bool for { bool signalChange = false; - if ((m_settings.m_centerFrequency != settings.m_centerFrequency) || force) + if (force || (m_settings.m_centerFrequency != settings.m_centerFrequency) + || (m_settings.m_transverterMode != settings.m_transverterMode) + || (m_settings.m_transverterDeltaFrequency != settings.m_transverterDeltaFrequency)) { - qDebug() << "FCDProPlusInput::applySettings: fc: " << settings.m_centerFrequency; - m_settings.m_centerFrequency = settings.m_centerFrequency; + qint64 deviceCenterFrequency = settings.m_centerFrequency; + deviceCenterFrequency -= settings.m_transverterMode ? settings.m_transverterDeltaFrequency : 0; + deviceCenterFrequency = deviceCenterFrequency < 0 ? 0 : deviceCenterFrequency; - if (m_dev != 0) - { - set_center_freq((double) m_settings.m_centerFrequency); - } + if (m_dev != 0) + { + set_center_freq((double) deviceCenterFrequency); + } - signalChange = true; + qDebug() << "FCDProPlusInput::applySettings: center freq: " << settings.m_centerFrequency << " Hz" + << " device center freq: " << deviceCenterFrequency << " Hz"; + + m_settings.m_centerFrequency = settings.m_centerFrequency; + signalChange = true; } if ((m_settings.m_lnaGain != settings.m_lnaGain) || force) diff --git a/plugins/samplesource/fcdproplus/fcdproplussettings.cpp b/plugins/samplesource/fcdproplus/fcdproplussettings.cpp index ad557d39d..0751c78ac 100644 --- a/plugins/samplesource/fcdproplus/fcdproplussettings.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplussettings.cpp @@ -35,6 +35,8 @@ void FCDProPlusSettings::resetToDefaults() m_LOppmTenths = 0; m_dcBlock = false; m_iqImbalance = false; + m_transverterMode = false; + m_transverterDeltaFrequency = 0; } QByteArray FCDProPlusSettings::serialize() const @@ -50,6 +52,8 @@ QByteArray FCDProPlusSettings::serialize() const s.writeBool(7, m_iqImbalance); s.writeS32(8, m_LOppmTenths); s.writeU32(9, m_ifGain); + s.writeBool(10, m_transverterMode); + s.writeS64(11, m_transverterDeltaFrequency); return s.final(); } @@ -75,6 +79,8 @@ bool FCDProPlusSettings::deserialize(const QByteArray& data) d.readBool(7, &m_iqImbalance, false); d.readS32(8, &m_LOppmTenths, 0); d.readU32(9, &m_ifGain, 0); + d.readBool(10, &m_transverterMode, false); + d.readS64(11, &m_transverterDeltaFrequency, 0); return true; } diff --git a/plugins/samplesource/fcdproplus/fcdproplussettings.h b/plugins/samplesource/fcdproplus/fcdproplussettings.h index fc4373a05..b0978fb17 100644 --- a/plugins/samplesource/fcdproplus/fcdproplussettings.h +++ b/plugins/samplesource/fcdproplus/fcdproplussettings.h @@ -29,6 +29,8 @@ struct FCDProPlusSettings { qint32 m_LOppmTenths; bool m_dcBlock; bool m_iqImbalance; + bool m_transverterMode; + qint64 m_transverterDeltaFrequency; FCDProPlusSettings(); void resetToDefaults();