VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1883 from srcejon/freq_scanner

Browse Source 
DSD Demod - Fix loss of constellation
This commit is contained in:
Edouard Griffiths 2023-11-13 16:42:16 +01:00 committed by GitHub
commit 95da3936df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 54 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channelrx/demodam/amdemodgui.cpp
View File

@ -611,6 +611,7 @@ void AMDemodGUI::audioSelect(const QPoint& p)
qDebug("AMDemodGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/channelrx/demodbfm/bfmdemodgui.cpp
View File

@ -532,6 +532,7 @@ void BFMDemodGUI::audioSelect(const QPoint& p)
qDebug("BFMDemodGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/channelrx/demoddab/dabdemodgui.cpp
View File

@ -701,6 +701,7 @@ void DABDemodGUI::audioSelect(const QPoint& p)
{
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/channelrx/demoddatv/datvdemodgui.cpp
View File

@ -515,6 +515,7 @@ void DATVDemodGUI::audioSelect(const QPoint& p)
qDebug("DATVDemodGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

12
plugins/channelrx/demoddsd/dsddemod.cpp
View File

@ -59,7 +59,8 @@ DSDDemod::DSDDemod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
m_deviceAPI(deviceAPI),
m_running(false),
m_basebandSampleRate(0)
m_basebandSampleRate(0),
m_scopeXYSink(nullptr)
{
qDebug("DSDDemod::DSDDemod");
setObjectName(m_channelId);
@ -175,6 +176,7 @@ void DSDDemod::start()
if (m_basebandSampleRate != 0) {
m_basebandSink->setBasebandSampleRate(m_basebandSampleRate);
}
m_basebandSink->setScopeXYSink(m_scopeXYSink);
m_thread->start();
@ -198,6 +200,14 @@ void DSDDemod::stop()
m_thread->wait();
}
void DSDDemod::setScopeXYSink(BasebandSampleSink* sampleSink)
{
m_scopeXYSink = sampleSink;
if (m_running) {
m_basebandSink->setScopeXYSink(sampleSink);
}
}
bool DSDDemod::handleMessage(const Message& cmd)
{
qDebug() << "DSDDemod::handleMessage";

4
plugins/channelrx/demoddsd/dsddemod.h
View File

@ -155,7 +155,7 @@ public:
SWGSDRangel::SWGChannelSettings& response);
uint32_t getNumberOfDeviceStreams() const;
void setScopeXYSink(BasebandSampleSink* sampleSink) { if (m_running) { m_basebandSink->setScopeXYSink(sampleSink); } }
void setScopeXYSink(BasebandSampleSink* sampleSink);
void configureMyPosition(float myLatitude, float myLongitude) { if (m_running) { m_basebandSink->configureMyPosition(myLatitude, myLongitude); } }
double getMagSq() { return m_running ? m_basebandSink->getMagSq() : 0.0; }
bool getSquelchOpen() const { return m_running && m_basebandSink->getSquelchOpen(); }
@ -186,7 +186,7 @@ private:
DSDDemodSettings m_settings;
int m_basebandSampleRate; //!< stored from device message used when starting baseband sink
QHash<Feature*, DSDDemodSettings::AvailableAMBEFeature> m_availableAMBEFeatures;
BasebandSampleSink *m_scopeXYSink;
QNetworkAccessManager *m_networkManager;
QNetworkRequest m_networkRequest;

6
plugins/channelrx/demoddsd/dsddemodgui.cpp
View File

@ -101,6 +101,11 @@ bool DSDDemodGUI::handleMessage(const Message& message)
DSPSignalNotification& notif = (DSPSignalNotification&) message;
m_deviceCenterFrequency = notif.getCenterFrequency();
m_basebandSampleRate = notif.getSampleRate();
if (m_basebandSampleRate < 48000) {
setStatusText(QString("Sample rate must be >= 48000 Hz (Currently %1 Hz)").arg(m_basebandSampleRate));
} else {
setStatusText("");
}
ui->deltaFrequency->setValueRange(false, 7, -m_basebandSampleRate/2, m_basebandSampleRate/2);
ui->deltaFrequencyLabel->setToolTip(tr("Range %1 %L2 Hz").arg(QChar(0xB1)).arg(m_basebandSampleRate/2));
updateAbsoluteCenterFrequency();
@ -602,6 +607,7 @@ void DSDDemodGUI::audioSelect(const QPoint& p)
qDebug("DSDDemodGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

20
plugins/channelrx/demoddsd/dsddemodgui.ui
View File

@ -18,7 +18,7 @@
</property>
<property name="minimumSize">
<size>
<width>650</width>
<width>500</width>
<height>392</height>
</size>
</property>
@ -54,7 +54,7 @@
</property>
<property name="minimumSize">
<size>
<width>648</width>
<width>500</width>
<height>0</height>
</size>
</property>
@ -533,7 +533,7 @@
<widget class="QLabel" name="formatStatusText">
<property name="minimumSize">
<size>
<width>595</width>
<width>480</width>
<height>0</height>
</size>
</property>
@ -569,13 +569,13 @@
<rect>
<x>10</x>
<y>180</y>
<width>600</width>
<width>480</width>
<height>210</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>600</width>
<width>480</width>
<height>210</height>
</size>
</property>
@ -1260,6 +1260,11 @@
</widget>
</widget>
<customwidgets>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
@ -1278,11 +1283,6 @@
<header>gui/levelmeter.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>TVScreen</class>
<extends>QWidget</extends>

1
plugins/channelrx/demodfreedv/freedvdemodgui.cpp
View File

@ -441,6 +441,7 @@ void FreeDVDemodGUI::audioSelect(const QPoint& p)
qDebug("FreeDVDemodGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/channelrx/demodft8/ft8demodgui.cpp
View File

@ -27,7 +27,6 @@
#include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "util/db.h"

1
plugins/channelrx/demodils/ilsdemodgui.cpp
View File

@ -1278,6 +1278,7 @@ void ILSDemodGUI::audioSelect(const QPoint& p)
qDebug("ILSDemodGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/channelrx/demodm17/m17demodgui.cpp
View File

@ -644,6 +644,7 @@ void M17DemodGUI::audioSelect(const QPoint& p)
{
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/channelrx/demodnfm/nfmdemodgui.cpp
View File

@ -584,6 +584,7 @@ void NFMDemodGUI::audioSelect(const QPoint& p)
qDebug("NFMDemodGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/channelrx/demodssb/ssbdemodgui.cpp
View File

@ -718,6 +718,7 @@ void SSBDemodGUI::audioSelect(const QPoint& p)
{
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/channelrx/demodvor/vordemodgui.cpp
View File

@ -417,6 +417,7 @@ void VORDemodGUI::audioSelect(const QPoint& p)
qDebug("VORDemodGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/channelrx/demodvormc/vordemodmcgui.cpp
View File

@ -1368,6 +1368,7 @@ void VORDemodMCGUI::audioSelect(const QPoint& p)
qDebug("VORDemodMCGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/channelrx/demodwfm/wfmdemodgui.cpp
View File

@ -336,6 +336,7 @@ void WFMDemodGUI::audioSelect(const QPoint& p)
qDebug("WFMDemodGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/channelrx/freqtracker/freqtrackergui.cpp
View File

@ -32,7 +32,6 @@
#include "gui/devicestreamselectiondialog.h"
#include "dsp/dspengine.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"

2
plugins/channeltx/modam/ammodgui.cpp
View File

@ -503,7 +503,7 @@ void AMModGUI::audioSelect(const QPoint& p)
qDebug("AMModGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/channeltx/modfreedv/freedvmodgui.cpp
View File

@ -550,6 +550,7 @@ void FreeDVModGUI::audioSelect(const QPoint& p)
qDebug("FreeDVModGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

2
plugins/channeltx/modm17/m17modgui.cpp
View File

@ -717,6 +717,7 @@ void M17ModGUI::audioSelect(const QPoint& p)
qDebug("M17ModGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)
@ -731,6 +732,7 @@ void M17ModGUI::audioFeedbackSelect(const QPoint& p)
qDebug("M17ModGUI::audioFeedbackSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

2
plugins/channeltx/modnfm/nfmmodgui.cpp
View File

@ -623,6 +623,7 @@ void NFMModGUI::audioSelect(const QPoint& p)
qDebug("NFMModGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)
@ -637,6 +638,7 @@ void NFMModGUI::audioFeedbackSelect(const QPoint& p)
qDebug("NFMModGUI::audioFeedbackSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

2
plugins/channeltx/modssb/ssbmodgui.cpp
View File

@ -770,6 +770,7 @@ void SSBModGUI::audioSelect(const QPoint& p)
qDebug("SSBModGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)
@ -784,6 +785,7 @@ void SSBModGUI::audioFeedbackSelect(const QPoint& p)
qDebug("SSBModGUI::audioFeedbackSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

2
plugins/channeltx/modwfm/wfmmodgui.cpp
View File

@ -518,6 +518,7 @@ void WFMModGUI::audioSelect(const QPoint& p)
qDebug("WFMModGUI::audioSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)
@ -532,6 +533,7 @@ void WFMModGUI::audioFeedbackSelect(const QPoint& p)
qDebug("WFMModGUI::audioFeedbackSelect");
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
audioSelect.move(p);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

2
plugins/samplemimo/audiocatsiso/audiocatsisogui.cpp
View File

@ -324,6 +324,7 @@ void AudioCATSISOGUI::on_transverter_clicked()
void AudioCATSISOGUI::on_rxDeviceSelect_clicked()
{
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_txDeviceName, true, this);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)
@ -338,6 +339,7 @@ void AudioCATSISOGUI::on_rxDeviceSelect_clicked()
void AudioCATSISOGUI::on_txDeviceSelect_clicked()
{
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_txDeviceName, false, this);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)

1
plugins/samplesink/audiooutput/audiooutputgui.cpp
View File

@ -183,6 +183,7 @@ void AudioOutputGui::displaySettings()
void AudioOutputGui::on_deviceSelect_clicked()
{
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_deviceName, false, this);
new DialogPositioner(&audioSelect, false);
audioSelect.exec();
if (audioSelect.m_selected)