VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-24 11:12:27 -04:00
Code Issues Projects Releases Wiki Activity

Websocket spectrum: adapted LoRa demod

Browse Source
This commit is contained in:
f4exb 2020-05-15 23:12:46 +02:00
parent 9945c6a8f8
commit 0d5ecaca9f
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/channelrx/demodlora/lorademod.cpp
View File

@ -35,12 +35,14 @@ const QString LoRaDemod::m_channelId = "LoRaDemod";
LoRaDemod::LoRaDemod(DeviceAPI* deviceAPI) : LoRaDemod::LoRaDemod(DeviceAPI* deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
m_deviceAPI(deviceAPI) m_deviceAPI(deviceAPI),
m_spectrumVis(SDR_RX_SCALEF)
{ {
setObjectName(m_channelId); setObjectName(m_channelId);
m_thread = new QThread(this); m_thread = new QThread(this);
m_basebandSink = new LoRaDemodBaseband(); m_basebandSink = new LoRaDemodBaseband();
m_basebandSink->setSpectrumSink(&m_spectrumVis);
m_basebandSink->moveToThread(m_thread); m_basebandSink->moveToThread(m_thread);
applySettings(m_settings, true); applySettings(m_settings, true);

4
plugins/channelrx/demodlora/lorademod.h
View File

@ -22,6 +22,7 @@
#include <vector> #include <vector>
#include "dsp/basebandsamplesink.h" #include "dsp/basebandsamplesink.h"
#include "dsp/spectrumvis.h"
#include "channel/channelapi.h" #include "channel/channelapi.h"
#include "util/message.h" #include "util/message.h"
@ -58,7 +59,7 @@ public:
LoRaDemod(DeviceAPI* deviceAPI); LoRaDemod(DeviceAPI* deviceAPI);
virtual ~LoRaDemod(); virtual ~LoRaDemod();
virtual void destroy() { delete this; } virtual void destroy() { delete this; }
void setSpectrumSink(BasebandSampleSink* sampleSink) { m_basebandSink->setSpectrumSink(sampleSink); } SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool pO); virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool pO);
virtual void start(); virtual void start();
@ -90,6 +91,7 @@ private:
QThread *m_thread; QThread *m_thread;
LoRaDemodBaseband* m_basebandSink; LoRaDemodBaseband* m_basebandSink;
LoRaDemodSettings m_settings; LoRaDemodSettings m_settings;
SpectrumVis m_spectrumVis;
int m_basebandSampleRate; int m_basebandSampleRate;
void applySettings(const LoRaDemodSettings& settings, bool force = false); void applySettings(const LoRaDemodSettings& settings, bool force = false);

5
plugins/channelrx/demodlora/lorademodgui.cpp
View File

@ -119,9 +119,9 @@ LoRaDemodGUI::LoRaDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);
connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool))); connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
m_spectrumVis = new SpectrumVis(SDR_RX_SCALEF, ui->glSpectrum);
m_LoRaDemod = (LoRaDemod*) rxChannel; //new LoRaDemod(m_deviceUISet->m_deviceSourceAPI); m_LoRaDemod = (LoRaDemod*) rxChannel; //new LoRaDemod(m_deviceUISet->m_deviceSourceAPI);
m_LoRaDemod->setSpectrumSink(m_spectrumVis); m_spectrumVis = m_LoRaDemod->getSpectrumVis();
m_spectrumVis->setGLSpectrum(ui->glSpectrum);
ui->glSpectrum->setCenterFrequency(16000); ui->glSpectrum->setCenterFrequency(16000);
ui->glSpectrum->setSampleRate(32000); ui->glSpectrum->setSampleRate(32000);
@ -150,7 +150,6 @@ LoRaDemodGUI::~LoRaDemodGUI()
{ {
m_deviceUISet->removeRxChannelInstance(this); m_deviceUISet->removeRxChannelInstance(this);
delete m_LoRaDemod; // TODO: check this: when the GUI closes it has to delete the demodulator delete m_LoRaDemod; // TODO: check this: when the GUI closes it has to delete the demodulator
delete m_spectrumVis;
delete ui; delete ui;
} }