From 0eff1e8d2e6637d97c659c4f705e6fc369da3496 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Fri, 2 Oct 2026 08:49:14 +0100 Subject: [PATCH] DSC: Add support for VHF. Improve HF performance. --- plugins/channelrx/demoddsc/dscdemod.cpp | 28 +- .../channelrx/demoddsc/dscdemodbaseband.cpp | 15 +- plugins/channelrx/demoddsc/dscdemodgui.cpp | 20 +- plugins/channelrx/demoddsc/dscdemodgui.h | 1 + plugins/channelrx/demoddsc/dscdemodgui.ui | 66 +++-- .../channelrx/demoddsc/dscdemodsettings.cpp | 13 +- plugins/channelrx/demoddsc/dscdemodsettings.h | 24 +- plugins/channelrx/demoddsc/dscdemodsink.cpp | 257 ++++++++++++++---- plugins/channelrx/demoddsc/dscdemodsink.h | 32 ++- plugins/channelrx/demoddsc/readme.md | 30 +- .../webapi/doc/swagger/include/DSCDemod.yaml | 5 + sdrbase/util/dsc.cpp | 145 +++++++++- sdrbase/util/dsc.h | 21 +- .../api/swagger/include/DSCDemod.yaml | 5 + .../code/qt5/client/SWGDSCDemodSettings.cpp | 23 +- .../code/qt5/client/SWGDSCDemodSettings.h | 6 + 16 files changed, 575 insertions(+), 116 deletions(-) diff --git a/plugins/channelrx/demoddsc/dscdemod.cpp b/plugins/channelrx/demoddsc/dscdemod.cpp index cc71264f6..70be8c953 100644 --- a/plugins/channelrx/demoddsc/dscdemod.cpp +++ b/plugins/channelrx/demoddsc/dscdemod.cpp @@ -346,7 +346,7 @@ void DSCDemod::sendSampleRateToDemodAnalyzer() MessageQueue *messageQueue = qobject_cast(pipe->m_element); MainCore::MsgChannelDemodReport *msg = MainCore::MsgChannelDemodReport::create( this, - DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE + m_settings.getChannelSampleRate() ); messageQueue->push(msg); } @@ -405,13 +405,20 @@ int DSCDemod::webapiSettingsPutPatch( DSCDemodSettings settings = m_settings; webapiUpdateChannelSettings(settings, channelSettingsKeys, response); - MsgConfigureDSCDemod *msg = MsgConfigureDSCDemod::create(channelSettingsKeys, settings, force); + // A mode change without an explicit bandwidth selects the mode's default + // bandwidth, so that setting must be applied too. + QStringList settingsKeys = channelSettingsKeys; + if (settingsKeys.contains("mode") && !settingsKeys.contains("rfBandwidth")) { + settingsKeys.append("rfBandwidth"); + } + + MsgConfigureDSCDemod *msg = MsgConfigureDSCDemod::create(settingsKeys, settings, force); m_inputMessageQueue.push(msg); qDebug("DSCDemod::webapiSettingsPutPatch: forward to GUI: %p", m_guiMessageQueue); if (m_guiMessageQueue) // forward to GUI if any { - MsgConfigureDSCDemod *msgToGUI = MsgConfigureDSCDemod::create(channelSettingsKeys, settings, force); + MsgConfigureDSCDemod *msgToGUI = MsgConfigureDSCDemod::create(settingsKeys, settings, force); m_guiMessageQueue->push(msgToGUI); } @@ -442,6 +449,14 @@ void DSCDemod::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("rfBandwidth")) { settings.m_rfBandwidth = response.getDscDemodSettings()->getRfBandwidth(); } + if (channelSettingsKeys.contains("mode")) + { + settings.m_mode = response.getDscDemodSettings()->getMode() == (qint32) DSCDemodSettings::ModeVHF + ? DSCDemodSettings::ModeVHF : DSCDemodSettings::ModeMFHF; + if (!channelSettingsKeys.contains("rfBandwidth")) { + settings.m_rfBandwidth = DSCDemodSettings::getDefaultRFBandwidth(settings.m_mode); + } + } if (channelSettingsKeys.contains("filterInvalid")) { settings.m_filterInvalid = response.getDscDemodSettings()->getFilterInvalid(); } @@ -508,6 +523,7 @@ void DSCDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp { response.getDscDemodSettings()->setInputFrequencyOffset(settings.m_inputFrequencyOffset); response.getDscDemodSettings()->setRfBandwidth(settings.m_rfBandwidth); + response.getDscDemodSettings()->setMode((qint32) settings.m_mode); response.getDscDemodSettings()->setFilterInvalid(settings.m_filterInvalid); response.getDscDemodSettings()->setFilterColumn(settings.m_filterColumn); if (response.getDscDemodSettings()->getFilter()) { @@ -653,6 +669,9 @@ void DSCDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("rfBandwidth") || force) { swgDSCDemodSettings->setRfBandwidth(settings.m_rfBandwidth); } + if (channelSettingsKeys.contains("mode") || force) { + swgDSCDemodSettings->setMode((qint32) settings.m_mode); + } if (channelSettingsKeys.contains("filterInvalid") || force) { swgDSCDemodSettings->setFilterInvalid(settings.m_filterInvalid); } @@ -769,5 +788,6 @@ int DSCDemod::getChannelSampleRate() const int DSCDemod::getAudioSampleRate() const { - return DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE; + // Rate the demodulator runs at, which depends on the MF/HF or VHF mode + return m_settings.getChannelSampleRate(); } diff --git a/plugins/channelrx/demoddsc/dscdemodbaseband.cpp b/plugins/channelrx/demoddsc/dscdemodbaseband.cpp index da13e77cd..05dcb9767 100644 --- a/plugins/channelrx/demoddsc/dscdemodbaseband.cpp +++ b/plugins/channelrx/demoddsc/dscdemodbaseband.cpp @@ -160,14 +160,20 @@ bool DSCDemodBaseband::handleMessage(const Message& cmd) void DSCDemodBaseband::applySettings(const QStringList& settingsKeys, const DSCDemodSettings& settings, bool force) { - if ((settingsKeys.contains("inputFrequencyOffset") && (settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset)) || force) + bool frequencyChanged = settingsKeys.contains("inputFrequencyOffset") + && (settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset); + bool modeChanged = settingsKeys.contains("mode") && (settings.m_mode != m_settings.m_mode); + + // Apply the mode first so the sink is configured for the new processing rate + // when the channelizer starts forwarding samples at that rate. + m_sink.applySettings(settingsKeys, settings, force); + + if (frequencyChanged || modeChanged || force) { - m_channelizer->setChannelization(DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE, settings.m_inputFrequencyOffset); + m_channelizer->setChannelization(settings.getChannelSampleRate(), settings.m_inputFrequencyOffset); m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset()); } - m_sink.applySettings(settingsKeys, settings, force); - if (force) { m_settings = settings; } else { @@ -183,5 +189,6 @@ int DSCDemodBaseband::getChannelSampleRate() const void DSCDemodBaseband::setBasebandSampleRate(int sampleRate) { m_channelizer->setBasebandSampleRate(sampleRate); + m_channelizer->setChannelization(m_settings.getChannelSampleRate(), m_settings.m_inputFrequencyOffset); m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset()); } diff --git a/plugins/channelrx/demoddsc/dscdemodgui.cpp b/plugins/channelrx/demoddsc/dscdemodgui.cpp index 8f73921cf..20f76e2c6 100644 --- a/plugins/channelrx/demoddsc/dscdemodgui.cpp +++ b/plugins/channelrx/demoddsc/dscdemodgui.cpp @@ -615,7 +615,7 @@ DSCDemodGUI::DSCDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban ui->scopeGUI->changeTrigger(0, triggerData); ui->scopeGUI->focusOnTrigger(0); // re-focus to take changes into account in the GUI - m_scopeVis->setLiveRate(DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE); + m_scopeVis->setLiveRate(m_settings.getChannelSampleRate()); m_scopeVis->configure(500, 1, 0, 0, true); // not working! //m_scopeVis->setFreeRun(false); // FIXME: add method rather than call m_scopeVis->configure() @@ -1010,6 +1010,8 @@ void DSCDemodGUI::displaySettings() blockApplySettings(true); ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency()); + ui->mode->setCurrentIndex((int) m_settings.m_mode); + m_scopeVis->setLiveRate(m_settings.getChannelSampleRate()); updateIndexLabel(); @@ -1192,9 +1194,25 @@ void DSCDemodGUI::on_useFileTime_toggled(bool checked) applySettings(QStringList({"useFileTime"})); } +void DSCDemodGUI::on_mode_currentIndexChanged(int index) +{ + DSCDemodSettings::Mode mode = index == (int) DSCDemodSettings::ModeVHF + ? DSCDemodSettings::ModeVHF : DSCDemodSettings::ModeMFHF; + + if (mode != m_settings.m_mode) + { + m_settings.m_mode = mode; + m_settings.m_rfBandwidth = DSCDemodSettings::getDefaultRFBandwidth(mode); + m_channelMarker.setBandwidth(m_settings.m_rfBandwidth); + m_scopeVis->setLiveRate(m_settings.getChannelSampleRate()); + applySettings(QStringList({"mode", "rfBandwidth"})); + } +} + void DSCDemodGUI::makeUIConnections() { QObject::connect(ui->deltaFrequency, &ValueDialZ::changed, this, &DSCDemodGUI::on_deltaFrequency_changed); + QObject::connect(ui->mode, QOverload::of(&QComboBox::currentIndexChanged), this, &DSCDemodGUI::on_mode_currentIndexChanged); QObject::connect(ui->filterInvalid, &ButtonSwitch::clicked, this, &DSCDemodGUI::on_filterInvalid_clicked); QObject::connect(ui->filterColumn, QOverload::of(&QComboBox::currentIndexChanged), this, &DSCDemodGUI::on_filterColumn_currentIndexChanged); QObject::connect(ui->filter, &QLineEdit::editingFinished, this, &DSCDemodGUI::on_filter_editingFinished); diff --git a/plugins/channelrx/demoddsc/dscdemodgui.h b/plugins/channelrx/demoddsc/dscdemodgui.h index 127eb9dc6..c8ccd67f5 100644 --- a/plugins/channelrx/demoddsc/dscdemodgui.h +++ b/plugins/channelrx/demoddsc/dscdemodgui.h @@ -140,6 +140,7 @@ private: private slots: void on_deltaFrequency_changed(qint64 value); + void on_mode_currentIndexChanged(int index); void on_filterInvalid_clicked(bool checked=false); void on_filterColumn_currentIndexChanged(int index); void on_filter_editingFinished(); diff --git a/plugins/channelrx/demoddsc/dscdemodgui.ui b/plugins/channelrx/demoddsc/dscdemodgui.ui index 717a27d3f..70cdbb281 100644 --- a/plugins/channelrx/demoddsc/dscdemodgui.ui +++ b/plugins/channelrx/demoddsc/dscdemodgui.ui @@ -29,7 +29,7 @@ - Qt::StrongFocus + Qt::FocusPolicy::StrongFocus Packet Demodulator @@ -110,7 +110,7 @@ PointingHandCursor - Qt::StrongFocus + Qt::FocusPolicy::StrongFocus Demod shift frequency from center in Hz @@ -127,14 +127,14 @@ - Qt::Vertical + Qt::Orientation::Vertical - Qt::Horizontal + Qt::Orientation::Horizontal @@ -152,7 +152,7 @@ Channel power - Qt::RightToLeft + Qt::LayoutDirection::RightToLeft 0.0 @@ -209,7 +209,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -228,7 +228,7 @@ Send messages via UDP - Qt::RightToLeft + Qt::LayoutDirection::RightToLeft @@ -244,7 +244,7 @@ - Qt::ClickFocus + Qt::FocusPolicy::ClickFocus Destination UDP address @@ -263,7 +263,7 @@ : - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -282,7 +282,7 @@ - Qt::ClickFocus + Qt::FocusPolicy::ClickFocus Destination UDP port @@ -298,7 +298,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -308,12 +308,36 @@ + + + + Mode + + + + + + + Select 100 bit/s MF/HF DSC or 1200 bit/s VHF DSC + + + + MF/HF + + + + + VHF + + + + - Qt::Horizontal + Qt::Orientation::Horizontal @@ -515,7 +539,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -663,7 +687,7 @@ Received messages - QAbstractItemView::NoEditTriggers + QAbstractItemView::EditTrigger::NoEditTriggers @@ -951,9 +975,10 @@ - ButtonSwitch - QToolButton -
gui/buttonswitch.h
+ RollupContents + QWidget +
gui/rollupcontents.h
+ 1
ValueDialZ @@ -962,10 +987,9 @@ 1 - RollupContents - QWidget -
gui/rollupcontents.h
- 1 + ButtonSwitch + QToolButton +
gui/buttonswitch.h
LevelMeterSignalDB diff --git a/plugins/channelrx/demoddsc/dscdemodsettings.cpp b/plugins/channelrx/demoddsc/dscdemodsettings.cpp index 23d1d215f..ff6b57ede 100644 --- a/plugins/channelrx/demoddsc/dscdemodsettings.cpp +++ b/plugins/channelrx/demoddsc/dscdemodsettings.cpp @@ -35,7 +35,8 @@ DSCDemodSettings::DSCDemodSettings() : void DSCDemodSettings::resetToDefaults() { m_inputFrequencyOffset = 0; - m_rfBandwidth = 450.0f; // OBW for 2FSK = 2 * deviation + data rate. Then add a bit for carrier frequency offset + m_mode = ModeMFHF; + m_rfBandwidth = getDefaultRFBandwidth(m_mode); // OBW for 2FSK = 2 * deviation + data rate. Then add a bit for carrier frequency offset m_filterInvalid = true; m_filterColumn = 4; m_filter = ""; @@ -78,6 +79,7 @@ QByteArray DSCDemodSettings::serialize() const s.writeBlob(6, m_channelMarker->serialize()); } s.writeFloat(7, m_rfBandwidth); + s.writeS32(8, (qint32) m_mode); s.writeBool(9, m_udpEnabled); s.writeString(10, m_udpAddress); @@ -143,6 +145,9 @@ bool DSCDemodSettings::deserialize(const QByteArray& data) m_channelMarker->deserialize(bytetmp); } d.readFloat(7, &m_rfBandwidth, 450.0f); + qint32 mode; + d.readS32(8, &mode, (qint32) ModeMFHF); + m_mode = mode == (qint32) ModeVHF ? ModeVHF : ModeMFHF; d.readBool(9, &m_udpEnabled); d.readString(10, &m_udpAddress); @@ -216,6 +221,9 @@ void DSCDemodSettings::applySettings(const QStringList& settingsKeys, const DSCD if (settingsKeys.contains("rfBandwidth")) { m_rfBandwidth = settings.m_rfBandwidth; } + if (settingsKeys.contains("mode")) { + m_mode = settings.m_mode; + } if (settingsKeys.contains("filterInvalid")) { m_filterInvalid = settings.m_filterInvalid; } @@ -288,6 +296,9 @@ QString DSCDemodSettings::getDebugString(const QStringList& settingsKeys, bool f if (settingsKeys.contains("rfBandwidth") || force) { ostr << " m_rfBandwidth: " << m_rfBandwidth; } + if (settingsKeys.contains("mode") || force) { + ostr << " m_mode: " << (int) m_mode; + } if (settingsKeys.contains("filterInvalid") || force) { ostr << " m_filterInvalid: " << m_filterInvalid; } diff --git a/plugins/channelrx/demoddsc/dscdemodsettings.h b/plugins/channelrx/demoddsc/dscdemodsettings.h index 85d21afef..dca383d48 100644 --- a/plugins/channelrx/demoddsc/dscdemodsettings.h +++ b/plugins/channelrx/demoddsc/dscdemodsettings.h @@ -23,6 +23,8 @@ #include +#include "dsp/dsptypes.h" + class Serializable; // Number of columns in the table @@ -30,8 +32,14 @@ class Serializable; struct DSCDemodSettings { + enum Mode { + ModeMFHF, + ModeVHF + }; + qint32 m_inputFrequencyOffset; Real m_rfBandwidth; // Not currently in GUI as probably doesn't need to be adjusted + Mode m_mode; bool m_filterInvalid; int m_filterColumn; QString m_filter; @@ -63,11 +71,21 @@ struct DSCDemodSettings int m_columnIndexes[DSCDEMOD_COLUMNS];//!< How the columns are ordered in the table int m_columnSizes[DSCDEMOD_COLUMNS]; //!< Size of the columns in the table - static const int DSCDEMOD_CHANNEL_SAMPLE_RATE = 1000; // Must be integer multiple of baud rate (x10) - static const int DSCDEMOD_BAUD_RATE = 100; - static const int DSCDEMOD_FREQUENCY_SHIFT = 170; + static const int DSCDEMOD_MFHF_CHANNEL_SAMPLE_RATE = 1000; // Must be integer multiple of baud rate (x10) + static const int DSCDEMOD_MFHF_BAUD_RATE = 100; + static const int DSCDEMOD_MFHF_FREQUENCY_SHIFT = 170; + static const int DSCDEMOD_VHF_CHANNEL_SAMPLE_RATE = 48000; + static const int DSCDEMOD_VHF_BAUD_RATE = 1200; + static const int DSCDEMOD_VHF_LOW_TONE = 1300; + static const int DSCDEMOD_VHF_HIGH_TONE = 2100; static const int m_scopeStreams = 10; + int getChannelSampleRate() const { return m_mode == ModeVHF ? DSCDEMOD_VHF_CHANNEL_SAMPLE_RATE : DSCDEMOD_MFHF_CHANNEL_SAMPLE_RATE; } + int getBaudRate() const { return m_mode == ModeVHF ? DSCDEMOD_VHF_BAUD_RATE : DSCDEMOD_MFHF_BAUD_RATE; } + // VHF DSC occupies about 13 kHz. 20 kHz leaves room for a few kHz of tuning + // error without the extra noise of a full 25 kHz channel reducing sensitivity. + static Real getDefaultRFBandwidth(Mode mode) { return mode == ModeVHF ? 20000.0f : 450.0f; } + DSCDemodSettings(); void resetToDefaults(); void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; } diff --git a/plugins/channelrx/demoddsc/dscdemodsink.cpp b/plugins/channelrx/demoddsc/dscdemodsink.cpp index 4c213bad4..7bbd59697 100644 --- a/plugins/channelrx/demoddsc/dscdemodsink.cpp +++ b/plugins/channelrx/demoddsc/dscdemodsink.cpp @@ -19,9 +19,10 @@ #include +#include "util/db.h" +#include "util/popcount.h" #include "dsp/scopevis.h" #include "device/deviceapi.h" -#include "util/db.h" #include "channel/channelwebapiutils.h" #include "dscdemod.h" @@ -31,29 +32,29 @@ DSCDemodSink::DSCDemodSink(DSCDemod *dscDemod) : m_scopeSink(nullptr), m_dscDemod(dscDemod), m_channel(nullptr), - m_channelSampleRate(DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE), + m_channelSampleRate(DSCDemodSettings::DSCDEMOD_MFHF_CHANNEL_SAMPLE_RATE), m_channelFrequencyOffset(0), m_magsqSum(0.0f), m_magsqPeak(0.0f), m_magsqCount(0), m_messageQueueToChannel(nullptr), + m_samplesPerBit(DSCDemodSettings::DSCDEMOD_MFHF_CHANNEL_SAMPLE_RATE / DSCDemodSettings::DSCDEMOD_MFHF_BAUD_RATE), m_exp(nullptr), + m_vhfToneIndex(0), + m_vhfToneCount(0), + m_vhfDC(0.0f), m_data(false), m_dataPrev(false), m_dscDecoder{}, + m_sampleBufferSize(DSCDemodSettings::DSCDEMOD_MFHF_CHANNEL_SAMPLE_RATE / 20), m_sampleBufferIndex(0) { m_magsq = 0.0; - for (int i = 0; i < DSCDemodSettings::m_scopeStreams; i++) { - m_sampleBuffer[i].resize(m_sampleBufferSize); - } + resizeScopeBuffer(); applySettings(QStringList(), m_settings, true); applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, true); - - m_lowpassComplex1.create(301, DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE, DSCDemodSettings::DSCDEMOD_BAUD_RATE * 1.1); - m_lowpassComplex2.create(301, DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE, DSCDemodSettings::DSCDEMOD_BAUD_RATE * 1.1); } DSCDemodSink::~DSCDemodSink() @@ -142,15 +143,35 @@ void DSCDemodSink::processOneSample(Complex &ci) ci /= SDR_RX_SCALEF; + if (m_settings.m_mode == DSCDemodSettings::ModeVHF) { + processVHFSample(ci); + } else { + processMFHFSample(ci); + } +} + +void DSCDemodSink::processMFHFSample(const Complex& ci) +{ + // Correlate with expected frequencies Complex exp = m_exp[m_expIdx]; m_expIdx = (m_expIdx + 1) % m_expLength; Complex corr1 = ci * exp; Complex corr2 = ci * std::conj(exp); - // Low pass filter - Real abs1Filt = std::abs(m_lowpassComplex1.filter(corr1)); - Real abs2Filt = std::abs(m_lowpassComplex2.filter(corr2)); + // Integrate each tone over one bit, which is the matched filter for a bit. + // This rejects more noise than a low pass filter wide enough for the data. + m_mfhfCorr1[m_mfhfCorrIdx] = corr1; + m_mfhfCorr2[m_mfhfCorrIdx] = corr2; + m_mfhfCorrIdx = (m_mfhfCorrIdx + 1) % m_mfhfSamplesPerBit; + Complex sum1, sum2; + for (int i = 0; i < m_mfhfSamplesPerBit; i++) + { + sum1 += m_mfhfCorr1[i]; + sum2 += m_mfhfCorr2[i]; + } + Real abs1Filt = std::abs(sum1) / m_mfhfSamplesPerBit; + Real abs2Filt = std::abs(sum2) / m_mfhfSamplesPerBit; // Envelope calculation m_movMax1(abs1Filt); @@ -165,21 +186,79 @@ void DSCDemodSink::processOneSample(Complex &ci) Real unbiasedData = abs1Filt - abs2Filt; Real biasedData = bias1 - bias2; - // Save current data for edge detection - m_dataPrev = m_data; - // Set data according to strongest correlation - m_data = biasedData > 0; + processData(biasedData > 0, abs1Filt, abs2Filt, unbiasedData, biasedData, ci); +} + +void DSCDemodSink::processVHFSample(const Complex& ci) +{ + // The 800 Hz tone spacing is narrow enough that discriminator linearity + // matters; use the atan2 implementation rather than its wideband approximation. + Real fmDemod = m_phaseDiscri.phaseDiscriminator(ci); + + // Remove receiver tuning error from the audio before tone correlation. + m_vhfDC += 0.001f * (fmDemod - m_vhfDC); + Real audio = fmDemod - m_vhfDC; - // Calculate timing error (we expect clockCount to be 0 when data changes), and add a proportion of it - if (m_data && !m_dataPrev) { - m_clockCount -= m_clockCount * 0.25; + m_vhfToneBuffer[m_vhfToneIndex] = audio; + if (m_vhfToneCount < m_samplesPerBit) { + m_vhfToneCount++; + } + + Real low = 0.0f; + Real high = 0.0f; + + if (m_vhfToneCount == m_samplesPerBit) + { + Complex corrLow(0.0f, 0.0f); + Complex corrHigh(0.0f, 0.0f); + + for (int i = 0; i < m_samplesPerBit; i++) + { + int j = m_vhfToneIndex - i; + if (j < 0) { + j += m_samplesPerBit; + } + corrLow += m_vhfToneExpLow[i] * m_vhfToneBuffer[j]; + corrHigh += m_vhfToneExpHigh[i] * m_vhfToneBuffer[j]; + } + + // VHF DSC applies 6 dB/octave pre-emphasis, so normalize each + // correlation by its tone frequency before comparing them. + low = std::abs(corrLow) / DSCDemodSettings::DSCDEMOD_VHF_LOW_TONE; + high = std::abs(corrHigh) / DSCDemodSettings::DSCDEMOD_VHF_HIGH_TONE; + } + + m_vhfToneIndex = (m_vhfToneIndex + 1) % m_samplesPerBit; + Real data = low - high; + processData(data > 0, low, high, data, data, Complex(audio, 0.0f)); +} + +void DSCDemodSink::processData( + bool data, + Real level1, + Real level2, + Real unbiasedData, + Real biasedData, + const Complex& scopeSample) +{ + // Save current data for edge detection. + m_dataPrev = m_data; + m_data = data; + + // Calculate timing error (we expect clockCount to be 0 when data changes), and add a proportion of it. + // Use both transitions and a high gain to acquire the clock from the dot pattern, which is + // only 20 bits on VHF. Keep tracking at a lower gain during the message, which is long + // enough for transmitter and receiver clock errors to shift the bit timing, but where + // noise on individual transitions should not. + if (m_data != m_dataPrev) { + m_clockCount -= m_clockCount * (m_gotSOP ? 0.05 : 0.2); } m_clockCount += 1.0; if (m_clockCount >= m_samplesPerBit/2.0-1.0) { // Sample in middle of symbol - receiveBit(m_data); + receiveBit(biasedData); m_clock = 1; // Wrap clock counter m_clockCount -= m_samplesPerBit; @@ -189,7 +268,7 @@ void DSCDemodSink::processOneSample(Complex &ci) m_clock = 0; } - sampleToScope(ci, abs1Filt, abs2Filt, unbiasedData, biasedData); + sampleToScope(scopeSample, level1, level2, unbiasedData, biasedData); } const QList DSCDemodSink::m_phasingPatterns = { @@ -205,14 +284,37 @@ const QList DSCDemodSink::m_phasingPatterns = { {0b1101011010'1011111001'0101011011, 0}, // 107 125 106 }; -void DSCDemodSink::receiveBit(bool bit) +void DSCDemodSink::receiveBit(Real soft) { - m_bit = bit; + m_bit = soft > 0.0f; // Store in shift reg m_bits = (m_bits << 1) | m_bit; + if (m_gotSOP && (m_bitCount < 10)) { + m_softBits[m_bitCount] = soft; + } m_bitCount++; + // A phasing sequence while decoding a message means the message was not a real call + // (phasing symbols cannot occur in a message), so restart on the new call. Also + // restart if acquisition allowed bit errors, as it may have been misaligned. + if (m_gotSOP && (!m_dscDecoder.isPhasing() || (m_phasingErrors > 0))) + { + unsigned int pat = m_bits & 0x3fffffff; + for (int i = 0; i < m_phasingPatterns.size(); i++) + { + if (pat == m_phasingPatterns[i].m_pattern) + { + m_dscDecoder.init(m_phasingPatterns[i].m_offset); + m_phasingErrors = 0; + m_bitCount = 0; + m_rssiMagSqSum = 0.0; + m_rssiMagSqCount = 0; + return; + } + } + } + if (!m_gotSOP) { // Dot pattern - 200 1/0s or 20 1/0s @@ -222,26 +324,36 @@ void DSCDemodSink::receiveBit(bool bit) { m_bitCount--; + // Allow a few bit errors, choosing the closest pattern. A false match only + // produces an invalid message, whereas a missed match loses a call. unsigned int pat = m_bits & 0x3fffffff; + int bestIdx = -1; + int bestErrors = m_maxPhasingErrors + 1; for (int i = 0; i < m_phasingPatterns.size(); i++) { - if (pat == m_phasingPatterns[i].m_pattern) + int errors = popcount(pat ^ m_phasingPatterns[i].m_pattern); + if (errors < bestErrors) { - m_dscDecoder.init(m_phasingPatterns[i].m_offset); - m_gotSOP = true; - m_bitCount = 0; - m_rssiMagSqSum = 0.0; - m_rssiMagSqCount = 0; - break; + bestErrors = errors; + bestIdx = i; } } + if (bestIdx >= 0) + { + m_dscDecoder.init(m_phasingPatterns[bestIdx].m_offset); + m_phasingErrors = bestErrors; + m_gotSOP = true; + m_bitCount = 0; + m_rssiMagSqSum = 0.0; + m_rssiMagSqCount = 0; + } } } else { if (m_bitCount == 10) { - if (m_dscDecoder.decodeBits(m_bits & 0x3ff)) + if (m_dscDecoder.decodeSoftBits(m_softBits)) { QDateTime dateTime = QDateTime::currentDateTime(); @@ -265,9 +377,11 @@ void DSCDemodSink::receiveBit(bool bit) //qDebug() << "RX Bytes: " << bytes.toHex(); //qDebug() << "DSC Message: " << message.toString(); + float rssi = m_rssiMagSqCount > 0 + ? CalcDb::dbPower(m_rssiMagSqSum / m_rssiMagSqCount) : -200.0f; + if (getMessageQueueToChannel()) { - float rssi = CalcDb::dbPower(m_rssiMagSqSum / m_rssiMagSqCount); DSCDemod::MsgMessage *msg = DSCDemod::MsgMessage::create(message, m_dscDecoder.getErrors(), rssi); getMessageQueueToChannel()->push(msg); } @@ -295,7 +409,7 @@ void DSCDemodSink::applyChannelSettings(int channelSampleRate, int channelFreque if ((m_channelSampleRate != channelSampleRate) || force) { m_interpolator.create(16, channelSampleRate, m_settings.m_rfBandwidth / 2.2); - m_interpolatorDistance = (Real) channelSampleRate / (Real) DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE; + m_interpolatorDistance = (Real) channelSampleRate / (Real) m_settings.getChannelSampleRate(); m_interpolatorDistanceRemain = m_interpolatorDistance; } @@ -306,6 +420,8 @@ void DSCDemodSink::applyChannelSettings(int channelSampleRate, int channelFreque void DSCDemodSink::init() { m_expIdx = 0; + m_mfhfCorrIdx = 0; + m_phasingErrors = 0; m_bit = 0; m_bits = 0; m_bitCount = 0; @@ -318,37 +434,78 @@ void DSCDemodSink::init() m_rssiMagSqCount = 0; m_consecutiveErrors = 0; m_messageBuffer = ""; + m_phaseDiscri.reset(); + m_vhfToneIndex = 0; + m_vhfToneCount = 0; + m_vhfDC = 0.0f; + std::fill(m_vhfToneBuffer.begin(), m_vhfToneBuffer.end(), 0.0f); } void DSCDemodSink::applySettings(const QStringList& settingsKeys, const DSCDemodSettings& settings, bool force) { qDebug() << "DSCDemodSink::applySettings:" << settings.getDebugString(settingsKeys, force); - if ((settingsKeys.contains("rfBandwidth") && (settings.m_rfBandwidth != m_settings.m_rfBandwidth)) || force) + bool modeChanged = settingsKeys.contains("mode") && (settings.m_mode != m_settings.m_mode); + bool bandwidthChanged = settingsKeys.contains("rfBandwidth") && (settings.m_rfBandwidth != m_settings.m_rfBandwidth); + + if (force) { + m_settings = settings; + } else { + m_settings.applySettings(settingsKeys, settings); + } + + if (bandwidthChanged || modeChanged || force) { - m_interpolator.create(16, m_channelSampleRate, settings.m_rfBandwidth / 2.2); - m_interpolatorDistance = (Real) m_channelSampleRate / (Real) DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE; + m_interpolator.create(16, m_channelSampleRate, m_settings.m_rfBandwidth / 2.2); + m_interpolatorDistance = (Real) m_channelSampleRate / (Real) m_settings.getChannelSampleRate(); m_interpolatorDistanceRemain = m_interpolatorDistance; } - if (force) + if (modeChanged || force) { - delete[] m_exp; - m_exp = new Complex[m_expLength]; - Real f0 = 0.0f; - for (int i = 0; i < m_expLength; i++) - { - m_exp[i] = Complex(cos(f0), sin(f0)); - f0 += 2.0f * (Real)M_PI * (DSCDemodSettings::DSCDEMOD_FREQUENCY_SHIFT/2.0f) / DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE; - } - init(); + configureDemod(); + } +} - m_movMax1.setSize(m_samplesPerBit * 8); - m_movMax2.setSize(m_samplesPerBit * 8); - m_settings = settings; +void DSCDemodSink::configureDemod() +{ + m_samplesPerBit = m_settings.getChannelSampleRate() / m_settings.getBaudRate(); + + delete[] m_exp; + m_exp = new Complex[m_expLength]; + Real phase = 0.0f; + for (int i = 0; i < m_expLength; i++) + { + m_exp[i] = Complex(cos(phase), sin(phase)); + phase += 2.0f * (Real) M_PI * (DSCDemodSettings::DSCDEMOD_MFHF_FREQUENCY_SHIFT / 2.0f) + / DSCDemodSettings::DSCDEMOD_MFHF_CHANNEL_SAMPLE_RATE; } - else + + m_movMax1.setSize(m_samplesPerBit * 8); + m_movMax2.setSize(m_samplesPerBit * 8); + + m_vhfToneBuffer.assign(m_samplesPerBit, 0.0f); + m_vhfToneExpLow.resize(m_samplesPerBit); + m_vhfToneExpHigh.resize(m_samplesPerBit); + for (int i = 0; i < m_samplesPerBit; i++) { - m_settings.applySettings(settingsKeys, settings); + Real lowPhase = 2.0f * (Real) M_PI * DSCDemodSettings::DSCDEMOD_VHF_LOW_TONE * i + / m_settings.getChannelSampleRate(); + Real highPhase = 2.0f * (Real) M_PI * DSCDemodSettings::DSCDEMOD_VHF_HIGH_TONE * i + / m_settings.getChannelSampleRate(); + m_vhfToneExpLow[i] = Complex(cos(lowPhase), sin(lowPhase)); + m_vhfToneExpHigh[i] = Complex(cos(highPhase), sin(highPhase)); + } + + resizeScopeBuffer(); + init(); +} + +void DSCDemodSink::resizeScopeBuffer() +{ + m_sampleBufferSize = std::max(1, m_settings.getChannelSampleRate() / 20); + for (int i = 0; i < DSCDemodSettings::m_scopeStreams; i++) { + m_sampleBuffer[i].resize(m_sampleBufferSize); } + m_sampleBufferIndex = 0; } diff --git a/plugins/channelrx/demoddsc/dscdemodsink.h b/plugins/channelrx/demoddsc/dscdemodsink.h index 67acb2456..dee5bed3e 100644 --- a/plugins/channelrx/demoddsc/dscdemodsink.h +++ b/plugins/channelrx/demoddsc/dscdemodsink.h @@ -23,11 +23,15 @@ #include #include #include +#include +#include +#include #include "dsp/channelsamplesink.h" #include "dsp/nco.h" #include "dsp/interpolator.h" #include "dsp/firfilter.h" +#include "dsp/phasediscri.h" #include "util/movingaverage.h" #include "util/movingmaximum.h" #include "util/messagequeue.h" @@ -112,15 +116,28 @@ private: MovingAverageUtil m_movingAverage; - Lowpass m_lowpassComplex1; - Lowpass m_lowpassComplex2; + static const int m_mfhfSamplesPerBit = DSCDemodSettings::DSCDEMOD_MFHF_CHANNEL_SAMPLE_RATE / DSCDemodSettings::DSCDEMOD_MFHF_BAUD_RATE; + std::array m_mfhfCorr1{}; //!< Last bit of correlation with each tone + std::array m_mfhfCorr2{}; + int m_mfhfCorrIdx; + DSCDecoder::SoftBits m_softBits{}; + static const int m_maxPhasingErrors = 2; //!< Bit errors allowed when acquiring the phasing sequence + int m_phasingErrors; //!< Bit errors in the phasing pattern that was acquired + MovingMaximum m_movMax1; MovingMaximum m_movMax2; static const int m_expLength = 600; - static const int m_samplesPerBit = DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE / DSCDemodSettings::DSCDEMOD_BAUD_RATE; + int m_samplesPerBit; Complex *m_exp; int m_expIdx; + PhaseDiscriminators m_phaseDiscri; + std::vector m_vhfToneBuffer; + std::vector m_vhfToneExpLow; + std::vector m_vhfToneExpHigh; + int m_vhfToneIndex; + int m_vhfToneCount; + Real m_vhfDC; int m_bit; bool m_data; bool m_dataPrev; @@ -141,14 +158,19 @@ private: static const QList m_phasingPatterns; ComplexVector m_sampleBuffer[DSCDemodSettings::m_scopeStreams]; - static const int m_sampleBufferSize = DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE / 20; + int m_sampleBufferSize; int m_sampleBufferIndex; void processOneSample(Complex &ci); + void processMFHFSample(const Complex& ci); + void processVHFSample(const Complex& ci); + void processData(bool data, Real level1, Real level2, Real unbiasedData, Real biasedData, const Complex& scopeSample); + void configureDemod(); + void resizeScopeBuffer(); MessageQueue *getMessageQueueToChannel() { return m_messageQueueToChannel; } void sampleToScope(Complex sample, Real abs1Filt, Real abs2Filt, Real unbiasedData, Real biasedData); void init(); - void receiveBit(bool bit); + void receiveBit(Real soft); }; #endif // INCLUDE_DSCDEMODSINK_H diff --git a/plugins/channelrx/demoddsc/readme.md b/plugins/channelrx/demoddsc/readme.md index f6f2133b8..48d5f3a41 100644 --- a/plugins/channelrx/demoddsc/readme.md +++ b/plugins/channelrx/demoddsc/readme.md @@ -4,7 +4,7 @@ This plugin can be used to demodulate DSC (Digital Selective Calling) transmissions, which are short, pre-defined digital messages transmitted by marine radios. -DSC messages are transmitted using FSK with 170Hz separation at 100 baud, as specified by [ITU-R M.493](https://www.itu.int/dms_pubrec/itu-r/rec/m/R-REC-M.493-15-201901-I!!PDF-E.pdf]). +DSC messages are transmitted as specified by ITU-R M.493. On MF/HF the signal is 100-baud FSK with 170Hz separation. On VHF it uses 1,300Hz and 2,100Hz tones at 1,200 baud over an FM channel. DSC messages can be transmitted on a variety of frequencies, but are most commonly found on: 2,187.5kHz, 8,414.5kHz, 16,804.5kHz and 156.525 MHz (VHF Ch. 70). @@ -40,19 +40,23 @@ IP address of the host to forward received messages to via UDP. UDP port number to forward received messages to. -

7: Filter

+

7: Mode

-This drop down displays a list of all columns which can be used for filtering (8). +Select **MF/HF** or **VHF**. The mode selects the appropriate modulation rate, channel bandwidth and demodulator. Use VHF mode when receiving channel 70. In VHF mode the RF bandwidth is 20kHz, which tolerates a tuning error of about ±3kHz. -

8: Filter Reg Exp

+

8: Filter

-Specifies a [regular expression](https://regexr.com/) used to filter data in the table, using data in the column specified by (7). +This drop down displays a list of all columns which can be used for filtering (9). -

9: Filter Invalid

+

9: Filter Reg Exp

+ +Specifies a [regular expression](https://regexr.com/) used to filter data in the table, using data in the column specified by (8). + +

10: Filter Invalid

When checked, invalid messages will be filtered from the table. -

10: Feed to YaDDNet

+

11: Feed to YaDDNet

When checked, valid messages will be forwarded to [YaDDNet](http://yaddnet.org/). YaDDNet aggregates DSC messages from different users around the world storing them in a searchable database. @@ -60,24 +64,24 @@ The messages are submitted with Preferences > My Position... > Station name used Right click to open http://yaddnet.org/ in your browser, showing recent messages received from this ID. -

11: Use Date and Time from File

+

12: Use Date and Time from File

When checked, if the source device is a File Input device, the date and time used for packet reception time is taken from the file playback time. Otherwise, the current system clock time is used. -

12: Start/stop Logging Messages to .csv File

+

13: Start/stop Logging Messages to .csv File

-When checked, writes all received messages to a .csv file, specified by (13). +When checked, writes all received messages to a .csv file, specified by (14). -

13: .csv Log Filename

+

14: .csv Log Filename

Click to specify the name of the .csv file which received messages are logged to. -

14: Read Data from .csv File

+

15: Read Data from .csv File

Click to specify a previously written .csv log file, which is read and used to update the table. -

15: Received Messages Table

+

16: Received Messages Table

![DSC Demodulator plugin GUI](../../../doc/img/DSCDemod_plugin_messages.png) diff --git a/sdrbase/resources/webapi/doc/swagger/include/DSCDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/DSCDemod.yaml index 509b21a5f..edc35bc81 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DSCDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DSCDemod.yaml @@ -9,6 +9,11 @@ DSCDemodSettings: type: number format: float description: "RF bandwidth in Hz." + mode: + type: integer + description: "DSC demodulation mode (0 MF/HF, 1 VHF)." + minimum: 0 + maximum: 1 filterInvalid: type: integer description: "Filter invalid setting for Dsc demod." diff --git a/sdrbase/util/dsc.cpp b/sdrbase/util/dsc.cpp index 827aec5df..d61356b31 100644 --- a/sdrbase/util/dsc.cpp +++ b/sdrbase/util/dsc.cpp @@ -15,6 +15,8 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include + #include #include "util/dsc.h" @@ -809,6 +811,10 @@ const signed char DSCDecoder::m_expectedSymbols[] = { int DSCDecoder::m_maxBytes = 40; // Max bytes in any message +// A symbol whose soft-decision metric beats the next best symbol by less than +// this fraction of its total soft-decision magnitude is considered weak. +const float DSCDecoder::m_weakMargin = 0.1f; + void DSCDecoder::init(int offset) { if (offset == 0) @@ -823,6 +829,8 @@ void DSCDecoder::init(int offset) m_idx = 0; m_errors = 0; m_bytes = QByteArray(); + m_hardBytes = QByteArray(); + m_margins.clear(); m_eos = false; } @@ -845,6 +853,7 @@ bool DSCDecoder::decodeSymbol(signed char symbol) case FILL_DX: // Fill up buffer + m_softBuf[m_idx] = m_soft; m_buf[m_idx++] = symbol; if (m_idx == BUFFER_SIZE) { @@ -858,8 +867,10 @@ bool DSCDecoder::decodeSymbol(signed char symbol) break; case FILL_RX: - if ( ((m_idx == 1) && (symbol != 106)) - || ((m_idx == 2) && (symbol != 105)) + // RX symbols 105 and 104 fill the two time-diversity slots after + // the six DX phasing characters and before the first repeats. + if ( ((m_idx == 1) && (symbol != 105)) + || ((m_idx == 2) && (symbol != 104)) ) { m_errors++; @@ -869,7 +880,7 @@ bool DSCDecoder::decodeSymbol(signed char symbol) case RX: { - signed char a = selectSymbol(m_buf[m_idx], symbol); + signed char a = selectSymbol(m_buf[m_idx], symbol, m_softBuf[m_idx], m_soft); if (DSCMessage::m_endOfSignalStrings.contains((DSCMessage::EndOfSignal) a)) { m_state = DX_EOS; @@ -881,12 +892,14 @@ bool DSCDecoder::decodeSymbol(signed char symbol) { ret = true; m_state = NO_EOS; + eraseWeakSymbols(); } } break; case DX: // Save received character in buffer + m_softBuf[m_idx] = m_soft; m_buf[m_idx] = symbol; m_idx = (m_idx + 1) % BUFFER_SIZE; m_state = RX; @@ -894,15 +907,17 @@ bool DSCDecoder::decodeSymbol(signed char symbol) case DX_EOS: // Save, EOS symbol + m_softBuf[m_idx] = m_soft; m_buf[m_idx] = symbol; m_idx = (m_idx + 1) % BUFFER_SIZE; m_state = RX_EOS; break; case RX_EOS: - selectSymbol(m_buf[m_idx], symbol); + selectSymbol(m_buf[m_idx], symbol, m_softBuf[m_idx], m_soft); m_state = DONE; ret = true; + eraseWeakSymbols(); break; case DONE: @@ -940,13 +955,99 @@ signed char DSCDecoder::bitsToSymbol(unsigned int bits) // Decode 10-bits to symbols then remove errors using repeated symbols bool DSCDecoder::decodeBits(int bits) { - signed char symbol = bitsToSymbol(bits); - //qDebug() << "Bits2sym: " << Qt::hex << bits << Qt::hex << symbol; - return decodeSymbol(symbol); + SoftBits soft; + for (int i = 0; i < 10; i++) { + soft[i] = ((bits >> (9 - i)) & 1) ? 1.0f : -1.0f; + } + return decodeSoftBits(soft); +} + +// Decode 10 soft decisions to a symbol then remove errors using repeated symbols +bool DSCDecoder::decodeSoftBits(const SoftBits& soft) +{ + unsigned int bits = 0; + for (int i = 0; i < 10; i++) { + bits = (bits << 1) | (soft[i] > 0.0f ? 1 : 0); + } + m_soft = soft; + return decodeSymbol(bitsToSymbol(bits)); +} + +// Prefer the classic selection of a copy without detectable errors, as used before +// soft decision was added, as when that gives a valid message it is at least as +// reliable. Otherwise, use the soft decisions. +QByteArray DSCDecoder::getMessage() const +{ + if (DSCMessage(m_hardBytes, QDateTime()).m_valid || !DSCMessage(m_bytes, QDateTime()).m_valid) { + return m_hardBytes; + } else { + return m_bytes; + } +} + +// The ECC only reliably detects a single wrong symbol. When several soft decisions +// are weak, a wrong combination of them could pass the ECC, so mark them as +// erasures (-1), which makes the message invalid. +void DSCDecoder::eraseWeakSymbols() +{ + int weak = 0; + for (float margin : m_margins) { + weak += margin < m_weakMargin; + } + if (weak > 1) + { + for (int i = 0; i < m_bytes.size(); i++) + { + if (m_margins[i] < m_weakMargin) { + m_bytes[i] = -1; + } + } + } +} + +// Correlation of soft decisions with the 10-bit codeword of a symbol: +// 7 information bits LSB first, then the number of zeros (B-states) MSB first. +float DSCDecoder::symbolMetric(int symbol, const SoftBits& soft) +{ + const int zeros = 7 - popcount((unsigned char) symbol); + float metric = 0.0f; + for (int i = 0; i < 7; i++) { + metric += ((symbol >> i) & 1) ? soft[i] : -soft[i]; + } + for (int i = 0; i < 3; i++) { + metric += ((zeros >> (2 - i)) & 1) ? soft[7 + i] : -soft[7 + i]; + } + return metric; +} + +// Symbol whose codeword best matches the soft decisions, and the metrics of +// the best and next best symbols +int DSCDecoder::bestSymbol(const SoftBits& soft, float& bestMetric, float& nextMetric) +{ + int best = 0; + bestMetric = -1e30f; + nextMetric = -1e30f; + for (int symbol = 0; symbol < 128; symbol++) + { + float metric = symbolMetric(symbol, soft); + if (metric > bestMetric) + { + nextMetric = bestMetric; + bestMetric = metric; + best = symbol; + } + else if (metric > nextMetric) + { + nextMetric = metric; + } + } + return best; } -// Select time diversity symbol without errors -signed char DSCDecoder::selectSymbol(signed char dx, signed char rx) +// Select time diversity symbol. The classic selection uses a copy without +// detectable errors. The soft selection combines both copies and chooses the +// symbol that best matches them, unless both copies agree without errors. +signed char DSCDecoder::selectSymbol(signed char dx, signed char rx, const SoftBits& dxSoft, const SoftBits& rxSoft) { signed char s; if (dx != -1) @@ -963,10 +1064,34 @@ signed char DSCDecoder::selectSymbol(signed char dx, signed char rx) } else { - s = '*'; // Both received characters have errors + s = -1; // Both received characters have errors m_errors += 2; } + m_hardBytes.append(s); + + SoftBits combined; + float scale = 0.0f; + for (int i = 0; i < 10; i++) + { + combined[i] = dxSoft[i] + rxSoft[i]; + scale += std::fabs(combined[i]); + } + float bestMetric, nextMetric; + const int best = bestSymbol(combined, bestMetric, nextMetric); + if ((dx == -1) || (dx != rx)) { + s = best; + } + float margin; + if (scale <= 0.0f) { + margin = 0.0f; + } else if (s == best) { + margin = (bestMetric - nextMetric) / scale; + } else { + margin = (symbolMetric(s, combined) - bestMetric) / scale; + } + m_bytes.append(s); + m_margins.append(margin); return s; } diff --git a/sdrbase/util/dsc.h b/sdrbase/util/dsc.h index d0461c144..f7029c87a 100644 --- a/sdrbase/util/dsc.h +++ b/sdrbase/util/dsc.h @@ -20,9 +20,12 @@ #include "export.h" +#include + #include #include #include +#include // Digital Select Calling // https://www.itu.int/dms_pubrec/itu-r/rec/m/R-REC-M.493-15-201901-I!!PDF-E.pdf @@ -31,9 +34,13 @@ class SDRBASE_API DSCDecoder { public: + typedef std::array SoftBits; //!< Soft decisions in transmission order, positive for binary 1 (B-state) + void init(int offset); bool decodeBits(int bits); - QByteArray getMessage() const { return m_bytes; } + bool decodeSoftBits(const SoftBits& soft); + bool isPhasing() const { return m_state == PHASING; } + QByteArray getMessage() const; int getErrors() const { return m_errors; } static int m_maxBytes; @@ -42,6 +49,10 @@ private: static const int BUFFER_SIZE = 3; signed char m_buf[3]; + SoftBits m_softBuf[3]; + SoftBits m_soft; //!< Soft decisions for the symbol being decoded + QVector m_margins; //!< Soft-decision margin of each symbol in m_bytes + static const float m_weakMargin; enum State { PHASING, FILL_DX, @@ -59,12 +70,16 @@ private: bool m_eos; static const signed char m_expectedSymbols[]; - QByteArray m_bytes; + QByteArray m_bytes; //!< Soft-decision symbols, with weak symbols erased (-1) + QByteArray m_hardBytes; //!< Symbols from a copy without detectable errors, else -1 bool decodeSymbol(signed char symbol); + void eraseWeakSymbols(); static signed char bitsToSymbol(unsigned int bits); static unsigned char reverse(unsigned char b); - signed char selectSymbol(signed char dx, signed char rx); + signed char selectSymbol(signed char dx, signed char rx, const SoftBits& dxSoft, const SoftBits& rxSoft); + static float symbolMetric(int symbol, const SoftBits& soft); + static int bestSymbol(const SoftBits& soft, float& bestMetric, float& nextMetric); }; diff --git a/swagger/sdrangel/api/swagger/include/DSCDemod.yaml b/swagger/sdrangel/api/swagger/include/DSCDemod.yaml index eb87c0b6e..0c65516fe 100644 --- a/swagger/sdrangel/api/swagger/include/DSCDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/DSCDemod.yaml @@ -9,6 +9,11 @@ DSCDemodSettings: type: number format: float description: "RF bandwidth in Hz." + mode: + type: integer + description: "DSC demodulation mode (0 MF/HF, 1 VHF)." + minimum: 0 + maximum: 1 filterInvalid: type: integer description: "Filter invalid setting for Dsc demod." diff --git a/swagger/sdrangel/code/qt5/client/SWGDSCDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDSCDemodSettings.cpp index 100d347f3..60e3196fa 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDSCDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGDSCDemodSettings.cpp @@ -32,6 +32,8 @@ SWGDSCDemodSettings::SWGDSCDemodSettings() { m_input_frequency_offset_isSet = false; rf_bandwidth = 0.0f; m_rf_bandwidth_isSet = false; + mode = 0; + m_mode_isSet = false; filter_invalid = 0; m_filter_invalid_isSet = false; filter_column = 0; @@ -84,6 +86,8 @@ SWGDSCDemodSettings::init() { m_input_frequency_offset_isSet = false; rf_bandwidth = 0.0f; m_rf_bandwidth_isSet = false; + mode = 0; + m_mode_isSet = false; filter_invalid = 0; m_filter_invalid_isSet = false; filter_column = 0; @@ -182,6 +186,8 @@ SWGDSCDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&input_frequency_offset, pJson["inputFrequencyOffset"], "qint64", ""); ::SWGSDRangel::setValue(&rf_bandwidth, pJson["rfBandwidth"], "float", ""); + + ::SWGSDRangel::setValue(&mode, pJson["mode"], "qint32", ""); ::SWGSDRangel::setValue(&filter_invalid, pJson["filterInvalid"], "qint32", ""); @@ -245,6 +251,9 @@ SWGDSCDemodSettings::asJsonObject() { if(m_rf_bandwidth_isSet){ obj->insert("rfBandwidth", QJsonValue(rf_bandwidth)); } + if(m_mode_isSet){ + obj->insert("mode", QJsonValue(mode)); + } if(m_filter_invalid_isSet){ obj->insert("filterInvalid", QJsonValue(filter_invalid)); } @@ -329,6 +338,16 @@ SWGDSCDemodSettings::setRfBandwidth(float rf_bandwidth) { this->m_rf_bandwidth_isSet = true; } +qint32 +SWGDSCDemodSettings::getMode() { + return mode; +} +void +SWGDSCDemodSettings::setMode(qint32 mode) { + this->mode = mode; + this->m_mode_isSet = true; +} + qint32 SWGDSCDemodSettings::getFilterInvalid() { return filter_invalid; @@ -540,6 +559,9 @@ SWGDSCDemodSettings::isSet(){ if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break; } + if(m_mode_isSet){ + isObjectUpdated = true; break; + } if(m_filter_invalid_isSet){ isObjectUpdated = true; break; } @@ -604,4 +626,3 @@ SWGDSCDemodSettings::isSet(){ return isObjectUpdated; } } - diff --git a/swagger/sdrangel/code/qt5/client/SWGDSCDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGDSCDemodSettings.h index c441a4ec8..444fe4d17 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDSCDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGDSCDemodSettings.h @@ -51,6 +51,9 @@ public: float getRfBandwidth(); void setRfBandwidth(float rf_bandwidth); + qint32 getMode(); + void setMode(qint32 mode); + qint32 getFilterInvalid(); void setFilterInvalid(qint32 filter_invalid); @@ -121,6 +124,9 @@ private: float rf_bandwidth; bool m_rf_bandwidth_isSet; + qint32 mode; + bool m_mode_isSet; + qint32 filter_invalid; bool m_filter_invalid_isSet;