VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-05 06:37:51 -04:00
Code Issues Projects Releases Wiki Activity

DSD demod: use buffered squelch to start decoding at the very beginning of the transmission regardless of squelch gate length

Browse Source
This commit is contained in:
f4exb 2018-04-21 09:56:12 +02:00
parent 12f5f4e30c
commit 84538f1acf
2 changed files with 218 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,7 @@ DSDDemod::DSDDemod(DeviceSourceAPI *deviceAPI) :
m_squelchGate(0), m_squelchGate(0),
m_squelchLevel(1e-4), m_squelchLevel(1e-4),
m_squelchOpen(false), m_squelchOpen(false),
m_squelchDelayLine(24000),
m_audioFifo1(48000), m_audioFifo1(48000),
m_audioFifo2(48000), m_audioFifo2(48000),
m_scopeXY(0), m_scopeXY(0),
@ -143,6 +144,8 @@ void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
if (m_movingAverage.asDouble() > m_squelchLevel) if (m_movingAverage.asDouble() > m_squelchLevel)
{ {
m_squelchDelayLine.write(demod);
if (m_squelchGate > 0) if (m_squelchGate > 0)
{ {
if (m_squelchCount < m_squelchGate) { if (m_squelchCount < m_squelchGate) {
@ -158,14 +161,17 @@ void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
} }
else else
{ {
m_squelchDelayLine.write(0);
m_squelchCount = 0; m_squelchCount = 0;
m_squelchOpen = false; m_squelchOpen = false;
} }
if (m_squelchOpen) if (m_squelchOpen)
{ {
sampleDSD = demod * 32768.0f; // DSD decoder takes int16 samples sampleDSD = m_squelchDelayLine.readBack(m_squelchGate) * 32768.0f; // DSD decoder takes int16 samples
sample = demod * SDR_RX_SCALEF; // scale to sample size sample = m_squelchDelayLine.readBack(m_squelchGate) * SDR_RX_SCALEF; // scale to sample size
// sampleDSD = demod * 32768.0f; // DSD decoder takes int16 samples
// sample = demod * SDR_RX_SCALEF; // scale to sample size
} }
else else
{ {

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

@ -1,209 +1,210 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2016 F4EXB // // Copyright (C) 2016 F4EXB //
// written by Edouard Griffiths // // written by Edouard Griffiths //
// // // //
// This program is free software; you can redistribute it and/or modify // // This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by // // it under the terms of the GNU General Public License as published by //
// the Free Software Foundation as version 3 of the License, or // // the Free Software Foundation as version 3 of the License, or //
// // // //
// This program is distributed in the hope that it will be useful, // // This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of // // but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License V3 for more details. // // GNU General Public License V3 for more details. //
// // // //
// You should have received a copy of the GNU General Public License // // You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#ifndef INCLUDE_DSDDEMOD_H #ifndef INCLUDE_DSDDEMOD_H
#define INCLUDE_DSDDEMOD_H #define INCLUDE_DSDDEMOD_H
#include <QMutex> #include <QMutex>
#include <vector> #include <vector>
#include "dsp/basebandsamplesink.h" #include "dsp/basebandsamplesink.h"
#include "channel/channelsinkapi.h" #include "channel/channelsinkapi.h"
#include "dsp/phasediscri.h" #include "dsp/phasediscri.h"
#include "dsp/nco.h" #include "dsp/nco.h"
#include "dsp/interpolator.h" #include "dsp/interpolator.h"
#include "dsp/lowpass.h" #include "dsp/lowpass.h"
#include "dsp/bandpass.h" #include "dsp/bandpass.h"
#include "dsp/afsquelch.h" #include "dsp/afsquelch.h"
#include "util/movingaverage.h" #include "util/movingaverage.h"
#include "dsp/afsquelch.h" #include "dsp/afsquelch.h"
#include "audio/audiofifo.h" #include "audio/audiofifo.h"
#include "util/message.h" #include "util/message.h"
#include "util/udpsink.h" #include "util/udpsink.h"
#include "util/doublebufferfifo.h"
#include "dsddemodsettings.h"
#include "dsddecoder.h" #include "dsddemodsettings.h"
#include "dsddecoder.h"
class DeviceSourceAPI;
class ThreadedBasebandSampleSink; class DeviceSourceAPI;
class DownChannelizer; class ThreadedBasebandSampleSink;
class DownChannelizer;
class DSDDemod : public BasebandSampleSink, public ChannelSinkAPI {
public: class DSDDemod : public BasebandSampleSink, public ChannelSinkAPI {
class MsgConfigureDSDDemod : public Message { public:
MESSAGE_CLASS_DECLARATION class MsgConfigureDSDDemod : public Message {
MESSAGE_CLASS_DECLARATION
public:
const DSDDemodSettings& getSettings() const { return m_settings; } public:
bool getForce() const { return m_force; } const DSDDemodSettings& getSettings() const { return m_settings; }
bool getForce() const { return m_force; }
static MsgConfigureDSDDemod* create(const DSDDemodSettings& settings, bool force)
{ static MsgConfigureDSDDemod* create(const DSDDemodSettings& settings, bool force)
return new MsgConfigureDSDDemod(settings, force); {
} return new MsgConfigureDSDDemod(settings, force);
}
private:
DSDDemodSettings m_settings; private:
bool m_force; DSDDemodSettings m_settings;
bool m_force;
MsgConfigureDSDDemod(const DSDDemodSettings& settings, bool force) :
Message(), MsgConfigureDSDDemod(const DSDDemodSettings& settings, bool force) :
m_settings(settings), Message(),
m_force(force) m_settings(settings),
{ } m_force(force)
}; { }
};
class MsgConfigureChannelizer : public Message {
MESSAGE_CLASS_DECLARATION class MsgConfigureChannelizer : public Message {
MESSAGE_CLASS_DECLARATION
public:
int getSampleRate() const { return m_sampleRate; } public:
int getCenterFrequency() const { return m_centerFrequency; } int getSampleRate() const { return m_sampleRate; }
int getCenterFrequency() const { return m_centerFrequency; }
static MsgConfigureChannelizer* create(int sampleRate, int centerFrequency)
{ static MsgConfigureChannelizer* create(int sampleRate, int centerFrequency)
return new MsgConfigureChannelizer(sampleRate, centerFrequency); {
} return new MsgConfigureChannelizer(sampleRate, centerFrequency);
}
private:
int m_sampleRate; private:
int m_centerFrequency; int m_sampleRate;
int m_centerFrequency;
MsgConfigureChannelizer(int sampleRate, int centerFrequency) :
Message(), MsgConfigureChannelizer(int sampleRate, int centerFrequency) :
m_sampleRate(sampleRate), Message(),
m_centerFrequency(centerFrequency) m_sampleRate(sampleRate),
{ } m_centerFrequency(centerFrequency)
}; { }
};
DSDDemod(DeviceSourceAPI *deviceAPI);
~DSDDemod(); DSDDemod(DeviceSourceAPI *deviceAPI);
virtual void destroy() { delete this; } ~DSDDemod();
void setScopeXYSink(BasebandSampleSink* sampleSink) { m_scopeXY = sampleSink; } virtual void destroy() { delete this; }
void setScopeXYSink(BasebandSampleSink* sampleSink) { m_scopeXY = sampleSink; }
void configureMyPosition(MessageQueue* messageQueue, float myLatitude, float myLongitude);
void configureMyPosition(MessageQueue* messageQueue, float myLatitude, float myLongitude);
virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
virtual void start(); virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
virtual void stop(); virtual void start();
virtual bool handleMessage(const Message& cmd); virtual void stop();
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
virtual QByteArray serialize() const;
virtual bool deserialize(const QByteArray& data); virtual QByteArray serialize() const;
virtual bool deserialize(const QByteArray& data);
double getMagSq() { return m_magsq; }
bool getSquelchOpen() const { return m_squelchOpen; } double getMagSq() { return m_magsq; }
bool getSquelchOpen() const { return m_squelchOpen; }
const DSDDecoder& getDecoder() const { return m_dsdDecoder; }
const DSDDecoder& getDecoder() const { return m_dsdDecoder; }
void getMagSqLevels(double& avg, double& peak, int& nbSamples)
{ void getMagSqLevels(double& avg, double& peak, int& nbSamples)
avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount; {
m_magsq = avg; avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount;
peak = m_magsqPeak == 0.0 ? 1e-10 : m_magsqPeak; m_magsq = avg;
nbSamples = m_magsqCount == 0 ? 1 : m_magsqCount; peak = m_magsqPeak == 0.0 ? 1e-10 : m_magsqPeak;
m_magsqSum = 0.0f; nbSamples = m_magsqCount == 0 ? 1 : m_magsqCount;
m_magsqPeak = 0.0f; m_magsqSum = 0.0f;
m_magsqCount = 0; m_magsqPeak = 0.0f;
} m_magsqCount = 0;
}
static const QString m_channelIdURI;
static const QString m_channelId; static const QString m_channelIdURI;
static const QString m_channelId;
private:
class MsgConfigureMyPosition : public Message { private:
MESSAGE_CLASS_DECLARATION class MsgConfigureMyPosition : public Message {
MESSAGE_CLASS_DECLARATION
public:
float getMyLatitude() const { return m_myLatitude; } public:
float getMyLongitude() const { return m_myLongitude; } float getMyLatitude() const { return m_myLatitude; }
float getMyLongitude() const { return m_myLongitude; }
static MsgConfigureMyPosition* create(float myLatitude, float myLongitude)
{ static MsgConfigureMyPosition* create(float myLatitude, float myLongitude)
return new MsgConfigureMyPosition(myLatitude, myLongitude); {
} return new MsgConfigureMyPosition(myLatitude, myLongitude);
}
private:
float m_myLatitude; private:
float m_myLongitude; float m_myLatitude;
float m_myLongitude;
MsgConfigureMyPosition(float myLatitude, float myLongitude) :
m_myLatitude(myLatitude), MsgConfigureMyPosition(float myLatitude, float myLongitude) :
m_myLongitude(myLongitude) m_myLatitude(myLatitude),
{} m_myLongitude(myLongitude)
}; {}
};
enum RateState {
RSInitialFill, enum RateState {
RSRunning RSInitialFill,
}; RSRunning
};
DeviceSourceAPI *m_deviceAPI;
ThreadedBasebandSampleSink* m_threadedChannelizer; DeviceSourceAPI *m_deviceAPI;
DownChannelizer* m_channelizer; ThreadedBasebandSampleSink* m_threadedChannelizer;
DownChannelizer* m_channelizer;
int m_inputSampleRate;
int m_inputFrequencyOffset; int m_inputSampleRate;
DSDDemodSettings m_settings; int m_inputFrequencyOffset;
quint32 m_audioSampleRate; DSDDemodSettings m_settings;
quint32 m_audioSampleRate;
NCO m_nco;
Interpolator m_interpolator; NCO m_nco;
Real m_interpolatorDistance; Interpolator m_interpolator;
Real m_interpolatorDistanceRemain; Real m_interpolatorDistance;
int m_sampleCount; Real m_interpolatorDistanceRemain;
int m_squelchCount; int m_sampleCount;
int m_squelchGate; int m_squelchCount;
int m_squelchGate;
double m_squelchLevel; double m_squelchLevel;
bool m_squelchOpen; bool m_squelchOpen;
DoubleBufferFIFO<Real> m_squelchDelayLine;
MovingAverageUtil<Real, double, 16> m_movingAverage;
double m_magsq; MovingAverageUtil<Real, double, 16> m_movingAverage;
double m_magsqSum; double m_magsq;
double m_magsqPeak; double m_magsqSum;
int m_magsqCount; double m_magsqPeak;
int m_magsqCount;
SampleVector m_scopeSampleBuffer;
AudioVector m_audioBuffer; SampleVector m_scopeSampleBuffer;
uint m_audioBufferFill; AudioVector m_audioBuffer;
FixReal *m_sampleBuffer; //!< samples ring buffer uint m_audioBufferFill;
int m_sampleBufferIndex; FixReal *m_sampleBuffer; //!< samples ring buffer
int m_scaleFromShort; int m_sampleBufferIndex;
int m_scaleFromShort;
AudioFifo m_audioFifo1;
AudioFifo m_audioFifo2; AudioFifo m_audioFifo1;
BasebandSampleSink* m_scopeXY; AudioFifo m_audioFifo2;
bool m_scopeEnabled; BasebandSampleSink* m_scopeXY;
bool m_scopeEnabled;
DSDDecoder m_dsdDecoder;
QMutex m_settingsMutex; DSDDecoder m_dsdDecoder;
QMutex m_settingsMutex;
PhaseDiscriminators m_phaseDiscri;
PhaseDiscriminators m_phaseDiscri;
static const int m_udpBlockSize;
static const int m_udpBlockSize;
void applyAudioSampleRate(int sampleRate);
void applyChannelSettings(int inputSampleRate, int inputFrequencyOffset, bool force = false); void applyAudioSampleRate(int sampleRate);
void applySettings(const DSDDemodSettings& settings, bool force = false); void applyChannelSettings(int inputSampleRate, int inputFrequencyOffset, bool force = false);
}; void applySettings(const DSDDemodSettings& settings, bool force = false);
};
#endif // INCLUDE_DSDDEMOD_H
#endif // INCLUDE_DSDDEMOD_H