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

Added MIMO channel support to device API and engine

Browse Source
This commit is contained in:
f4exb
2019-09-04 05:00:22 +02:00
parent 99a5ffbcfb
commit 77b5002907
4 changed files with 140 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/device/deviceapi.cpp
+39
View File
@@ -141,6 +141,8 @@ void DeviceAPI::addChannelSource(ThreadedBasebandSampleSource* source, int strea
if (m_deviceSinkEngine) {
m_deviceSinkEngine->addThreadedSource(source);
} else if (m_deviceMIMOEngine) {
m_deviceMIMOEngine->addChannelSource(source);
}
}
@@ -150,6 +152,22 @@ void DeviceAPI::removeChannelSource(ThreadedBasebandSampleSource* source, int st
if (m_deviceSinkEngine) {
m_deviceSinkEngine->removeThreadedSource(source);
} else if (m_deviceMIMOEngine) {
m_deviceMIMOEngine->removeChannelSource(source);
}
}
void DeviceAPI::addMIMOChannel(MIMOChannel* channel)
{
if (m_deviceMIMOEngine) {
m_deviceMIMOEngine->addMIMOChannel(channel);
}
}
void DeviceAPI::removeMIMOChannel(MIMOChannel* channel)
{
if (m_deviceMIMOEngine) {
m_deviceMIMOEngine->removeMIMOChannel(channel);
}
}
@@ -189,6 +207,18 @@ void DeviceAPI::removeChannelSourceAPI(ChannelAPI* channelAPI, int streamIndex)
channelAPI->setIndexInDeviceSet(-1);
}
void DeviceAPI::addMIMOChannelAPI(ChannelAPI* channelAPI)
{
m_mimoChannelAPIs.append(channelAPI);
}
void DeviceAPI::removeMIMOChannelAPI(ChannelAPI *channelAPI)
{
if (m_mimoChannelAPIs.removeOne(channelAPI)) {
renumerateChannels();
}
}
void DeviceAPI::setSampleSource(DeviceSampleSource* source)
{
if (m_deviceSourceEngine) {
@@ -790,4 +820,13 @@ void DeviceAPI::renumerateChannels()
m_channelSourceAPIs.at(i)->setDeviceAPI(this);
}
}
else if (m_streamType == StreamMIMO)
{
for (int i = 0; i < m_mimoChannelAPIs.size(); ++i)
{
m_mimoChannelAPIs.at(i)->setIndexInDeviceSet(i);
m_mimoChannelAPIs.at(i)->setDeviceSetIndex(m_deviceTabIndex);
m_mimoChannelAPIs.at(i)->setDeviceAPI(this);
}
}
}