1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-22 16:08:39 -05:00

Merge pull request #1410 from srcejon/fix_1409

#1409 - Detect Packet Demods in MIMO device sets in ARPS Feature
This commit is contained in:
Edouard Griffiths 2022-09-16 00:51:34 +02:00 committed by GitHub
commit 38120a7ce3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -459,8 +459,9 @@ void APRS::scanAvailableChannels()
for (const auto& deviceSet : deviceSets) for (const auto& deviceSet : deviceSets)
{ {
DSPDeviceSourceEngine *deviceSourceEngine = deviceSet->m_deviceSourceEngine; DSPDeviceSourceEngine *deviceSourceEngine = deviceSet->m_deviceSourceEngine;
DSPDeviceMIMOEngine *deviceMIMOEngine = deviceSet->m_deviceMIMOEngine;
if (deviceSourceEngine) if (deviceSourceEngine || deviceMIMOEngine)
{ {
for (int chi = 0; chi < deviceSet->getNumberOfChannels(); chi++) for (int chi = 0; chi < deviceSet->getNumberOfChannels(); chi++)
{ {
@ -512,8 +513,9 @@ void APRS::handleChannelAdded(int deviceSetIndex, ChannelAPI *channel)
deviceSetIndex, channel->getIndexInDeviceSet(), qPrintable(channel->getURI()), channel); deviceSetIndex, channel->getIndexInDeviceSet(), qPrintable(channel->getURI()), channel);
DeviceSet *deviceSet = MainCore::instance()->getDeviceSets()[deviceSetIndex]; DeviceSet *deviceSet = MainCore::instance()->getDeviceSets()[deviceSetIndex];
DSPDeviceSourceEngine *deviceSourceEngine = deviceSet->m_deviceSourceEngine; DSPDeviceSourceEngine *deviceSourceEngine = deviceSet->m_deviceSourceEngine;
DSPDeviceMIMOEngine *deviceMIMOEngine = deviceSet->m_deviceMIMOEngine;
if (deviceSourceEngine && APRSSettings::m_pipeURIs.contains(channel->getURI())) if ((deviceSourceEngine || deviceMIMOEngine) && APRSSettings::m_pipeURIs.contains(channel->getURI()))
{ {
int chi = channel->getIndexInDeviceSet(); int chi = channel->getIndexInDeviceSet();