From a9aac626171582bd6b8924fc3ec7f0956ee4ce20 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 12 Jan 2019 23:34:11 +0100 Subject: [PATCH] FCD fixes for REST API --- fcdlib/fcdproconst.cpp | 2 +- plugins/samplesource/fcdpro/fcdprogui.cpp | 8 ++++++++ plugins/samplesource/fcdproplus/fcdproplusgui.cpp | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/fcdlib/fcdproconst.cpp b/fcdlib/fcdproconst.cpp index 568ffe4f5..e943518f5 100644 --- a/fcdlib/fcdproconst.cpp +++ b/fcdlib/fcdproconst.cpp @@ -30,7 +30,7 @@ int FCDProConstants::fcdpro_lna_gain_nb_values() const fcdpro_lna_enhance FCDProConstants::lna_enhances[] = { {FCDPRO_TLE_OFF, "Off"}, - {FCDPRO_TLE_0, "1"}, + {FCDPRO_TLE_0, "0"}, {FCDPRO_TLE_1, "1"}, {FCDPRO_TLE_2, "2"}, {FCDPRO_TLE_3, "3"} diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index 0be74957d..3d3ef7b10 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -258,6 +258,13 @@ void FCDProGui::handleInputMessages() delete message; } + else + { + if (handleMessage(*message)) + { + delete message; + } + } } } @@ -309,6 +316,7 @@ void FCDProGui::displaySettings() ui->gain5->setCurrentIndex(m_settings.m_gain5Index); ui->gain6->setCurrentIndex(m_settings.m_gain6Index); ui->decim->setCurrentIndex(m_settings.m_log2Decim); + ui->fcPos->setCurrentIndex((int) m_settings.m_fcPos); ui->rcFilter->setCurrentIndex(m_settings.m_rcFilterIndex); ui->ifFilter->setCurrentIndex(m_settings.m_ifFilterIndex); } diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index e489fd9fa..3472b9f62 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -176,7 +176,10 @@ void FCDProPlusGui::handleInputMessages() } else { - qWarning("FCDProPlusGui::handleInputMessages: message: %s. No action.", message->getIdentifier()); + if (handleMessage(*message)) + { + delete message; + } } } } @@ -210,6 +213,7 @@ void FCDProPlusGui::displaySettings() updateFrequencyLimits(); ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); ui->decim->setCurrentIndex(m_settings.m_log2Decim); + ui->fcPos->setCurrentIndex((int) m_settings.m_fcPos); ui->dcOffset->setChecked(m_settings.m_dcBlock); ui->iqImbalance->setChecked(m_settings.m_iqImbalance); ui->checkBoxG->setChecked(m_settings.m_lnaGain);