mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-07-26 03:54:30 -04:00
Rx plugins: refactoring of classes (1)
This commit is contained in:
f4exb
@@ -26,6 +26,7 @@
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkReply>
|
||||
#include <QBuffer>
|
||||
#include <QThread>
|
||||
|
||||
#include "SWGChannelSettings.h"
|
||||
#include "SWGDSDDemodSettings.h"
|
||||
@@ -33,20 +34,14 @@
|
||||
#include "SWGDSDDemodReport.h"
|
||||
#include "SWGRDSReport.h"
|
||||
|
||||
#include "audio/audiooutput.h"
|
||||
#include "dsp/dspengine.h"
|
||||
#include "dsp/threadedbasebandsamplesink.h"
|
||||
#include "dsp/downchannelizer.h"
|
||||
#include "dsp/dspcommands.h"
|
||||
#include "dsp/devicesamplemimo.h"
|
||||
#include "device/deviceapi.h"
|
||||
#include "util/db.h"
|
||||
|
||||
#include "dsddemod.h"
|
||||
|
||||
MESSAGE_CLASS_DEFINITION(DSDDemod::MsgConfigureChannelizer, Message)
|
||||
MESSAGE_CLASS_DEFINITION(DSDDemod::MsgConfigureDSDDemod, Message)
|
||||
MESSAGE_CLASS_DEFINITION(DSDDemod::MsgConfigureMyPosition, Message)
|
||||
|
||||
const QString DSDDemod::m_channelIdURI = "sdrangel.channel.dsddemod";
|
||||
const QString DSDDemod::m_channelId = "DSDDemod";
|
||||
@@ -55,50 +50,17 @@ const int DSDDemod::m_udpBlockSize = 512;
|
||||
DSDDemod::DSDDemod(DeviceAPI *deviceAPI) :
|
||||
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
|
||||
m_deviceAPI(deviceAPI),
|
||||
m_inputSampleRate(48000),
|
||||
m_inputFrequencyOffset(0),
|
||||
m_interpolatorDistance(0.0f),
|
||||
m_interpolatorDistanceRemain(0.0f),
|
||||
m_sampleCount(0),
|
||||
m_squelchCount(0),
|
||||
m_squelchGate(0),
|
||||
m_squelchLevel(1e-4),
|
||||
m_squelchOpen(false),
|
||||
m_squelchDelayLine(24000),
|
||||
m_audioFifo1(48000),
|
||||
m_audioFifo2(48000),
|
||||
m_scopeXY(0),
|
||||
m_scopeEnabled(true),
|
||||
m_dsdDecoder(),
|
||||
m_signalFormat(signalFormatNone),
|
||||
m_settingsMutex(QMutex::Recursive)
|
||||
m_basebandSampleRate(0)
|
||||
{
|
||||
qDebug("DSDDemod::DSDDemod");
|
||||
setObjectName(m_channelId);
|
||||
|
||||
m_audioBuffer.resize(1<<14);
|
||||
m_audioBufferFill = 0;
|
||||
m_thread = new QThread(this);
|
||||
m_basebandSink = new DSDDemodBaseband();
|
||||
m_basebandSink->moveToThread(m_thread);
|
||||
|
||||
m_sampleBuffer = new FixReal[1<<17]; // 128 kS
|
||||
m_sampleBufferIndex = 0;
|
||||
m_scaleFromShort = SDR_RX_SAMP_SZ < sizeof(short)*8 ? 1 : 1<<(SDR_RX_SAMP_SZ - sizeof(short)*8);
|
||||
|
||||
m_magsq = 0.0f;
|
||||
m_magsqSum = 0.0f;
|
||||
m_magsqPeak = 0.0f;
|
||||
m_magsqCount = 0;
|
||||
|
||||
DSPEngine::instance()->getAudioDeviceManager()->addAudioSink(&m_audioFifo1, getInputMessageQueue());
|
||||
DSPEngine::instance()->getAudioDeviceManager()->addAudioSink(&m_audioFifo2, getInputMessageQueue());
|
||||
m_audioSampleRate = DSPEngine::instance()->getAudioDeviceManager()->getOutputSampleRate();
|
||||
|
||||
applyChannelSettings(m_inputSampleRate, m_inputFrequencyOffset, true);
|
||||
applySettings(m_settings, true);
|
||||
|
||||
m_channelizer = new DownChannelizer(this);
|
||||
m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this);
|
||||
m_deviceAPI->addChannelSink(m_threadedChannelizer);
|
||||
m_deviceAPI->addChannelSinkAPI(this);
|
||||
|
||||
m_networkManager = new QNetworkAccessManager();
|
||||
connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));
|
||||
}
|
||||
@@ -107,20 +69,10 @@ DSDDemod::~DSDDemod()
|
||||
{
|
||||
disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));
|
||||
delete m_networkManager;
|
||||
delete[] m_sampleBuffer;
|
||||
DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(&m_audioFifo1);
|
||||
DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(&m_audioFifo2);
|
||||
|
||||
m_deviceAPI->removeChannelSinkAPI(this);
|
||||
m_deviceAPI->removeChannelSink(m_threadedChannelizer);
|
||||
delete m_threadedChannelizer;
|
||||
delete m_channelizer;
|
||||
}
|
||||
|
||||
void DSDDemod::configureMyPosition(MessageQueue* messageQueue, float myLatitude, float myLongitude)
|
||||
{
|
||||
Message* cmd = MsgConfigureMyPosition::create(myLatitude, myLongitude);
|
||||
messageQueue->push(cmd);
|
||||
m_deviceAPI->removeChannelSinkAPI(this);
|
||||
m_deviceAPI->removeChannelSink(this);
|
||||
delete m_basebandSink;
|
||||
delete m_thread;
|
||||
}
|
||||
|
||||
uint32_t DSDDemod::getNumberOfDeviceStreams() const
|
||||
@@ -131,269 +83,33 @@ uint32_t DSDDemod::getNumberOfDeviceStreams() const
|
||||
void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst)
|
||||
{
|
||||
(void) firstOfBurst;
|
||||
Complex ci;
|
||||
int samplesPerSymbol = m_dsdDecoder.getSamplesPerSymbol();
|
||||
|
||||
m_settingsMutex.lock();
|
||||
m_scopeSampleBuffer.clear();
|
||||
|
||||
m_dsdDecoder.enableMbelib(!DSPEngine::instance()->hasDVSerialSupport()); // disable mbelib if DV serial support is present and activated else enable it
|
||||
|
||||
for (SampleVector::const_iterator it = begin; it != end; ++it)
|
||||
{
|
||||
Complex c(it->real(), it->imag());
|
||||
c *= m_nco.nextIQ();
|
||||
|
||||
if (m_interpolator.decimate(&m_interpolatorDistanceRemain, c, &ci))
|
||||
{
|
||||
FixReal sample, delayedSample;
|
||||
qint16 sampleDSD;
|
||||
|
||||
Real re = ci.real() / SDR_RX_SCALED;
|
||||
Real im = ci.imag() / SDR_RX_SCALED;
|
||||
Real magsq = re*re + im*im;
|
||||
m_movingAverage(magsq);
|
||||
|
||||
m_magsqSum += magsq;
|
||||
|
||||
if (magsq > m_magsqPeak)
|
||||
{
|
||||
m_magsqPeak = magsq;
|
||||
}
|
||||
|
||||
m_magsqCount++;
|
||||
|
||||
Real demod = m_phaseDiscri.phaseDiscriminator(ci) * m_settings.m_demodGain; // [-1.0:1.0]
|
||||
m_sampleCount++;
|
||||
|
||||
// AF processing
|
||||
|
||||
if (m_movingAverage.asDouble() > m_squelchLevel)
|
||||
{
|
||||
if (m_squelchGate > 0)
|
||||
{
|
||||
|
||||
if (m_squelchCount < m_squelchGate*2) {
|
||||
m_squelchCount++;
|
||||
}
|
||||
|
||||
m_squelchDelayLine.write(demod);
|
||||
m_squelchOpen = m_squelchCount > m_squelchGate;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_squelchOpen = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_squelchGate > 0)
|
||||
{
|
||||
if (m_squelchCount > 0) {
|
||||
m_squelchCount--;
|
||||
}
|
||||
|
||||
m_squelchDelayLine.write(0);
|
||||
m_squelchOpen = m_squelchCount > m_squelchGate;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_squelchOpen = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (m_squelchOpen)
|
||||
{
|
||||
if (m_squelchGate > 0)
|
||||
{
|
||||
sampleDSD = m_squelchDelayLine.readBack(m_squelchGate) * 32768.0f; // DSD decoder takes int16 samples
|
||||
sample = m_squelchDelayLine.readBack(m_squelchGate) * SDR_RX_SCALEF; // scale to sample size
|
||||
}
|
||||
else
|
||||
{
|
||||
sampleDSD = demod * 32768.0f; // DSD decoder takes int16 samples
|
||||
sample = demod * SDR_RX_SCALEF; // scale to sample size
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
sampleDSD = 0;
|
||||
sample = 0;
|
||||
}
|
||||
|
||||
m_dsdDecoder.pushSample(sampleDSD);
|
||||
|
||||
if (m_settings.m_enableCosineFiltering) { // show actual input to FSK demod
|
||||
sample = m_dsdDecoder.getFilteredSample() * m_scaleFromShort;
|
||||
}
|
||||
|
||||
if (m_sampleBufferIndex < (1<<17)-1) {
|
||||
m_sampleBufferIndex++;
|
||||
} else {
|
||||
m_sampleBufferIndex = 0;
|
||||
}
|
||||
|
||||
m_sampleBuffer[m_sampleBufferIndex] = sample;
|
||||
|
||||
if (m_sampleBufferIndex < samplesPerSymbol) {
|
||||
delayedSample = m_sampleBuffer[(1<<17) - samplesPerSymbol + m_sampleBufferIndex]; // wrap
|
||||
} else {
|
||||
delayedSample = m_sampleBuffer[m_sampleBufferIndex - samplesPerSymbol];
|
||||
}
|
||||
|
||||
if (m_settings.m_syncOrConstellation)
|
||||
{
|
||||
Sample s(sample, m_dsdDecoder.getSymbolSyncSample() * m_scaleFromShort * 0.84);
|
||||
m_scopeSampleBuffer.push_back(s);
|
||||
}
|
||||
else
|
||||
{
|
||||
Sample s(sample, delayedSample); // I=signal, Q=signal delayed by 20 samples (2400 baud: lowest rate)
|
||||
m_scopeSampleBuffer.push_back(s);
|
||||
}
|
||||
|
||||
if (DSPEngine::instance()->hasDVSerialSupport())
|
||||
{
|
||||
if ((m_settings.m_slot1On) && m_dsdDecoder.mbeDVReady1())
|
||||
{
|
||||
if (!m_settings.m_audioMute)
|
||||
{
|
||||
DSPEngine::instance()->pushMbeFrame(
|
||||
m_dsdDecoder.getMbeDVFrame1(),
|
||||
m_dsdDecoder.getMbeRateIndex(),
|
||||
m_settings.m_volume * 10.0,
|
||||
m_settings.m_tdmaStereo ? 1 : 3, // left or both channels
|
||||
m_settings.m_highPassFilter,
|
||||
m_audioSampleRate/8000, // upsample from native 8k
|
||||
&m_audioFifo1);
|
||||
}
|
||||
|
||||
m_dsdDecoder.resetMbeDV1();
|
||||
}
|
||||
|
||||
if ((m_settings.m_slot2On) && m_dsdDecoder.mbeDVReady2())
|
||||
{
|
||||
if (!m_settings.m_audioMute)
|
||||
{
|
||||
DSPEngine::instance()->pushMbeFrame(
|
||||
m_dsdDecoder.getMbeDVFrame2(),
|
||||
m_dsdDecoder.getMbeRateIndex(),
|
||||
m_settings.m_volume * 10.0,
|
||||
m_settings.m_tdmaStereo ? 2 : 3, // right or both channels
|
||||
m_settings.m_highPassFilter,
|
||||
m_audioSampleRate/8000, // upsample from native 8k
|
||||
&m_audioFifo2);
|
||||
}
|
||||
|
||||
m_dsdDecoder.resetMbeDV2();
|
||||
}
|
||||
}
|
||||
|
||||
// if (DSPEngine::instance()->hasDVSerialSupport() && m_dsdDecoder.mbeDVReady1())
|
||||
// {
|
||||
// if (!m_settings.m_audioMute)
|
||||
// {
|
||||
// DSPEngine::instance()->pushMbeFrame(m_dsdDecoder.getMbeDVFrame1(), m_dsdDecoder.getMbeRateIndex(), m_settings.m_volume, &m_audioFifo1);
|
||||
// }
|
||||
//
|
||||
// m_dsdDecoder.resetMbeDV1();
|
||||
// }
|
||||
|
||||
m_interpolatorDistanceRemain += m_interpolatorDistance;
|
||||
}
|
||||
}
|
||||
|
||||
if (!DSPEngine::instance()->hasDVSerialSupport())
|
||||
{
|
||||
if (m_settings.m_slot1On)
|
||||
{
|
||||
int nbAudioSamples;
|
||||
short *dsdAudio = m_dsdDecoder.getAudio1(nbAudioSamples);
|
||||
|
||||
if (nbAudioSamples > 0)
|
||||
{
|
||||
if (!m_settings.m_audioMute) {
|
||||
m_audioFifo1.write((const quint8*) dsdAudio, nbAudioSamples);
|
||||
}
|
||||
|
||||
m_dsdDecoder.resetAudio1();
|
||||
}
|
||||
}
|
||||
|
||||
if (m_settings.m_slot2On)
|
||||
{
|
||||
int nbAudioSamples;
|
||||
short *dsdAudio = m_dsdDecoder.getAudio2(nbAudioSamples);
|
||||
|
||||
if (nbAudioSamples > 0)
|
||||
{
|
||||
if (!m_settings.m_audioMute) {
|
||||
m_audioFifo2.write((const quint8*) dsdAudio, nbAudioSamples);
|
||||
}
|
||||
|
||||
m_dsdDecoder.resetAudio2();
|
||||
}
|
||||
}
|
||||
|
||||
// int nbAudioSamples;
|
||||
// short *dsdAudio = m_dsdDecoder.getAudio1(nbAudioSamples);
|
||||
//
|
||||
// if (nbAudioSamples > 0)
|
||||
// {
|
||||
// if (!m_settings.m_audioMute) {
|
||||
// uint res = m_audioFifo1.write((const quint8*) dsdAudio, nbAudioSamples, 10);
|
||||
// }
|
||||
//
|
||||
// m_dsdDecoder.resetAudio1();
|
||||
// }
|
||||
}
|
||||
|
||||
if ((m_scopeXY != 0) && (m_scopeEnabled))
|
||||
{
|
||||
m_scopeXY->feed(m_scopeSampleBuffer.begin(), m_scopeSampleBuffer.end(), true); // true = real samples for what it's worth
|
||||
}
|
||||
|
||||
m_settingsMutex.unlock();
|
||||
m_basebandSink->feed(begin, end);
|
||||
}
|
||||
|
||||
void DSDDemod::start()
|
||||
{
|
||||
m_audioFifo1.clear();
|
||||
m_audioFifo2.clear();
|
||||
m_phaseDiscri.reset();
|
||||
applyChannelSettings(m_inputSampleRate, m_inputFrequencyOffset, true);
|
||||
qDebug() << "DSDDemod::start";
|
||||
|
||||
if (m_basebandSampleRate != 0) {
|
||||
m_basebandSink->setBasebandSampleRate(m_basebandSampleRate);
|
||||
}
|
||||
|
||||
m_basebandSink->reset();
|
||||
m_thread->start();
|
||||
}
|
||||
|
||||
void DSDDemod::stop()
|
||||
{
|
||||
qDebug() << "DSDDemod::stop";
|
||||
m_thread->exit();
|
||||
m_thread->wait();
|
||||
}
|
||||
|
||||
bool DSDDemod::handleMessage(const Message& cmd)
|
||||
{
|
||||
qDebug() << "DSDDemod::handleMessage";
|
||||
|
||||
if (DownChannelizer::MsgChannelizerNotification::match(cmd))
|
||||
{
|
||||
DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd;
|
||||
qDebug() << "DSDDemod::handleMessage: MsgChannelizerNotification: inputSampleRate: " << notif.getSampleRate()
|
||||
<< " inputFrequencyOffset: " << notif.getFrequencyOffset();
|
||||
|
||||
applyChannelSettings(notif.getSampleRate(), notif.getFrequencyOffset());
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (MsgConfigureChannelizer::match(cmd))
|
||||
{
|
||||
MsgConfigureChannelizer& cfg = (MsgConfigureChannelizer&) cmd;
|
||||
qDebug("DSDDemod::handleMessage: MsgConfigureChannelizer");
|
||||
|
||||
m_channelizer->configure(m_channelizer->getInputMessageQueue(),
|
||||
cfg.getSampleRate(),
|
||||
cfg.getCenterFrequency());
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (MsgConfigureDSDDemod::match(cmd))
|
||||
if (MsgConfigureDSDDemod::match(cmd))
|
||||
{
|
||||
MsgConfigureDSDDemod& cfg = (MsgConfigureDSDDemod&) cmd;
|
||||
qDebug("DSDDemod::handleMessage: MsgConfigureDSDDemod: m_rfBandwidth");
|
||||
@@ -402,33 +118,16 @@ bool DSDDemod::handleMessage(const Message& cmd)
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (MsgConfigureMyPosition::match(cmd))
|
||||
{
|
||||
MsgConfigureMyPosition& cfg = (MsgConfigureMyPosition&) cmd;
|
||||
m_dsdDecoder.setMyPoint(cfg.getMyLatitude(), cfg.getMyLongitude());
|
||||
return true;
|
||||
}
|
||||
else if (DSPConfigureAudio::match(cmd))
|
||||
{
|
||||
DSPConfigureAudio& cfg = (DSPConfigureAudio&) cmd;
|
||||
uint32_t sampleRate = cfg.getSampleRate();
|
||||
|
||||
qDebug() << "DSDDemod::handleMessage: DSPConfigureAudio:"
|
||||
<< " sampleRate: " << sampleRate;
|
||||
|
||||
if (sampleRate != m_audioSampleRate) {
|
||||
applyAudioSampleRate(sampleRate);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (BasebandSampleSink::MsgThreadedSink::match(cmd))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else if (DSPSignalNotification::match(cmd))
|
||||
{
|
||||
return true;
|
||||
DSPSignalNotification& notif = (DSPSignalNotification&) cmd;
|
||||
m_basebandSampleRate = notif.getSampleRate();
|
||||
// Forward to the sink
|
||||
DSPSignalNotification* rep = new DSPSignalNotification(notif); // make a copy
|
||||
qDebug() << "DSDDemod::handleMessage: DSPSignalNotification";
|
||||
m_basebandSink->getInputMessageQueue()->push(rep);
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -436,45 +135,6 @@ bool DSDDemod::handleMessage(const Message& cmd)
|
||||
}
|
||||
}
|
||||
|
||||
void DSDDemod::applyAudioSampleRate(int sampleRate)
|
||||
{
|
||||
int upsampling = sampleRate / 8000;
|
||||
|
||||
qDebug("DSDDemod::applyAudioSampleRate: audio rate: %d upsample by %d", sampleRate, upsampling);
|
||||
|
||||
if (sampleRate % 8000 != 0) {
|
||||
qDebug("DSDDemod::applyAudioSampleRate: audio will sound best with sample rates that are integer multiples of 8 kS/s");
|
||||
}
|
||||
|
||||
m_dsdDecoder.setUpsampling(upsampling);
|
||||
m_audioSampleRate = sampleRate;
|
||||
}
|
||||
|
||||
void DSDDemod::applyChannelSettings(int inputSampleRate, int inputFrequencyOffset, bool force)
|
||||
{
|
||||
qDebug() << "DSDDemod::applyChannelSettings:"
|
||||
<< " inputSampleRate: " << inputSampleRate
|
||||
<< " inputFrequencyOffset: " << inputFrequencyOffset;
|
||||
|
||||
if ((inputFrequencyOffset != m_inputFrequencyOffset) ||
|
||||
(inputSampleRate != m_inputSampleRate) || force)
|
||||
{
|
||||
m_nco.setFreq(-inputFrequencyOffset, inputSampleRate);
|
||||
}
|
||||
|
||||
if ((inputSampleRate != m_inputSampleRate) || force)
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_interpolator.create(16, inputSampleRate, (m_settings.m_rfBandwidth) / 2.2);
|
||||
m_interpolatorDistanceRemain = 0;
|
||||
m_interpolatorDistance = (Real) inputSampleRate / (Real) 48000;
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
m_inputSampleRate = inputSampleRate;
|
||||
m_inputFrequencyOffset = inputFrequencyOffset;
|
||||
}
|
||||
|
||||
void DSDDemod::applySettings(const DSDDemodSettings& settings, bool force)
|
||||
{
|
||||
qDebug() << "DSDDemod::applySettings: "
|
||||
@@ -527,87 +187,38 @@ void DSDDemod::applySettings(const DSDDemodSettings& settings, bool force)
|
||||
if ((settings.m_traceLengthMutliplier != m_settings.m_traceLengthMutliplier) || force) {
|
||||
reverseAPIKeys.append("traceLengthMutliplier");
|
||||
}
|
||||
|
||||
if ((settings.m_rfBandwidth != m_settings.m_rfBandwidth) || force)
|
||||
{
|
||||
if ((settings.m_rfBandwidth != m_settings.m_rfBandwidth) || force) {
|
||||
reverseAPIKeys.append("rfBandwidth");
|
||||
m_settingsMutex.lock();
|
||||
m_interpolator.create(16, m_inputSampleRate, (settings.m_rfBandwidth) / 2.2);
|
||||
m_interpolatorDistanceRemain = 0;
|
||||
m_interpolatorDistance = (Real) m_inputSampleRate / (Real) 48000;
|
||||
//m_phaseDiscri.setFMScaling((float) settings.m_rfBandwidth / (float) settings.m_fmDeviation);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
if ((settings.m_fmDeviation != m_settings.m_fmDeviation) || force)
|
||||
{
|
||||
if ((settings.m_fmDeviation != m_settings.m_fmDeviation) || force) {
|
||||
reverseAPIKeys.append("fmDeviation");
|
||||
m_phaseDiscri.setFMScaling(48000.0f / (2.0f*settings.m_fmDeviation));
|
||||
}
|
||||
|
||||
if ((settings.m_squelchGate != m_settings.m_squelchGate) || force)
|
||||
{
|
||||
if ((settings.m_squelchGate != m_settings.m_squelchGate) || force) {
|
||||
reverseAPIKeys.append("squelchGate");
|
||||
m_squelchGate = 480 * settings.m_squelchGate; // gate is given in 10s of ms at 48000 Hz audio sample rate
|
||||
m_squelchCount = 0; // reset squelch open counter
|
||||
}
|
||||
|
||||
if ((settings.m_squelch != m_settings.m_squelch) || force)
|
||||
{
|
||||
if ((settings.m_squelch != m_settings.m_squelch) || force) {
|
||||
reverseAPIKeys.append("squelch");
|
||||
// input is a value in dB
|
||||
m_squelchLevel = std::pow(10.0, settings.m_squelch / 10.0);
|
||||
}
|
||||
|
||||
if ((settings.m_volume != m_settings.m_volume) || force)
|
||||
{
|
||||
if ((settings.m_volume != m_settings.m_volume) || force) {
|
||||
reverseAPIKeys.append("volume");
|
||||
m_dsdDecoder.setAudioGain(settings.m_volume);
|
||||
}
|
||||
|
||||
if ((settings.m_baudRate != m_settings.m_baudRate) || force)
|
||||
{
|
||||
if ((settings.m_baudRate != m_settings.m_baudRate) || force) {
|
||||
reverseAPIKeys.append("baudRate");
|
||||
m_dsdDecoder.setBaudRate(settings.m_baudRate);
|
||||
}
|
||||
|
||||
if ((settings.m_enableCosineFiltering != m_settings.m_enableCosineFiltering) || force)
|
||||
{
|
||||
if ((settings.m_enableCosineFiltering != m_settings.m_enableCosineFiltering) || force) {
|
||||
reverseAPIKeys.append("enableCosineFiltering");
|
||||
m_dsdDecoder.enableCosineFiltering(settings.m_enableCosineFiltering);
|
||||
}
|
||||
|
||||
if ((settings.m_tdmaStereo != m_settings.m_tdmaStereo) || force)
|
||||
{
|
||||
if ((settings.m_tdmaStereo != m_settings.m_tdmaStereo) || force) {
|
||||
reverseAPIKeys.append("tdmaStereo");
|
||||
m_dsdDecoder.setTDMAStereo(settings.m_tdmaStereo);
|
||||
}
|
||||
|
||||
if ((settings.m_pllLock != m_settings.m_pllLock) || force)
|
||||
{
|
||||
if ((settings.m_pllLock != m_settings.m_pllLock) || force) {
|
||||
reverseAPIKeys.append("pllLock");
|
||||
m_dsdDecoder.setSymbolPLLLock(settings.m_pllLock);
|
||||
}
|
||||
|
||||
if ((settings.m_highPassFilter != m_settings.m_highPassFilter) || force)
|
||||
{
|
||||
if ((settings.m_highPassFilter != m_settings.m_highPassFilter) || force) {
|
||||
reverseAPIKeys.append("highPassFilter");
|
||||
m_dsdDecoder.useHPMbelib(settings.m_highPassFilter);
|
||||
}
|
||||
|
||||
if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force)
|
||||
{
|
||||
if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force) {
|
||||
reverseAPIKeys.append("audioDeviceName");
|
||||
AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
|
||||
int audioDeviceIndex = audioDeviceManager->getOutputDeviceIndex(settings.m_audioDeviceName);
|
||||
//qDebug("AMDemod::applySettings: audioDeviceName: %s audioDeviceIndex: %d", qPrintable(settings.m_audioDeviceName), audioDeviceIndex);
|
||||
audioDeviceManager->addAudioSink(&m_audioFifo1, getInputMessageQueue(), audioDeviceIndex);
|
||||
audioDeviceManager->addAudioSink(&m_audioFifo2, getInputMessageQueue(), audioDeviceIndex);
|
||||
uint32_t audioSampleRate = audioDeviceManager->getOutputSampleRate(audioDeviceIndex);
|
||||
|
||||
if (m_audioSampleRate != audioSampleRate) {
|
||||
applyAudioSampleRate(audioSampleRate);
|
||||
}
|
||||
}
|
||||
|
||||
if (m_settings.m_streamIndex != settings.m_streamIndex)
|
||||
@@ -615,16 +226,17 @@ void DSDDemod::applySettings(const DSDDemodSettings& settings, bool force)
|
||||
if (m_deviceAPI->getSampleMIMO()) // change of stream is possible for MIMO devices only
|
||||
{
|
||||
m_deviceAPI->removeChannelSinkAPI(this, m_settings.m_streamIndex);
|
||||
m_deviceAPI->removeChannelSink(m_threadedChannelizer, m_settings.m_streamIndex);
|
||||
m_deviceAPI->addChannelSink(m_threadedChannelizer, settings.m_streamIndex);
|
||||
m_deviceAPI->removeChannelSink(this, m_settings.m_streamIndex);
|
||||
m_deviceAPI->addChannelSink(this, settings.m_streamIndex);
|
||||
m_deviceAPI->addChannelSinkAPI(this, settings.m_streamIndex);
|
||||
// apply stream sample rate to itself
|
||||
applyChannelSettings(m_deviceAPI->getSampleMIMO()->getSourceSampleRate(settings.m_streamIndex), m_inputFrequencyOffset);
|
||||
}
|
||||
|
||||
reverseAPIKeys.append("streamIndex");
|
||||
}
|
||||
|
||||
DSDDemodBaseband::MsgConfigureDSDDemodBaseband *msg = DSDDemodBaseband::MsgConfigureDSDDemodBaseband::create(settings, force);
|
||||
m_basebandSink->getInputMessageQueue()->push(msg);
|
||||
|
||||
if (settings.m_useReverseAPI)
|
||||
{
|
||||
bool fullUpdate = ((m_settings.m_useReverseAPI != settings.m_useReverseAPI) && settings.m_useReverseAPI) ||
|
||||
@@ -660,195 +272,6 @@ bool DSDDemod::deserialize(const QByteArray& data)
|
||||
}
|
||||
}
|
||||
|
||||
const char *DSDDemod::updateAndGetStatusText()
|
||||
{
|
||||
formatStatusText();
|
||||
return m_formatStatusText;
|
||||
}
|
||||
|
||||
void DSDDemod::formatStatusText()
|
||||
{
|
||||
switch (getDecoder().getSyncType())
|
||||
{
|
||||
case DSDcc::DSDDecoder::DSDSyncDMRDataMS:
|
||||
case DSDcc::DSDDecoder::DSDSyncDMRDataP:
|
||||
case DSDcc::DSDDecoder::DSDSyncDMRVoiceMS:
|
||||
case DSDcc::DSDDecoder::DSDSyncDMRVoiceP:
|
||||
if (m_signalFormat != signalFormatDMR)
|
||||
{
|
||||
strcpy(m_formatStatusText, "Sta: __ S1: __________________________ S2: __________________________");
|
||||
}
|
||||
|
||||
switch (getDecoder().getStationType())
|
||||
{
|
||||
case DSDcc::DSDDecoder::DSDBaseStation:
|
||||
memcpy(&m_formatStatusText[5], "BS ", 3);
|
||||
break;
|
||||
case DSDcc::DSDDecoder::DSDMobileStation:
|
||||
memcpy(&m_formatStatusText[5], "MS ", 3);
|
||||
break;
|
||||
default:
|
||||
memcpy(&m_formatStatusText[5], "NA ", 3);
|
||||
break;
|
||||
}
|
||||
|
||||
memcpy(&m_formatStatusText[12], getDecoder().getDMRDecoder().getSlot0Text(), 26);
|
||||
memcpy(&m_formatStatusText[43], getDecoder().getDMRDecoder().getSlot1Text(), 26);
|
||||
m_signalFormat = signalFormatDMR;
|
||||
break;
|
||||
case DSDcc::DSDDecoder::DSDSyncDStarHeaderN:
|
||||
case DSDcc::DSDDecoder::DSDSyncDStarHeaderP:
|
||||
case DSDcc::DSDDecoder::DSDSyncDStarN:
|
||||
case DSDcc::DSDDecoder::DSDSyncDStarP:
|
||||
if (m_signalFormat != signalFormatDStar)
|
||||
{
|
||||
// 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8
|
||||
// 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0....5....0..
|
||||
strcpy(m_formatStatusText, "________/____>________|________>________|____________________|______:___/_____._");
|
||||
// MY UR RPT1 RPT2 Info Loc Target
|
||||
}
|
||||
|
||||
{
|
||||
const std::string& rpt1 = getDecoder().getDStarDecoder().getRpt1();
|
||||
const std::string& rpt2 = getDecoder().getDStarDecoder().getRpt2();
|
||||
const std::string& mySign = getDecoder().getDStarDecoder().getMySign();
|
||||
const std::string& yrSign = getDecoder().getDStarDecoder().getYourSign();
|
||||
|
||||
if (rpt1.length() > 0) { // 0 or 8
|
||||
memcpy(&m_formatStatusText[23], rpt1.c_str(), 8);
|
||||
}
|
||||
if (rpt2.length() > 0) { // 0 or 8
|
||||
memcpy(&m_formatStatusText[32], rpt2.c_str(), 8);
|
||||
}
|
||||
if (yrSign.length() > 0) { // 0 or 8
|
||||
memcpy(&m_formatStatusText[14], yrSign.c_str(), 8);
|
||||
}
|
||||
if (mySign.length() > 0) { // 0 or 13
|
||||
memcpy(&m_formatStatusText[0], mySign.c_str(), 13);
|
||||
}
|
||||
memcpy(&m_formatStatusText[41], getDecoder().getDStarDecoder().getInfoText(), 20);
|
||||
memcpy(&m_formatStatusText[62], getDecoder().getDStarDecoder().getLocator(), 6);
|
||||
snprintf(&m_formatStatusText[69], 82-69, "%03d/%07.1f",
|
||||
getDecoder().getDStarDecoder().getBearing(),
|
||||
getDecoder().getDStarDecoder().getDistance());
|
||||
}
|
||||
|
||||
m_formatStatusText[82] = '\0';
|
||||
m_signalFormat = signalFormatDStar;
|
||||
break;
|
||||
case DSDcc::DSDDecoder::DSDSyncDPMR:
|
||||
snprintf(m_formatStatusText, 82, "%s CC: %04d OI: %08d CI: %08d",
|
||||
DSDcc::DSDdPMR::dpmrFrameTypes[(int) getDecoder().getDPMRDecoder().getFrameType()],
|
||||
getDecoder().getDPMRDecoder().getColorCode(),
|
||||
getDecoder().getDPMRDecoder().getOwnId(),
|
||||
getDecoder().getDPMRDecoder().getCalledId());
|
||||
m_signalFormat = signalFormatDPMR;
|
||||
break;
|
||||
case DSDcc::DSDDecoder::DSDSyncNXDNP:
|
||||
case DSDcc::DSDDecoder::DSDSyncNXDNN:
|
||||
if (getDecoder().getNXDNDecoder().getRFChannel() == DSDcc::DSDNXDN::NXDNRCCH)
|
||||
{
|
||||
// 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8
|
||||
// 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0....5....0..
|
||||
// RC r cc mm llllll ssss
|
||||
snprintf(m_formatStatusText, 82, "RC %s %02d %02X %06X %02X",
|
||||
getDecoder().getNXDNDecoder().isFullRate() ? "F" : "H",
|
||||
getDecoder().getNXDNDecoder().getRAN(),
|
||||
getDecoder().getNXDNDecoder().getMessageType(),
|
||||
getDecoder().getNXDNDecoder().getLocationId(),
|
||||
getDecoder().getNXDNDecoder().getServicesFlag());
|
||||
}
|
||||
else if ((getDecoder().getNXDNDecoder().getRFChannel() == DSDcc::DSDNXDN::NXDNRTCH)
|
||||
|| (getDecoder().getNXDNDecoder().getRFChannel() == DSDcc::DSDNXDN::NXDNRDCH))
|
||||
{
|
||||
if (getDecoder().getNXDNDecoder().isIdle()) {
|
||||
snprintf(m_formatStatusText, 82, "%s IDLE", getDecoder().getNXDNDecoder().getRFChannelStr());
|
||||
}
|
||||
else
|
||||
{
|
||||
// 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8
|
||||
// 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0....5....0..
|
||||
// Rx r cc mm sssss>gddddd
|
||||
snprintf(m_formatStatusText, 82, "%s %s %02d %02X %05d>%c%05d",
|
||||
getDecoder().getNXDNDecoder().getRFChannelStr(),
|
||||
getDecoder().getNXDNDecoder().isFullRate() ? "F" : "H",
|
||||
getDecoder().getNXDNDecoder().getRAN(),
|
||||
getDecoder().getNXDNDecoder().getMessageType(),
|
||||
getDecoder().getNXDNDecoder().getSourceId(),
|
||||
getDecoder().getNXDNDecoder().isGroupCall() ? 'G' : 'I',
|
||||
getDecoder().getNXDNDecoder().getDestinationId());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8
|
||||
// 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0....5....0..
|
||||
// RU
|
||||
snprintf(m_formatStatusText, 82, "RU");
|
||||
}
|
||||
m_signalFormat = signalFormatNXDN;
|
||||
break;
|
||||
case DSDcc::DSDDecoder::DSDSyncYSF:
|
||||
// 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8
|
||||
// 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0....5....0..
|
||||
// C V2 RI 0:7 WL000|ssssssssss>dddddddddd |UUUUUUUUUU>DDDDDDDDDD|44444
|
||||
if (getDecoder().getYSFDecoder().getFICHError() == DSDcc::DSDYSF::FICHNoError)
|
||||
{
|
||||
snprintf(m_formatStatusText, 82, "%s ", DSDcc::DSDYSF::ysfChannelTypeText[(int) getDecoder().getYSFDecoder().getFICH().getFrameInformation()]);
|
||||
}
|
||||
else
|
||||
{
|
||||
snprintf(m_formatStatusText, 82, "%d ", (int) getDecoder().getYSFDecoder().getFICHError());
|
||||
}
|
||||
|
||||
snprintf(&m_formatStatusText[2], 80, "%s %s %d:%d %c%c",
|
||||
DSDcc::DSDYSF::ysfDataTypeText[(int) getDecoder().getYSFDecoder().getFICH().getDataType()],
|
||||
DSDcc::DSDYSF::ysfCallModeText[(int) getDecoder().getYSFDecoder().getFICH().getCallMode()],
|
||||
getDecoder().getYSFDecoder().getFICH().getBlockTotal(),
|
||||
getDecoder().getYSFDecoder().getFICH().getFrameTotal(),
|
||||
(getDecoder().getYSFDecoder().getFICH().isNarrowMode() ? 'N' : 'W'),
|
||||
(getDecoder().getYSFDecoder().getFICH().isInternetPath() ? 'I' : 'L'));
|
||||
|
||||
if (getDecoder().getYSFDecoder().getFICH().isSquelchCodeEnabled())
|
||||
{
|
||||
snprintf(&m_formatStatusText[14], 82-14, "%03d", getDecoder().getYSFDecoder().getFICH().getSquelchCode());
|
||||
}
|
||||
else
|
||||
{
|
||||
strncpy(&m_formatStatusText[14], "---", 82-14);
|
||||
}
|
||||
|
||||
char dest[13];
|
||||
|
||||
if (getDecoder().getYSFDecoder().radioIdMode())
|
||||
{
|
||||
snprintf(dest, 12, "%-5s:%-5s",
|
||||
getDecoder().getYSFDecoder().getDestId(),
|
||||
getDecoder().getYSFDecoder().getSrcId());
|
||||
}
|
||||
else
|
||||
{
|
||||
snprintf(dest, 11, "%-10s", getDecoder().getYSFDecoder().getDest());
|
||||
}
|
||||
|
||||
snprintf(&m_formatStatusText[17], 82-17, "|%-10s>%s|%-10s>%-10s|%-5s",
|
||||
getDecoder().getYSFDecoder().getSrc(),
|
||||
dest,
|
||||
getDecoder().getYSFDecoder().getUplink(),
|
||||
getDecoder().getYSFDecoder().getDownlink(),
|
||||
getDecoder().getYSFDecoder().getRem4());
|
||||
|
||||
m_signalFormat = signalFormatYSF;
|
||||
break;
|
||||
default:
|
||||
m_signalFormat = signalFormatNone;
|
||||
m_formatStatusText[0] = '\0';
|
||||
break;
|
||||
}
|
||||
|
||||
m_formatStatusText[82] = '\0'; // guard
|
||||
}
|
||||
|
||||
int DSDDemod::webapiSettingsGet(
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
QString& errorMessage)
|
||||
@@ -870,13 +293,6 @@ int DSDDemod::webapiSettingsPutPatch(
|
||||
DSDDemodSettings settings = m_settings;
|
||||
webapiUpdateChannelSettings(settings, channelSettingsKeys, response);
|
||||
|
||||
if (settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset)
|
||||
{
|
||||
MsgConfigureChannelizer* channelConfigMsg = MsgConfigureChannelizer::create(
|
||||
m_audioSampleRate, settings.m_inputFrequencyOffset);
|
||||
m_inputMessageQueue.push(channelConfigMsg);
|
||||
}
|
||||
|
||||
MsgConfigureDSDDemod *msg = MsgConfigureDSDDemod::create(settings, force);
|
||||
m_inputMessageQueue.push(msg);
|
||||
|
||||
@@ -1051,9 +467,9 @@ void DSDDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response
|
||||
getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples);
|
||||
|
||||
response.getDsdDemodReport()->setChannelPowerDb(CalcDb::dbPower(magsqAvg));
|
||||
response.getDsdDemodReport()->setAudioSampleRate(m_audioSampleRate);
|
||||
response.getDsdDemodReport()->setChannelSampleRate(m_inputSampleRate);
|
||||
response.getDsdDemodReport()->setSquelch(m_squelchOpen ? 1 : 0);
|
||||
response.getDsdDemodReport()->setAudioSampleRate(m_basebandSink->getAudioSampleRate());
|
||||
response.getDsdDemodReport()->setChannelSampleRate(m_basebandSink->getChannelSampleRate());
|
||||
response.getDsdDemodReport()->setSquelch(m_basebandSink->getSquelchOpen() ? 1 : 0);
|
||||
response.getDsdDemodReport()->setPllLocked(getDecoder().getSymbolPLLLocked() ? 1 : 0);
|
||||
response.getDsdDemodReport()->setSlot1On(getDecoder().getVoice1On() ? 1 : 0);
|
||||
response.getDsdDemodReport()->setSlot2On(getDecoder().getVoice2On() ? 1 : 0);
|
||||
|
||||
Reference in New Issue
Block a user