From deee1ada347b86d1d201c9c5ebf4eb4d0e71969a Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 12 May 2016 16:47:10 +0200 Subject: [PATCH] Multi device support: Aligned Airspy plugin --- plugins/samplesource/airspy/airspygui.cpp | 55 +++++++++++++++++++ plugins/samplesource/airspy/airspygui.h | 7 +++ plugins/samplesource/airspy/airspygui.ui | 65 ++++++++++++++++++----- 3 files changed, 114 insertions(+), 13 deletions(-) diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp index 3098188ba..60b54b2fc 100644 --- a/plugins/samplesource/airspy/airspygui.cpp +++ b/plugins/samplesource/airspy/airspygui.cpp @@ -23,7 +23,10 @@ #include "ui_airspygui.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" AirspyGui::AirspyGui(PluginAPI* pluginAPI, QWidget* parent) : QWidget(parent), @@ -48,10 +51,19 @@ AirspyGui::AirspyGui(PluginAPI* pluginAPI, QWidget* parent) : displaySampleRates(); connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); 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); } AirspyGui::~AirspyGui() { + m_pluginAPI->removeSink(m_fileSink); + delete m_fileSink; delete m_sampleSource; // Valgrind memcheck delete ui; } @@ -122,6 +134,28 @@ bool AirspyGui::handleMessage(const Message& message) } } +void AirspyGui::handleDSPMessages() +{ + Message* message; + + while ((message = m_pluginAPI->getDeviceOutputMessageQueue()->pop()) != 0) + { + qDebug("AirspyGui::handleDSPMessages: message: %s", message->getIdentifier()); + + if (DSPSignalNotification::match(*message)) + { + DSPSignalNotification* notif = (DSPSignalNotification*) message; + m_sampleRate = notif->getSampleRate(); + m_deviceCenterFrequency = notif->getCenterFrequency(); + qDebug("AirspyGui::handleDSPMessages: SampleRate:%d, CenterFrequency:%llu", notif->getSampleRate(), notif->getCenterFrequency()); + updateSampleRateAndFrequency(); + m_fileSink->handleMessage(*notif); // forward to file sink + + delete message; + } + } +} + void AirspyGui::handleSourceMessages() { Message* message; @@ -137,6 +171,13 @@ void AirspyGui::handleSourceMessages() } } +void AirspyGui::updateSampleRateAndFrequency() +{ + m_pluginAPI->getSpectrum()->setSampleRate(m_sampleRate); + m_pluginAPI->getSpectrum()->setCenterFrequency(m_deviceCenterFrequency); + ui->deviceRateText->setText(tr("%1k").arg((float)m_sampleRate / 1000)); +} + void AirspyGui::displaySettings() { ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); @@ -318,6 +359,20 @@ void AirspyGui::on_startStop_toggled(bool checked) } } +void AirspyGui::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 AirspyGui::updateHardware() { qDebug() << "AirspyGui::updateHardware"; diff --git a/plugins/samplesource/airspy/airspygui.h b/plugins/samplesource/airspy/airspygui.h index 7e3175531..b64326d38 100644 --- a/plugins/samplesource/airspy/airspygui.h +++ b/plugins/samplesource/airspy/airspygui.h @@ -25,6 +25,7 @@ #define AIRSPY_MAX_DEVICE (32) class PluginAPI; +class FileSink; namespace Ui { class AirspyGui; @@ -60,13 +61,18 @@ private: QTimer m_statusTimer; std::vector m_rates; 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 displaySampleRates(); void sendSettings(); + void updateSampleRateAndFrequency(); private slots: + void handleDSPMessages(); void on_centerFrequency_changed(quint64 value); void on_LOppm_valueChanged(int value); void on_dcOffset_toggled(bool checked); @@ -81,6 +87,7 @@ private slots: void on_lnaAGC_stateChanged(int state); void on_mixAGC_stateChanged(int state); void on_startStop_toggled(bool checked); + void on_record_toggled(bool checked); void updateHardware(); void updateStatus(); void handleSourceMessages(); diff --git a/plugins/samplesource/airspy/airspygui.ui b/plugins/samplesource/airspy/airspygui.ui index 69b6da6ca..71638eec5 100644 --- a/plugins/samplesource/airspy/airspygui.ui +++ b/plugins/samplesource/airspy/airspygui.ui @@ -35,19 +35,58 @@ - - - start/stop acquisition - - - - - - - :/play.png - :/stop.png:/play.png - - + + + + + + + start/stop acquisition + + + + + + + :/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 + + + + + +