Merge pull request #2062 from dforsi/fix/includes

Remove includes not used directly

devices/plutosdr/deviceplutosdrbox.cpp

@@ -27,7 +27,6 @@
 #include <boost/lexical_cast.hpp>
 #include <QtGlobal>
 
-#include "dsp/dsptypes.h"
 #include "dsp/wfir.h"
 #include "deviceplutosdr.h"
 #include "deviceplutosdrbox.h"

plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp

@@ -29,7 +29,6 @@
 #include "dsp/hbfilterchainconverter.h"
 #include "dsp/dspcommands.h"
 #include "settings/serializable.h"
-#include "feature/feature.h"
 #include "maincore.h"
 
 #include "beamsteeringcwmodbaseband.h"

plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.cpp

@@ -20,7 +20,6 @@
 #include <QDebug>
 
 #include "dsp/upchannelizer.h"
-#include "dsp/dspcommands.h"
 
 #include "beamsteeringcwmodbaseband.h"
 

plugins/channelmimo/doa2/doa2.cpp

@@ -29,7 +29,6 @@
 #include "device/deviceapi.h"
 #include "dsp/hbfilterchainconverter.h"
 #include "dsp/dspcommands.h"
-#include "feature/feature.h"
 #include "util/db.h"
 #include "maincore.h"
 

plugins/channelmimo/doa2/doa2baseband.cpp

@@ -22,9 +22,7 @@
 #include <QDebug>
 
 #include "dsp/downchannelizer.h"
-#include "dsp/basebandsamplesink.h"
 #include "dsp/scopevis.h"
-#include "dsp/dspcommands.h"
 
 #include "doa2baseband.h"
 #include "doa2settings.h"

plugins/channelmimo/doa2/doa2gui.cpp

@@ -25,7 +25,6 @@
 #include "gui/dialogpositioner.h"
 #include "dsp/hbfilterchainconverter.h"
 #include "dsp/scopevis.h"
-#include "dsp/spectrumvis.h"
 #include "maincore.h"
 
 #include "doa2gui.h"

plugins/channelmimo/doa2/doa2settings.cpp

@@ -18,7 +18,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelmimo/interferometer/interferometer.cpp

@@ -28,7 +28,6 @@
 #include "device/deviceapi.h"
 #include "dsp/hbfilterchainconverter.h"
 #include "dsp/dspcommands.h"
-#include "feature/feature.h"
 #include "maincore.h"
 
 #include "interferometerbaseband.h"

plugins/channelmimo/interferometer/interferometerbaseband.cpp

@@ -24,7 +24,6 @@
 #include "dsp/downchannelizer.h"
 #include "dsp/basebandsamplesink.h"
 #include "dsp/scopevis.h"
-#include "dsp/dspcommands.h"
 
 #include "interferometerbaseband.h"
 

plugins/channelmimo/interferometer/interferometersettings.cpp

@@ -18,7 +18,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp

@@ -18,7 +18,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/chanalyzer/chanalyzergui.cpp

@@ -31,7 +31,6 @@
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "maincore.h"
 

plugins/channelrx/chanalyzer/chanalyzersettings.cpp

@@ -18,7 +18,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelrx/channelpower/channelpower.cpp

@@ -32,13 +32,10 @@
 #include "SWGWorkspaceInfo.h"
 #include "SWGChannelReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
 #include "util/db.h"
-#include "maincore.h"
 
 MESSAGE_CLASS_DEFINITION(ChannelPower::MsgConfigureChannelPower, Message)
 
@@ -289,13 +286,26 @@ int ChannelPower::webapiSettingsPutPatch(
     ChannelPowerSettings settings = m_settings;
     webapiUpdateChannelSettings(settings, channelSettingsKeys, response);
 
-    MsgConfigureChannelPower *msg = MsgConfigureChannelPower::create(settings, channelSettingsKeys, force);
+    // Ensure inputFrequencyOffset and frequency are consistent
+    QStringList settingsKeys = channelSettingsKeys;
+    if (settingsKeys.contains("frequency") && !settingsKeys.contains("inputFrequencyOffset"))
+    {
+        settings.m_inputFrequencyOffset = settings.m_frequency - m_centerFrequency;
+        settingsKeys.append("inputFrequencyOffset");
+    }
+    else if (settingsKeys.contains("inputFrequencyOffset") && !settingsKeys.contains("frequency"))
+    {
+        settings.m_frequency = m_centerFrequency + settings.m_inputFrequencyOffset;
+        settingsKeys.append("frequency");
+    }
+
+    MsgConfigureChannelPower *msg = MsgConfigureChannelPower::create(settings, settingsKeys, force);
     m_inputMessageQueue.push(msg);
 
     qDebug("ChannelPower::webapiSettingsPutPatch: forward to GUI: %p", m_guiMessageQueue);
     if (m_guiMessageQueue) // forward to GUI if any
     {
-        MsgConfigureChannelPower *msgToGUI = MsgConfigureChannelPower::create(settings, channelSettingsKeys, force);
+        MsgConfigureChannelPower *msgToGUI = MsgConfigureChannelPower::create(settings, settingsKeys, force);
         m_guiMessageQueue->push(msgToGUI);
     }
 
@@ -312,6 +322,12 @@ void ChannelPower::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("inputFrequencyOffset")) {
         settings.m_inputFrequencyOffset = response.getChannelPowerSettings()->getInputFrequencyOffset();
     }
+    if (channelSettingsKeys.contains("frequencyMode")) {
+        settings.m_frequencyMode = (ChannelPowerSettings::FrequencyMode) response.getChannelPowerSettings()->getFrequencyMode();
+    }
+    if (channelSettingsKeys.contains("frequency")) {
+        settings.m_frequency = response.getChannelPowerSettings()->getFrequency();
+    }
     if (channelSettingsKeys.contains("rfBandwidth")) {
         settings.m_rfBandwidth = response.getChannelPowerSettings()->getRfBandwidth();
     }
@@ -356,6 +372,8 @@ void ChannelPower::webapiUpdateChannelSettings(
 void ChannelPower::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const ChannelPowerSettings& settings)
 {
     response.getChannelPowerSettings()->setInputFrequencyOffset(settings.m_inputFrequencyOffset);
+    response.getChannelPowerSettings()->setFrequencyMode(settings.m_frequencyMode);
+    response.getChannelPowerSettings()->setFrequency(settings.m_frequency);
     response.getChannelPowerSettings()->setRfBandwidth(settings.m_rfBandwidth);
     response.getChannelPowerSettings()->setPulseThreshold(settings.m_pulseThreshold);
     response.getChannelPowerSettings()->setAveragePeriodUs(settings.m_averagePeriodUS);
@@ -469,6 +487,12 @@ void ChannelPower::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("inputFrequencyOffset") || force) {
         swgChannelPowerSettings->setInputFrequencyOffset(settings.m_inputFrequencyOffset);
     }
+    if (channelSettingsKeys.contains("frequencyMode") || force) {
+        swgChannelPowerSettings->setFrequencyMode(settings.m_frequencyMode);
+    }
+    if (channelSettingsKeys.contains("inputFrequency") || force) {
+        swgChannelPowerSettings->setFrequency(settings.m_frequency);
+    }
     if (channelSettingsKeys.contains("rfBandwidth") || force) {
         swgChannelPowerSettings->setRfBandwidth(settings.m_rfBandwidth);
     }

plugins/channelrx/channelpower/channelpowerbaseband.cpp

@@ -18,7 +18,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/channelpower/channelpowergui.cpp

@@ -24,10 +24,8 @@
 #include "dsp/dspcommands.h"
 #include "ui_channelpowergui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "dsp/dspengine.h"

plugins/channelrx/channelpower/channelpowersettings.cpp

@@ -18,7 +18,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "channelpowersettings.h"

plugins/channelrx/channelpower/readme.md

@@ -1,4 +1,4 @@
-<h1>Channel Power Plugin</h1>
+<h1>Channel Power Plugin</h1>
 
 <h2>Introduction</h2>
 
@@ -10,38 +10,48 @@ The top and bottom bars of the channel window are described [here](../../../sdrg
 
 ![Channel power plugin GUI](../../../doc/img/ChannelPower_plugin_settings.png)
 
-<h3>1: Frequency shift from center frequency of reception</h3>
+<h3>1: Channel frequency entry mode</h3>
 
-Use the wheels to adjust the channel center frequency as a shift in Hz from the center frequency of reception. Left click on a digit sets the cursor position at this digit. Right click on a digit sets all digits on the right to zero. This effectively floors value at the digit position. Wheels are moved with the mousewheel while pointing at the wheel or by selecting the wheel with the left mouse click and using the keyboard arrows. Pressing shift simultaneously moves digit by 5 and pressing control moves it by 2.
+Select from one of the following modes to determine how the channel center frequency is calculated:
 
-<h3>2: BW - Channel Bandwidth</h3>
+* Δf - Specify an offset in Hz from device center frequency.
+* f - Specific a frequency in Hz.
+
+<h3>2: Channel Frequency</h3>
+
+Specifies channel center frequency according to frequency entry mode (1):
+
+* Δf - Offset in Hz from device center frequency.
+* f - Absolute frequency in Hz.
+
+<h3>3: BW - Channel Bandwidth</h3>
 
 Bandwidth in Hz of the channel for which power is to be measured.
 
-<h3>3: Tavg - Average Time</h3>
+<h3>4: Tavg - Average Time</h3>
 
 Time period overwhich the channel power is averaged. Values range from 10us to 10s in powers of 10. The available values depend upon the sample rate.
 
-<h3>4: THp - Pulse Threshold</h3>
+<h3>5: THp - Pulse Threshold</h3>
 
 The pulse threshold sets the power in dB for which the channel power needs to exceed, in order to be included in the pulse average power measurement.
 
-<h3>5: Avg - Average Power</h3>
+<h3>6: Avg - Average Power</h3>
 
 Displays the most recent average power measurement in dB.
 
-<h3>6: Max - Max Peak Power</h3>
+<h3>7: Max - Max Peak Power</h3>
 
 Displays the maximum instantaneous peak power measurement in dB.
 
-<h3>7: Min - Min Peak Power</h3>
+<h3>8: Min - Min Peak Power</h3>
 
 Displays the minimum instantaneous peak power measurement in dB.
 
-<h3>8: Pulse - Pulse Average Power</h3>
+<h3>9: Pulse - Pulse Average Power</h3>
 
 Displays the most recent pulse average power measurement in dB.
 
-<h3>9: Clear Data</h3>
+<h3>10: Clear Data</h3>
 
 Clears current measurements (min and max values are reset).

plugins/channelrx/demodadsb/adsbdemod.cpp

@@ -37,7 +37,6 @@
 #include "SWGADSBDemodReport.h"
 #include "SWGTargetAzimuthElevation.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/devicesamplemimo.h"
 #include "device/deviceapi.h"

plugins/channelrx/demodadsb/adsbdemodgui.cpp

@@ -43,12 +43,10 @@
 #include "plugin/pluginapi.h"
 #include "util/airlines.h"
 #include "util/crc.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "util/units.h"
 #include "util/morse.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/clickablelabel.h"
 #include "gui/tabletapandhold.h"
@@ -56,7 +54,6 @@
 #include "gui/dialogpositioner.h"
 #include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
-#include "mainwindow.h"
 
 #include "adsbdemodreport.h"
 #include "adsbdemod.h"
@@ -4671,6 +4668,7 @@ void ADSBDemodGUI::feedSelect(const QPoint& p)
 {
     ADSBDemodFeedDialog dialog(&m_settings);
     dialog.move(p);
+    new DialogPositioner(&dialog, false);
 
     if (dialog.exec() == QDialog::Accepted)
     {
@@ -5040,6 +5038,7 @@ ADSBDemodGUI::ADSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
 
 ADSBDemodGUI::~ADSBDemodGUI()
 {
+    disconnect(&MainCore::instance()->getSettings(), &MainSettings::preferenceChanged, this, &ADSBDemodGUI::preferenceChanged);
     if (m_templateServer)
     {
         m_templateServer->close();

plugins/channelrx/demodadsb/adsbdemodsettings.cpp

@@ -20,10 +20,8 @@
 #include <QDataStream>
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
-#include "settings/rollupstate.h"
 
 #include "adsbdemodsettings.h"
 

plugins/channelrx/demodadsb/adsbdemodsink.cpp

@@ -19,14 +19,6 @@
 #include <QTime>
 #include <QDebug>
 
-#include "util/stepfunctions.h"
-#include "util/db.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
-#include "device/deviceapi.h"
-
-#include "adsbdemodreport.h"
 #include "adsbdemodsink.h"
 #include "adsbdemodsinkworker.h"
 #include "adsb.h"

plugins/channelrx/demodadsb/adsbdemodsink.h

@@ -25,10 +25,8 @@
 #include "dsp/channelsamplesink.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "util/movingaverage.h"
 
 #include "adsbdemodsettings.h"
-#include "adsbdemodstats.h"
 #include "adsbdemodsinkworker.h"
 
 class ADSBDemodSink : public ChannelSampleSink {

plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp

@@ -20,11 +20,7 @@
 
 #include <QDebug>
 
-#include "util/stepfunctions.h"
 #include "util/db.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "device/deviceapi.h"
 
 #include "adsbdemodreport.h"
 #include "adsbdemodsink.h"

plugins/channelrx/demodadsb/adsbdemodsinkworker.h

@@ -23,6 +23,7 @@
 
 #include "dsp/dsptypes.h"
 #include "util/crc.h"
+#include "util/message.h"
 #include "util/messagequeue.h"
 #include "adsbdemodstats.h"
 

plugins/channelrx/demodadsb/map/map_6.qml

@@ -431,7 +431,6 @@ Item {
                                 anchors.fill: parent
                                 acceptedButtons: Qt.LeftButton | Qt.RightButton
                                 onClicked: (mouse) => {
-                                console.log("AIRPORT CLICKED ************************* ");
                                     if (mouse.button === Qt.RightButton) {
                                         showRangeItem.visible = !rangeGroup.groupVisible
                                         hideRangeItem.visible = rangeGroup.groupVisible
@@ -508,7 +507,6 @@ Item {
                             MouseArea {
                                 anchors.fill: parent
                                 onClicked: (mouse) => {
-                                console.log("AIRPORT 2 CLICKED ************************* ");
                                     if (showFreq) {
                                         var freqIdx = Math.floor((mouse.y-5)/((height-10)/airportDataRows))
                                         if (freqIdx == 0) {

plugins/channelrx/demodais/aisdemod.cpp

@@ -30,14 +30,10 @@
 
 #include "SWGChannelSettings.h"
 #include "SWGWorkspaceInfo.h"
-#include "SWGChannelReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "util/ais.h"
-#include "util/db.h"
 #include "maincore.h"
 
 MESSAGE_CLASS_DEFINITION(AISDemod::MsgConfigureAISDemod, Message)

plugins/channelrx/demodais/aisdemodbaseband.cpp

@@ -19,7 +19,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodais/aisdemodgui.cpp

@@ -37,25 +37,19 @@
 #include "dsp/dspcommands.h"
 #include "ui_aisdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/ais.h"
 #include "util/csv.h"
 #include "util/db.h"
 #include "util/mmsi.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "dsp/dspengine.h"
 #include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
 #include "gui/tabletapandhold.h"
-#include "channel/channelwebapiutils.h"
 #include "maincore.h"
-#include "feature/featurewebapiutils.h"
 
 #include "aisdemod.h"
-#include "aisdemodsink.h"
 
 void AISDemodGUI::resizeTable()
 {

plugins/channelrx/demodais/aisdemodsettings.cpp

@@ -20,7 +20,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "aisdemodsettings.h"

plugins/channelrx/demodais/aisdemodsink.cpp

@@ -20,13 +20,10 @@
 
 #include <complex.h>
 
-#include "dsp/dspengine.h"
 #include "dsp/datafifo.h"
 #include "dsp/scopevis.h"
 #include "device/deviceapi.h"
 #include "channel/channelwebapiutils.h"
-#include "util/db.h"
-#include "util/stepfunctions.h"
 #include "maincore.h"
 
 #include "aisdemod.h"

plugins/channelrx/demodam/amdemod.cpp

@@ -38,11 +38,8 @@
 #include "SWGChannelReport.h"
 #include "SWGAMDemodReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
-#include "dsp/devicesamplesource.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demodam/amdemodgui.cpp

@@ -30,10 +30,8 @@
 #include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"
 #include "gui/dialogpositioner.h"

plugins/channelrx/demodam/amdemodsettings.cpp

@@ -20,10 +20,9 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
-#include "settings/rollupstate.h"
 #include "amdemodsettings.h"
 
 AMDemodSettings::AMDemodSettings() :

plugins/channelrx/demodam/amdemodsink.cpp

@@ -21,7 +21,6 @@
 
 #include <complex.h>
 
-#include "audio/audiooutputdevice.h"
 #include "dsp/fftfilt.h"
 #include "dsp/datafifo.h"
 #include "util/db.h"

plugins/channelrx/demodapt/aptdemod.cpp

@@ -31,18 +31,12 @@
 #include "SWGChannelSettings.h"
 #include "SWGWorkspaceInfo.h"
 #include "SWGAPTDemodSettings.h"
-#include "SWGChannelReport.h"
 #include "SWGChannelActions.h"
-#include "SWGMapItem.h"
 #include "SWGAPTDemodActions.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
-#include "util/db.h"
-#include "maincore.h"
 
 MESSAGE_CLASS_DEFINITION(APTDemod::MsgConfigureAPTDemod, Message)
 MESSAGE_CLASS_DEFINITION(APTDemod::MsgPixels, Message)

plugins/channelrx/demodapt/aptdemodbaseband.cpp

@@ -18,7 +18,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodapt/aptdemodgui.cpp

@@ -37,22 +37,15 @@
 #include "dsp/dspcommands.h"
 #include "ui_aptdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
-#include "util/morse.h"
-#include "util/units.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "dsp/dspengine.h"
-#include "gui/crightclickenabler.h"
 #include "gui/graphicsviewzoom.h"
-#include "channel/channelwebapiutils.h"
 #include "maincore.h"
 
 #include "aptdemod.h"
-#include "aptdemodsink.h"
 #include "aptdemodsettingsdialog.h"
 #include "aptdemodselectdialog.h"
 

plugins/channelrx/demodapt/aptdemodsettings.cpp

@@ -18,7 +18,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "aptdemodsettings.h"

plugins/channelrx/demodapt/aptdemodsink.cpp

@@ -20,12 +20,6 @@
 
 #include <complex.h>
 
-#include "dsp/dspengine.h"
-#include "dsp/dspengine.h"
-#include "util/db.h"
-#include "util/stepfunctions.h"
-#include "maincore.h"
-
 #include "aptdemod.h"
 #include "aptdemodsink.h"
 

plugins/channelrx/demodatv/atvdemod.cpp

@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <complex.h>
 
-#include "dsp/dspengine.h"
 #include "device/deviceapi.h"
 
 #include "atvdemod.h"

plugins/channelrx/demodatv/atvdemodbaseband.cpp

@@ -18,7 +18,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodatv/atvdemodgui.cpp

@@ -31,7 +31,6 @@
 #include "gui/dialogpositioner.h"
 #include "ui_atvdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "dsp/dspengine.h"
 #include "maincore.h"

plugins/channelrx/demodatv/atvdemodsettings.cpp

@@ -19,7 +19,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "atvdemodsettings.h"

plugins/channelrx/demodbfm/bfmdemod.cpp

@@ -36,11 +36,9 @@
 #include "SWGBFMDemodReport.h"
 #include "SWGRDSReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/devicesamplemimo.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "util/db.h"
 #include "maincore.h"
 

plugins/channelrx/demodbfm/bfmdemodgui.cpp

@@ -37,10 +37,8 @@
 #include "dsp/dspcommands.h"
 #include "gui/glspectrum.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"
 #include "gui/dialogpositioner.h"

plugins/channelrx/demodbfm/bfmdemodsettings.cpp

@@ -20,7 +20,7 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelrx/demodbfm/bfmdemodsink.cpp

@@ -16,21 +16,15 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "boost/format.hpp"
 #include <stdio.h>
 #include <complex.h>
 
 #include <QTime>
 #include <QDebug>
 
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
 #include "dsp/basebandsamplesink.h"
 #include "dsp/datafifo.h"
 #include "pipes/datapipes.h"
-#include "util/db.h"
 #include "maincore.h"
 
 #include "rdsparser.h"

plugins/channelrx/demodchirpchat/chirpchatdemod.cpp

@@ -38,7 +38,6 @@
 
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "util/ax25.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.cpp

@@ -18,7 +18,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodchirpchat/chirpchatdemoddecoderft.cpp

@@ -54,10 +54,7 @@ void ChirpChatDemodDecoderFT::decodeSymbols(
         return;
     }
 
-    // float *lls = new float[mags.size()*nbSymbolBits]; // bits log likelihoods (>0 for 0, <0 for 1)
-    // std::fill(lls, lls+mags.size()*nbSymbolBits, 0.0);
     FT8::FT8Params params;
-    // FT8::FT8::soft_decode_mags(params, mags, nbSymbolBits, lls);
     int r174[174];
     std::string comments;
     payloadParityStatus = (int) ChirpChatDemodSettings::ParityOK;
@@ -170,7 +167,21 @@ int ChirpChatDemodDecoderFT::decodeWithShift(
     float *lls = new float[mags.size()*nbSymbolBits]; // bits log likelihoods (>0 for 0, <0 for 1)
     std::fill(lls, lls+mags.size()*nbSymbolBits, 0.0);
     FT8::FT8::soft_decode_mags(params, mags, nbSymbolBits, lls);
-    return FT8::FT8::decode(lls, r174, params, 0, comments);
+    deinterleave174(lls);
+    int ret = FT8::FT8::decode(lls, r174, params, 0, comments);
+    delete[] lls;
+    return ret;
+}
+
+void ChirpChatDemodDecoderFT::deinterleave174(float ll174[])
+{
+    // 174 = 2*3*29
+    float t174[174];
+    std::copy(ll174, ll174+174, t174);
+
+    for (int i = 0; i < 174; i++) {
+        ll174[i] = t174[(i%6)*29 + (i%29)];
+    }
 }
 
 #endif // HAS_FT8

plugins/channelrx/demodchirpchat/chirpchatdemoddecoderft.h

@@ -57,6 +57,7 @@ private:
         std::string& comments,
         int shift = 0
     );
+    static void deinterleave174(float ll174[]);
 };
 
 

plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp

@@ -31,11 +31,9 @@
 #include "gui/glspectrum.h"
 #include "gui/glspectrumgui.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "maincore.h"
 

plugins/channelrx/demodchirpchat/chirpchatdemodgui.ui

@@ -953,16 +953,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QLabel" name="headerCRCStatus">
-        <property name="toolTip">
-         <string>Header CRC status</string>
-        </property>
-        <property name="text">
-         <string> HC </string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QLabel" name="headerHammingStatus">
         <property name="toolTip">
@@ -973,6 +963,16 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QLabel" name="headerCRCStatus">
+        <property name="toolTip">
+         <string>Header CRC status</string>
+        </property>
+        <property name="text">
+         <string> HC </string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QLabel" name="payloadFECStatus">
         <property name="toolTip">

plugins/channelrx/demodchirpchat/chirpchatdemodsettings.cpp

@@ -18,7 +18,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelrx/demodchirpchat/readme.md

@@ -11,7 +11,7 @@ LoRa is a property of Semtech and the details of the protocol are not made publi
   - To get an idea of what is LoRa: [here](https://www.link-labs.com/blog/what-is-lora)
   - A detailed inspection of LoRa modulation and protocol: [here](https://static1.squarespace.com/static/54cecce7e4b054df1848b5f9/t/57489e6e07eaa0105215dc6c/1464376943218/Reversing-Lora-Knight.pdf)
 
-⚠ Only spread factors of 11 and 12 are working in LoRa mode thus with the distance enhancement active (DE=2)
+⚠ Only spread factors of 11 and 12 are working in LoRa mode with the distance enhancement active (DE=2)
 
 Transmissions from the RN2483 module (SF=11 and SF=12 with DE=2) could be successfully received. It has not been tested with Semtech SX127x hardware. This LoRa decoder is designed for experimentation. For production grade applications it is recommended to use dedicated hardware instead.
 
@@ -110,7 +110,9 @@ This is the Spread Factor parameter of the ChirpChat signal. This is the log2 of
 
 The LoRa standard specifies 0 (no DE) or 2 (DE active). The ChirpChat DE range is extended to all values between 0 and 4 bits.
 
-This is the log2 of the number of FFT bins used for one symbol. Extending the number of FFT bins per symbol decreases the probability to detect the wrong symbol as an adjacent bin. It can also overcome frequency drift on long messages.
+The LoRa standard also specifies that the LowDataRateOptimizatio flag (thus DE=2 vs DE=0 here) should be set when the symbol time defined as BW / 2^SF exceeds 16 ms (See section 4.1.1.6 of the SX127x datasheet). In practice this happens for SF=11 and SF=12 and large enough bandwidths (you can do the maths).
+
+Here this value is the log2 of the number of FFT bins used for one symbol. Extending the number of FFT bins per symbol decreases the probability to detect the wrong symbol as an adjacent bin. It can also overcome frequency or samlping time drift on long messages particularly for small bandwidths.
 
 In practice it is difficult to make correct decodes if only one FFT bin is used to code one symbol (DE=0) therefore it is recommended to use a DE factor of 2 or more. With medium SNR DE=1 can still achieve good results.
 

plugins/channelrx/demoddab/dabdemod.cpp

@@ -34,15 +34,10 @@
 #include "SWGChannelSettings.h"
 #include "SWGWorkspaceInfo.h"
 #include "SWGDABDemodSettings.h"
-#include "SWGChannelReport.h"
-#include "SWGMapItem.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
-#include "util/db.h"
 #include "maincore.h"
 
 MESSAGE_CLASS_DEFINITION(DABDemod::MsgConfigureDABDemod, Message)

plugins/channelrx/demoddab/dabdemodgui.cpp

@@ -30,11 +30,9 @@
 #include "dsp/dspcommands.h"
 #include "ui_dabdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/audioselectdialog.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/dialogpositioner.h"
 #include "channel/channelwebapiutils.h"

plugins/channelrx/demoddab/dabdemodsettings.cpp

@@ -20,7 +20,7 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "dabdemodsettings.h"

plugins/channelrx/demoddab/dabdemodsink.cpp

@@ -21,9 +21,7 @@
 
 #include <complex.h>
 
-#include "dsp/dspengine.h"
 #include "dsp/datafifo.h"
-#include "util/db.h"
 #include "maincore.h"
 
 #include "dabdemod.h"

plugins/channelrx/demoddatv/datvdemodgui.cpp

@@ -28,15 +28,13 @@
 #include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
-#include "mainwindow.h"
+#include "maincore.h"
 
 #include "ui_datvdemodgui.h"
 #include "datvdemodreport.h"

plugins/channelrx/demoddatv/datvdemodsettings.cpp

@@ -22,7 +22,7 @@
 #include "leansdr/dvb.h"
 #include "leansdr/sdr.h"
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelrx/demoddatv/datvdemodsink.cpp

@@ -26,10 +26,6 @@
 #include <QFileInfo>
 #include <QMutexLocker>
 
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "device/deviceapi.h"
-
 #include "datvdemodreport.h"
 
 const unsigned int DATVDemodSink::m_rfFilterFftLength = 512;

plugins/channelrx/demoddsc/dscdemod.cpp

@@ -33,12 +33,9 @@
 #include "SWGWorkspaceInfo.h"
 #include "SWGDSCDemodSettings.h"
 #include "SWGChannelReport.h"
-#include "SWGMapItem.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demoddsc/dscdemodbaseband.cpp

@@ -19,7 +19,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demoddsc/dscdemodgui.cpp

@@ -22,6 +22,7 @@
 #include <QAction>
 #include <QClipboard>
 #include <QFileDialog>
+#include <QRegExp>
 #include <QScrollBar>
 #include <QMenu>
 #include <QDesktopServices>
@@ -36,13 +37,10 @@
 #include "dsp/dspdevicesourceengine.h"
 #include "ui_dscdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/csv.h"
 #include "util/db.h"
 #include "util/mmsi.h"
-#include "util/units.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/decimaldelegate.h"
 #include "dsp/dspengine.h"
 #include "dsp/glscopesettings.h"
@@ -55,7 +53,6 @@
 #include "maincore.h"
 
 #include "dscdemod.h"
-#include "dscdemodsink.h"
 
 #include "SWGMapItem.h"
 

plugins/channelrx/demoddsc/dscdemodsettings.cpp

@@ -20,7 +20,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "dscdemodsettings.h"

plugins/channelrx/demoddsc/dscdemodsink.cpp

@@ -19,13 +19,10 @@
 
 #include <complex.h>
 
-#include "dsp/dspengine.h"
 #include "dsp/scopevis.h"
 #include "device/deviceapi.h"
 #include "util/db.h"
-#include "util/popcount.h"
 #include "channel/channelwebapiutils.h"
-#include "maincore.h"
 
 #include "dscdemod.h"
 #include "dscdemodsink.h"

plugins/channelrx/demoddsd/dsddecoder.cpp

@@ -18,8 +18,6 @@
 #include "dsddecoder.h"
 
 #include <QtGlobal>
-#include "audio/audiofifo.h"
-
 
 DSDDecoder::DSDDecoder()
 {

plugins/channelrx/demoddsd/dsddemod.cpp

@@ -39,9 +39,7 @@
 #include "SWGDSDDemodSettings.h"
 #include "SWGChannelReport.h"
 #include "SWGDSDDemodReport.h"
-#include "SWGRDSReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
 #include "feature/feature.h"

plugins/channelrx/demoddsd/dsddemodgui.cpp

@@ -27,10 +27,8 @@
 #include "dsp/scopevisxy.h"
 #include "dsp/dspcommands.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"
 #include "gui/dialogpositioner.h"

plugins/channelrx/demoddsd/dsddemodsettings.cpp

@@ -18,7 +18,7 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "dsddemodsettings.h"

plugins/channelrx/demoddsd/dsddemodsink.cpp

@@ -25,19 +25,10 @@
 #include <QNetworkReply>
 #include <QBuffer>
 
-#include "SWGChannelSettings.h"
-#include "SWGDSDDemodSettings.h"
-#include "SWGChannelReport.h"
-#include "SWGDSDDemodReport.h"
-#include "SWGRDSReport.h"
-
-#include "dsp/dspengine.h"
 #include "dsp/basebandsamplesink.h"
 #include "dsp/datafifo.h"
 #include "dsp/dspcommands.h"
 #include "feature/feature.h"
-#include "audio/audiooutputdevice.h"
-#include "util/db.h"
 #include "util/messagequeue.h"
 #include "maincore.h"
 

plugins/channelrx/demodendoftrain/endoftraindemod.cpp

@@ -30,7 +30,6 @@
 #include "SWGEndOfTrainDemodSettings.h"
 #include "SWGChannelReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
 #include "settings/serializable.h"

plugins/channelrx/demodendoftrain/endoftraindemodbaseband.cpp

@@ -19,7 +19,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodendoftrain/endoftraindemodgui.cpp

@@ -32,21 +32,15 @@
 #include "dsp/dspcommands.h"
 #include "ui_endoftraindemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/csv.h"
 #include "util/db.h"
-#include "util/units.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "dsp/dspengine.h"
 #include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
 #include "gui/dialogpositioner.h"
-#include "channel/channelwebapiutils.h"
 #include "maincore.h"
 
 #include "endoftraindemod.h"
-#include "endoftraindemodsink.h"
 
 void EndOfTrainDemodGUI::resizeTable()
 {

plugins/channelrx/demodendoftrain/endoftraindemodsink.cpp

@@ -18,10 +18,8 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/datafifo.h"
 #include "device/deviceapi.h"
-#include "util/db.h"
 #include "channel/channelwebapiutils.h"
 #include "maincore.h"
 

plugins/channelrx/demodfreedv/freedvdemod.cpp

@@ -31,11 +31,9 @@
 #include "SWGChannelReport.h"
 #include "SWGFreeDVDemodReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/devicesamplemimo.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "util/db.h"
 #include "maincore.h"
 

plugins/channelrx/demodfreedv/freedvdemodgui.cpp

@@ -29,11 +29,9 @@
 #include "dsp/dspcommands.h"
 #include "gui/glspectrum.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"

plugins/channelrx/demodfreedv/freedvdemodsettings.cpp

@@ -20,7 +20,7 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "freedvdemodsettings.h"

plugins/channelrx/demodfreedv/freedvdemodsink.cpp

@@ -22,7 +22,6 @@
 #include "codec2/modem_stats.h"
 
 #include "dsp/basebandsamplesink.h"
-#include "audio/audiooutputdevice.h"
 #include "util/db.h"
 
 #include "freedvdemodsink.h"

plugins/channelrx/demodft8/ft8demod.cpp

@@ -36,7 +36,6 @@
 #include "SWGChannelReport.h"
 #include "SWGFT8DemodReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspdevicesourceengine.h"
 #include "dsp/dspdevicemimoengine.h"
 #include "dsp/devicesamplesource.h"
@@ -44,7 +43,6 @@
 #include "dsp/dspcommands.h"
 #include "dsp/devicesamplemimo.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "util/db.h"
 #include "maincore.h"
 

plugins/channelrx/demodft8/ft8demodbaseband.cpp

@@ -19,7 +19,6 @@
 #include <QDebug>
 #include <QThread>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/spectrumvis.h"
 #include "maincore.h"

plugins/channelrx/demodft8/ft8demodgui.cpp

@@ -25,11 +25,8 @@
 #include "dsp/spectrumvis.h"
 #include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
-#include "util/simpleserializer.h"
 #include "gui/glspectrum.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
-#include "gui/crightclickenabler.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "util/db.h"

plugins/channelrx/demodft8/ft8demodsettings.cpp

@@ -20,7 +20,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "ft8demodsettings.h"

plugins/channelrx/demodft8/ft8demodsink.cpp

@@ -20,14 +20,8 @@
 #include <QTime>
 #include <QDebug>
 
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
 #include "dsp/spectrumvis.h"
 #include "dsp/datafifo.h"
-#include "device/deviceapi.h"
-#include "util/db.h"
 #include "util/messagequeue.h"
 #include "maincore.h"
 

plugins/channelrx/demodils/ilsdemod.cpp

@@ -31,13 +31,10 @@
 #include "SWGWorkspaceInfo.h"
 #include "SWGILSDemodSettings.h"
 #include "SWGChannelReport.h"
-#include "SWGMapItem.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/morsedemod.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demodils/ilsdemodgui.cpp

@@ -36,27 +36,22 @@
 #include "dsp/morsedemod.h"
 #include "ui_ilsdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "util/units.h"
 #include "util/morse.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "dsp/dspengine.h"
 #include "dsp/glscopesettings.h"
 #include "dsp/spectrumvis.h"
 #include "gui/crightclickenabler.h"
-#include "gui/tabletapandhold.h"
 #include "gui/dialogpositioner.h"
 #include "gui/audioselectdialog.h"
 #include "channel/channelwebapiutils.h"
 #include "feature/featurewebapiutils.h"
 #include "feature/feature.h"
-#include "feature/featureset.h"
 #include "maincore.h"
 
 #include "ilsdemod.h"
-#include "ilsdemodsink.h"
 
 MESSAGE_CLASS_DEFINITION(ILSDemodGUI::MsgGSAngle, Message)
 

plugins/channelrx/demodils/ilsdemodsettings.cpp

@@ -17,7 +17,7 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "ilsdemodsettings.h"

plugins/channelrx/demodils/ilsdemodsink.cpp

@@ -24,9 +24,6 @@
 #include "dsp/scopevis.h"
 #include "util/stepfunctions.h"
 #include "util/db.h"
-#include "util/morse.h"
-#include "util/units.h"
-#include "maincore.h"
 
 #include "ilsdemod.h"
 #include "ilsdemodsink.h"

plugins/channelrx/demodm17/m17demod.cpp

@@ -36,11 +36,8 @@
 #include "SWGWorkspaceInfo.h"
 #include "SWGChannelReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
-#include "feature/featureset.h"
 #include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demodm17/m17demodgui.cpp

@@ -33,11 +33,8 @@
 #include "dsp/scopevisxy.h"
 #include "dsp/dspcommands.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
-#include "util/csv.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"
 #include "gui/dialpopup.h"

plugins/channelrx/demodm17/m17demodsettings.cpp

@@ -18,7 +18,7 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelrx/demodm17/m17demodsink.cpp

@@ -26,18 +26,8 @@
 #include <QNetworkReply>
 #include <QBuffer>
 
-#include "SWGChannelSettings.h"
-#include "SWGDSDDemodSettings.h"
-#include "SWGChannelReport.h"
-#include "SWGDSDDemodReport.h"
-
-#include "dsp/dspengine.h"
 #include "dsp/basebandsamplesink.h"
 #include "dsp/datafifo.h"
-#include "dsp/dspcommands.h"
-#include "feature/feature.h"
-#include "audio/audiooutputdevice.h"
-#include "util/db.h"
 #include "util/messagequeue.h"
 #include "maincore.h"
 

plugins/channelrx/demodnavtex/navtexdemod.cpp

@@ -32,12 +32,9 @@
 #include "SWGWorkspaceInfo.h"
 #include "SWGNavtexDemodSettings.h"
 #include "SWGChannelReport.h"
-#include "SWGMapItem.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp

@@ -19,7 +19,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodnavtex/navtexdemodgui.cpp

@@ -33,25 +33,18 @@
 #include "dsp/dspcommands.h"
 #include "ui_navtexdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/csv.h"
 #include "util/db.h"
-#include "util/morse.h"
-#include "util/units.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/decimaldelegate.h"
 #include "dsp/dspengine.h"
 #include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
 #include "gui/tabletapandhold.h"
 #include "gui/dialogpositioner.h"
-#include "channel/channelwebapiutils.h"
 #include "feature/featurewebapiutils.h"
 #include "maincore.h"
 
 #include "navtexdemod.h"
-#include "navtexdemodsink.h"
 
 void NavtexDemodGUI::resizeTable()
 {