From 25197faa7a5017c3dcbc2b6d5e8602baf4e4f7f7 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 12 May 2016 17:40:26 +0200 Subject: [PATCH] Multi device support: Aligned Funcube Pro plugin --- plugins/samplesource/fcdpro/fcdprogui.cpp | 55 +++++++++++++++++++++ plugins/samplesource/fcdpro/fcdprogui.h | 7 +++ plugins/samplesource/fcdpro/fcdprogui.ui | 59 +++++++++++++++++++---- 3 files changed, 111 insertions(+), 10 deletions(-) diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index 47df422e5..aeecfb44f 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -19,7 +19,10 @@ #include "ui_fcdprogui.h" #include "plugin/pluginapi.h" #include "gui/colormapper.h" +#include "gui/glspectrum.h" #include "dsp/dspengine.h" +#include "dsp/dspcommands.h" +#include "dsp/filesink.h" #include "fcdprogui.h" #include "fcdproconst.h" @@ -139,10 +142,19 @@ FCDProGui::FCDProGui(PluginAPI* pluginAPI, QWidget* parent) : m_sampleSource = new FCDProInput(); DSPEngine::instance()->setSource(m_sampleSource); + + char recFileNameCStr[30]; + sprintf(recFileNameCStr, "test_%d.sdriq", m_pluginAPI->getDeviceUID()); + m_fileSink = new FileSink(std::string(recFileNameCStr)); + m_pluginAPI->addSink(m_fileSink); + + connect(m_pluginAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); } FCDProGui::~FCDProGui() { + m_pluginAPI->removeSink(m_fileSink); + delete m_fileSink; delete ui; } @@ -205,6 +217,35 @@ bool FCDProGui::handleMessage(const Message& message) return false; } +void FCDProGui::handleDSPMessages() +{ + Message* message; + + while ((message = m_pluginAPI->getDeviceOutputMessageQueue()->pop()) != 0) + { + qDebug("FCDProGui::handleDSPMessages: message: %s", message->getIdentifier()); + + if (DSPSignalNotification::match(*message)) + { + DSPSignalNotification* notif = (DSPSignalNotification*) message; + m_sampleRate = notif->getSampleRate(); + m_deviceCenterFrequency = notif->getCenterFrequency(); + qDebug("FCDProGui::handleDSPMessages: SampleRate:%d, CenterFrequency:%llu", notif->getSampleRate(), notif->getCenterFrequency()); + updateSampleRateAndFrequency(); + m_fileSink->handleMessage(*notif); // forward to file sink + + delete message; + } + } +} + +void FCDProGui::updateSampleRateAndFrequency() +{ + m_pluginAPI->getSpectrum()->setSampleRate(m_sampleRate); + m_pluginAPI->getSpectrum()->setCenterFrequency(m_deviceCenterFrequency); + ui->deviceRateText->setText(tr("%1k").arg((float)m_sampleRate / 1000)); +} + void FCDProGui::displaySettings() { ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); @@ -396,6 +437,20 @@ void FCDProGui::on_startStop_toggled(bool checked) } } +void FCDProGui::on_record_toggled(bool checked) +{ + if (checked) + { + ui->record->setStyleSheet("QToolButton { background-color : red; }"); + m_fileSink->startRecording(); + } + else + { + ui->record->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); + m_fileSink->stopRecording(); + } +} + void FCDProGui::updateStatus() { int state = m_pluginAPI->state(); diff --git a/plugins/samplesource/fcdpro/fcdprogui.h b/plugins/samplesource/fcdpro/fcdprogui.h index 44a117a7b..8c1b64e9f 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.h +++ b/plugins/samplesource/fcdpro/fcdprogui.h @@ -23,6 +23,7 @@ #include "plugin/plugingui.h" class PluginAPI; +class FileSink; namespace Ui { class FCDProGui; @@ -56,12 +57,17 @@ private: QTimer m_statusTimer; std::vector m_gains; SampleSource* m_sampleSource; + FileSink *m_fileSink; //!< File sink to record device I/Q output + int m_sampleRate; + quint64 m_deviceCenterFrequency; //!< Center frequency in device int m_lastEngineState; void displaySettings(); void sendSettings(); + void updateSampleRateAndFrequency(); private slots: + void handleDSPMessages(); void on_centerFrequency_changed(quint64 value); void on_ppm_valueChanged(int value); void on_dcOffset_toggled(bool checked); @@ -85,6 +91,7 @@ private slots: void on_gain6_currentIndexChanged(int index); void on_setDefaults_clicked(bool checked); void on_startStop_toggled(bool checked); + void on_record_toggled(bool checked); void updateHardware(); void updateStatus(); }; diff --git a/plugins/samplesource/fcdpro/fcdprogui.ui b/plugins/samplesource/fcdpro/fcdprogui.ui index 3addf5d92..522627d63 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.ui +++ b/plugins/samplesource/fcdpro/fcdprogui.ui @@ -38,16 +38,55 @@ - - - - - - - :/play.png - :/stop.png:/play.png - - + + + + + + + + + + + :/play.png + :/stop.png:/play.png + + + + + + + Toggle record I/Q samples from device + + + + + + + :/record_off.png:/record_off.png + + + + + + + + + + + I/Q sample rate kS/s + + + 00000k + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + +