From a99082bda965e1b9ac7c817b2836256c07bc2d78 Mon Sep 17 00:00:00 2001 From: mxi-box Date: Thu, 30 May 2024 21:18:41 +0800 Subject: [PATCH 1/2] Fix ADSB demod: Message length --- plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp b/plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp index e879b6822e..b08e13ab6d 100644 --- a/plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp @@ -262,7 +262,7 @@ void ADSBDemodSinkWorker::run() if (m_sink->getMessageQueueToGUI() && ((df == 4) || (df == 5) || (df == 20) || (df == 21))) { ADSBDemodReport::MsgReportADSB *msg = ADSBDemodReport::MsgReportADSB::create( - QByteArray((char*)data, sizeof(data)), + QByteArray((char*)data, bytes), preambleCorrelation * m_correlationScale, preambleCorrelationOnes / samplesPerChip, rxDateTime(firstIdx, readBuffer), @@ -273,7 +273,7 @@ void ADSBDemodSinkWorker::run() if (m_sink->getMessageQueueToWorker()) { ADSBDemodReport::MsgReportADSB *msg = ADSBDemodReport::MsgReportADSB::create( - QByteArray((char*)data, sizeof(data)), + QByteArray((char*)data, bytes), preambleCorrelation * m_correlationScale, preambleCorrelationOnes / samplesPerChip, rxDateTime(firstIdx, readBuffer), From ac00e5b46b7877550c75f0c3061b172ac2736e92 Mon Sep 17 00:00:00 2001 From: mxi-box Date: Thu, 30 May 2024 21:21:03 +0800 Subject: [PATCH 2/2] Fix WFM mod: remove feedback sink --- plugins/channeltx/modwfm/wfmmodbaseband.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/channeltx/modwfm/wfmmodbaseband.cpp b/plugins/channeltx/modwfm/wfmmodbaseband.cpp index 5ac75bd294..c8019d6f19 100644 --- a/plugins/channeltx/modwfm/wfmmodbaseband.cpp +++ b/plugins/channeltx/modwfm/wfmmodbaseband.cpp @@ -48,6 +48,7 @@ WFMModBaseband::WFMModBaseband() WFMModBaseband::~WFMModBaseband() { + DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(m_source.getFeedbackAudioFifo()); DSPEngine::instance()->getAudioDeviceManager()->removeAudioSource(m_source.getAudioFifo()); delete m_channelizer; }