VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-25 03:24:18 -04:00
Code Issues Projects Releases Wiki Activity

MIMO: use proper functions to get the number of source and stream sinks from the MIMO device

Browse Source
This commit is contained in:
f4exb
2019-05-19 10:23:18 +02:00
parent 490d384ecf
commit 7186182d71
8 changed files with 216 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplemimo/testmi/testmi.cpp
+4 -1
View File
@@ -29,6 +29,7 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "dsp/dspdevicemimoengine.h"
#include "dsp/devicesamplesource.h"
#include "dsp/filerecord.h"
@@ -388,7 +389,9 @@ bool TestMI::applySettings(const TestMISettings& settings, bool force)
int sampleRate = settings.m_sampleRate/(1<<settings.m_log2Decim);
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, settings.m_centerFrequency);
m_fileSink->handleMessage(*notif); // forward to file sink
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
DSPDeviceMIMOEngine::SignalNotification *engineNotif = new DSPDeviceMIMOEngine::SignalNotification(
sampleRate, settings.m_centerFrequency, true, 0);
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(engineNotif);
}
if ((m_settings.m_modulationTone != settings.m_modulationTone) || force)
plugins/samplemimo/testmi/testmigui.cpp
+5 -3
View File
@@ -30,6 +30,7 @@
#include "gui/crightclickenabler.h"
#include "gui/basicdevicesettingsdialog.h"
#include "dsp/dspengine.h"
#include "dsp/dspdevicemimoengine.h"
#include "dsp/dspcommands.h"
#include "util/db.h"
@@ -489,12 +490,13 @@ void TestMIGui::handleInputMessages()
while ((message = m_inputMessageQueue.pop()) != 0)
{
if (DSPSignalNotification::match(*message))
if (DSPDeviceMIMOEngine::SignalNotification::match(*message))
{
DSPSignalNotification* notif = (DSPSignalNotification*) message;
DSPDeviceMIMOEngine::SignalNotification* notif = (DSPDeviceMIMOEngine::SignalNotification*) message;
m_deviceSampleRate = notif->getSampleRate();
m_deviceCenterFrequency = notif->getCenterFrequency();
qDebug("TestMIGui::handleInputMessages: DSPSignalNotification: SampleRate:%d, CenterFrequency:%llu",
// Do not consider multiple sources at this time
qDebug("TestMIGui::handleInputMessages: DSPDeviceMIMOEngine::SignalNotification: SampleRate:%d, CenterFrequency:%llu",
notif->getSampleRate(),
notif->getCenterFrequency());
updateSampleRateAndFrequency();