Merge pull request #1410 from srcejon/fix_1409

#1409 - Detect Packet Demods in MIMO device sets in ARPS Feature
pull/1415/head
Edouard Griffiths 2022-09-16 00:51:34 +02:00 zatwierdzone przez GitHub
commit 38120a7ce3
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 4 dodań i 2 usunięć

Wyświetl plik

@ -459,8 +459,9 @@ void APRS::scanAvailableChannels()
for (const auto& deviceSet : deviceSets)
{
DSPDeviceSourceEngine *deviceSourceEngine = deviceSet->m_deviceSourceEngine;
DSPDeviceMIMOEngine *deviceMIMOEngine = deviceSet->m_deviceMIMOEngine;
if (deviceSourceEngine)
if (deviceSourceEngine || deviceMIMOEngine)
{
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);
DeviceSet *deviceSet = MainCore::instance()->getDeviceSets()[deviceSetIndex];
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();