VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-03 14:34:57 -04:00
Code Issues Projects Releases Wiki Activity

Websocket spectrum: adapted MIMO plugins

Browse Source
This commit is contained in:
f4exb
2020-04-30 10:00:33 +02:00
parent b29a458e57
commit 55d7cbf2b4
9 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplemimo/testmosync/testmosync.cpp
+2 -2
View File
@@ -39,12 +39,12 @@ MESSAGE_CLASS_DEFINITION(TestMOSync::MsgStartStop, Message)
TestMOSync::TestMOSync(DeviceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_spectrumVis(SDR_TX_SCALEF),
m_settings(),
m_sinkThread(nullptr),
m_deviceDescription("TestMOSync"),
m_runningTx(false),
m_masterTimer(deviceAPI->getMasterTimer()),
m_spectrumSink(nullptr),
m_feedSpectrumIndex(0)
{
m_mimoType = MIMOHalfSynchronous;
@@ -81,7 +81,7 @@ bool TestMOSync::startTx()
m_sinkThread->setFcPos(m_settings.m_fcPosTx);
m_sinkThread->setSamplerate(m_settings.m_sampleRate);
m_sinkThread->setLog2Interpolation(m_settings.m_log2Interp);
m_sinkThread->setSpectrumSink(m_spectrumSink);
m_sinkThread->setSpectrumSink(&m_spectrumVis);
m_sinkThread->setFeedSpectrumIndex(m_feedSpectrumIndex);
m_sinkThread->connectTimer(m_masterTimer);
m_sinkThread->startWork();
plugins/samplemimo/testmosync/testmosync.h
+3 -2
View File
@@ -25,6 +25,7 @@
#include <QTimer>
#include "dsp/devicesamplemimo.h"
#include "dsp/spectrumvis.h"
#include "testmosyncsettings.h"
class DeviceAPI;
@@ -141,20 +142,20 @@ public:
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response);
SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
bool getRxRunning() const { return false; }
bool getTxRunning() const { return m_runningTx; }
void setSpectrumSink(BasebandSampleSink* spectrumSink) { m_spectrumSink = spectrumSink; }
void setFeedSpectrumIndex(unsigned int feedSpectrumIndex);
private:
DeviceAPI *m_deviceAPI;
QMutex m_mutex;
SpectrumVis m_spectrumVis;
TestMOSyncSettings m_settings;
TestMOSyncThread* m_sinkThread;
QString m_deviceDescription;
bool m_runningTx;
const QTimer& m_masterTimer;
BasebandSampleSink* m_spectrumSink;
unsigned int m_feedSpectrumIndex;
bool applySettings(const TestMOSyncSettings& settings, bool force);
plugins/samplemimo/testmosync/testmosyncgui.cpp
+2 -3
View File
@@ -58,8 +58,8 @@ TestMOSyncGui::TestMOSyncGui(DeviceUISet *deviceUISet, QWidget* parent) :
ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow));
ui->sampleRate->setValueRange(7, 32000U, 9000000U);
m_spectrumVis = new SpectrumVis(SDR_TX_SCALEF, ui->glSpectrum);
m_sampleMIMO->setSpectrumSink(m_spectrumVis);
m_spectrumVis = m_sampleMIMO->getSpectrumVis();
m_spectrumVis->setGLSpectrum(ui->glSpectrum);
ui->glSpectrum->setCenterFrequency(m_settings.m_centerFrequency);
ui->glSpectrum->setSampleRate(m_settings.m_sampleRate*(1<<m_settings.m_log2Interp));
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer());
@@ -82,7 +82,6 @@ TestMOSyncGui::TestMOSyncGui(DeviceUISet *deviceUISet, QWidget* parent) :
TestMOSyncGui::~TestMOSyncGui()
{
delete m_spectrumVis;
delete ui;
}