mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-07-18 00:34:13 -04:00
SampleSourceFifo refactoring and Tx code reorganization
This commit is contained in:
f4exb
@@ -19,24 +19,21 @@
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkReply>
|
||||
#include <QBuffer>
|
||||
#include <QThread>
|
||||
|
||||
#include "SWGChannelSettings.h"
|
||||
#include "SWGChannelReport.h"
|
||||
#include "SWGUDPSourceReport.h"
|
||||
|
||||
#include "device/deviceapi.h"
|
||||
#include "dsp/upchannelizer.h"
|
||||
#include "dsp/threadedbasebandsamplesource.h"
|
||||
#include "dsp/dspcommands.h"
|
||||
#include "util/db.h"
|
||||
|
||||
#include "udpsourcebaseband.h"
|
||||
#include "udpsource.h"
|
||||
#include "udpsourcemsg.h"
|
||||
|
||||
MESSAGE_CLASS_DEFINITION(UDPSource::MsgConfigureUDPSource, Message)
|
||||
MESSAGE_CLASS_DEFINITION(UDPSource::MsgConfigureChannelizer, Message)
|
||||
MESSAGE_CLASS_DEFINITION(UDPSource::MsgUDPSourceSpectrum, Message)
|
||||
MESSAGE_CLASS_DEFINITION(UDPSource::MsgResetReadIndex, Message)
|
||||
|
||||
const QString UDPSource::m_channelIdURI = "sdrangel.channeltx.udpsource";
|
||||
const QString UDPSource::m_channelId = "UDPSource";
|
||||
@@ -44,43 +41,17 @@ const QString UDPSource::m_channelId = "UDPSource";
|
||||
UDPSource::UDPSource(DeviceAPI *deviceAPI) :
|
||||
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),
|
||||
m_deviceAPI(deviceAPI),
|
||||
m_basebandSampleRate(48000),
|
||||
m_outputSampleRate(48000),
|
||||
m_inputFrequencyOffset(0),
|
||||
m_squelch(1e-6),
|
||||
m_spectrum(0),
|
||||
m_spectrumEnabled(false),
|
||||
m_spectrumChunkSize(2160),
|
||||
m_spectrumChunkCounter(0),
|
||||
m_magsq(1e-10),
|
||||
m_movingAverage(16, 1e-10),
|
||||
m_inMovingAverage(480, 1e-10),
|
||||
m_sampleRateSum(0),
|
||||
m_sampleRateAvgCounter(0),
|
||||
m_levelCalcCount(0),
|
||||
m_peakLevel(0.0f),
|
||||
m_levelSum(0.0f),
|
||||
m_levelNbSamples(480),
|
||||
m_squelchOpen(false),
|
||||
m_squelchOpenCount(0),
|
||||
m_squelchCloseCount(0),
|
||||
m_squelchThreshold(4800),
|
||||
m_modPhasor(0.0f),
|
||||
m_SSBFilterBufferIndex(0),
|
||||
m_settingsMutex(QMutex::Recursive)
|
||||
{
|
||||
setObjectName(m_channelId);
|
||||
|
||||
m_udpHandler.setFeedbackMessageQueue(&m_inputMessageQueue);
|
||||
m_SSBFilter = new fftfilt(m_settings.m_lowCutoff / m_settings.m_inputSampleRate, m_settings.m_rfBandwidth / m_settings.m_inputSampleRate, m_ssbFftLen);
|
||||
m_SSBFilterBuffer = new Complex[m_ssbFftLen>>1]; // filter returns data exactly half of its size
|
||||
m_thread = new QThread(this);
|
||||
m_basebandSource = new UDPSourceBaseband();
|
||||
m_basebandSource->moveToThread(m_thread);
|
||||
|
||||
applyChannelSettings(m_basebandSampleRate, m_outputSampleRate, m_inputFrequencyOffset, true);
|
||||
applySettings(m_settings, true);
|
||||
|
||||
m_channelizer = new UpChannelizer(this);
|
||||
m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this);
|
||||
m_deviceAPI->addChannelSource(m_threadedChannelizer);
|
||||
m_deviceAPI->addChannelSource(this);
|
||||
m_deviceAPI->addChannelSourceAPI(this);
|
||||
|
||||
m_networkManager = new QNetworkAccessManager();
|
||||
@@ -92,262 +63,42 @@ UDPSource::~UDPSource()
|
||||
disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));
|
||||
delete m_networkManager;
|
||||
m_deviceAPI->removeChannelSourceAPI(this);
|
||||
m_deviceAPI->removeChannelSource(m_threadedChannelizer);
|
||||
delete m_threadedChannelizer;
|
||||
delete m_channelizer;
|
||||
delete m_SSBFilter;
|
||||
delete[] m_SSBFilterBuffer;
|
||||
m_deviceAPI->removeChannelSource(this);
|
||||
delete m_basebandSource;
|
||||
delete m_thread;
|
||||
}
|
||||
|
||||
void UDPSource::start()
|
||||
{
|
||||
m_udpHandler.start();
|
||||
applyChannelSettings(m_basebandSampleRate, m_outputSampleRate, m_inputFrequencyOffset, true);
|
||||
qDebug("UDPSource::start");
|
||||
m_basebandSource->reset();
|
||||
m_thread->start();
|
||||
}
|
||||
|
||||
void UDPSource::stop()
|
||||
{
|
||||
m_udpHandler.stop();
|
||||
qDebug("UDPSource::stop");
|
||||
m_thread->exit();
|
||||
m_thread->wait();
|
||||
}
|
||||
|
||||
void UDPSource::pull(Sample& sample)
|
||||
void UDPSource::pull(SampleVector::iterator& begin, unsigned int nbSamples)
|
||||
{
|
||||
if (m_settings.m_channelMute)
|
||||
{
|
||||
sample.m_real = 0.0f;
|
||||
sample.m_imag = 0.0f;
|
||||
initSquelch(false);
|
||||
return;
|
||||
}
|
||||
|
||||
Complex ci;
|
||||
|
||||
m_settingsMutex.lock();
|
||||
|
||||
if (m_interpolatorDistance > 1.0f) // decimate
|
||||
{
|
||||
modulateSample();
|
||||
|
||||
while (!m_interpolator.decimate(&m_interpolatorDistanceRemain, m_modSample, &ci))
|
||||
{
|
||||
modulateSample();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_interpolator.interpolate(&m_interpolatorDistanceRemain, m_modSample, &ci))
|
||||
{
|
||||
modulateSample();
|
||||
}
|
||||
}
|
||||
|
||||
m_interpolatorDistanceRemain += m_interpolatorDistance;
|
||||
|
||||
ci *= m_carrierNco.nextIQ(); // shift to carrier frequency
|
||||
|
||||
m_settingsMutex.unlock();
|
||||
|
||||
double magsq = ci.real() * ci.real() + ci.imag() * ci.imag();
|
||||
magsq /= (SDR_TX_SCALED*SDR_TX_SCALED);
|
||||
m_movingAverage.feed(magsq);
|
||||
m_magsq = m_movingAverage.average();
|
||||
|
||||
sample.m_real = (FixReal) ci.real();
|
||||
sample.m_imag = (FixReal) ci.imag();
|
||||
}
|
||||
|
||||
void UDPSource::modulateSample()
|
||||
{
|
||||
if (m_settings.m_sampleFormat == UDPSourceSettings::FormatSnLE) // Linear I/Q transponding
|
||||
{
|
||||
Sample s;
|
||||
|
||||
m_udpHandler.readSample(s);
|
||||
|
||||
uint64_t magsq = s.m_real * s.m_real + s.m_imag * s.m_imag;
|
||||
m_inMovingAverage.feed(magsq/(SDR_TX_SCALED*SDR_TX_SCALED));
|
||||
m_inMagsq = m_inMovingAverage.average();
|
||||
|
||||
calculateSquelch(m_inMagsq);
|
||||
|
||||
if (m_squelchOpen)
|
||||
{
|
||||
m_modSample.real(s.m_real * m_settings.m_gainOut);
|
||||
m_modSample.imag(s.m_imag * m_settings.m_gainOut);
|
||||
calculateLevel(m_modSample);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_modSample.real(0.0f);
|
||||
m_modSample.imag(0.0f);
|
||||
}
|
||||
}
|
||||
else if (m_settings.m_sampleFormat == UDPSourceSettings::FormatNFM)
|
||||
{
|
||||
qint16 t;
|
||||
readMonoSample(t);
|
||||
|
||||
m_inMovingAverage.feed((t*t)/1073741824.0);
|
||||
m_inMagsq = m_inMovingAverage.average();
|
||||
|
||||
calculateSquelch(m_inMagsq);
|
||||
|
||||
if (m_squelchOpen)
|
||||
{
|
||||
m_modPhasor += (m_settings.m_fmDeviation / m_settings.m_inputSampleRate) * (t / SDR_TX_SCALEF) * M_PI * 2.0f;
|
||||
m_modSample.real(cos(m_modPhasor) * 0.3162292f * SDR_TX_SCALEF * m_settings.m_gainOut);
|
||||
m_modSample.imag(sin(m_modPhasor) * 0.3162292f * SDR_TX_SCALEF * m_settings.m_gainOut);
|
||||
calculateLevel(m_modSample);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_modSample.real(0.0f);
|
||||
m_modSample.imag(0.0f);
|
||||
}
|
||||
}
|
||||
else if (m_settings.m_sampleFormat == UDPSourceSettings::FormatAM)
|
||||
{
|
||||
qint16 t;
|
||||
readMonoSample(t);
|
||||
m_inMovingAverage.feed((t*t)/(SDR_TX_SCALED*SDR_TX_SCALED));
|
||||
m_inMagsq = m_inMovingAverage.average();
|
||||
|
||||
calculateSquelch(m_inMagsq);
|
||||
|
||||
if (m_squelchOpen)
|
||||
{
|
||||
m_modSample.real(((t / SDR_TX_SCALEF)*m_settings.m_amModFactor*m_settings.m_gainOut + 1.0f) * (SDR_TX_SCALEF/2)); // modulate and scale zero frequency carrier
|
||||
m_modSample.imag(0.0f);
|
||||
calculateLevel(m_modSample);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_modSample.real(0.0f);
|
||||
m_modSample.imag(0.0f);
|
||||
}
|
||||
}
|
||||
else if ((m_settings.m_sampleFormat == UDPSourceSettings::FormatLSB) || (m_settings.m_sampleFormat == UDPSourceSettings::FormatUSB))
|
||||
{
|
||||
qint16 t;
|
||||
Complex c, ci;
|
||||
fftfilt::cmplx *filtered;
|
||||
int n_out = 0;
|
||||
|
||||
readMonoSample(t);
|
||||
m_inMovingAverage.feed((t*t)/(SDR_TX_SCALED*SDR_TX_SCALED));
|
||||
m_inMagsq = m_inMovingAverage.average();
|
||||
|
||||
calculateSquelch(m_inMagsq);
|
||||
|
||||
if (m_squelchOpen)
|
||||
{
|
||||
ci.real((t / SDR_TX_SCALEF) * m_settings.m_gainOut);
|
||||
ci.imag(0.0f);
|
||||
|
||||
n_out = m_SSBFilter->runSSB(ci, &filtered, (m_settings.m_sampleFormat == UDPSourceSettings::FormatUSB));
|
||||
|
||||
if (n_out > 0)
|
||||
{
|
||||
memcpy((void *) m_SSBFilterBuffer, (const void *) filtered, n_out*sizeof(Complex));
|
||||
m_SSBFilterBufferIndex = 0;
|
||||
}
|
||||
|
||||
c = m_SSBFilterBuffer[m_SSBFilterBufferIndex];
|
||||
m_modSample.real(m_SSBFilterBuffer[m_SSBFilterBufferIndex].real() * SDR_TX_SCALEF);
|
||||
m_modSample.imag(m_SSBFilterBuffer[m_SSBFilterBufferIndex].imag() * SDR_TX_SCALEF);
|
||||
m_SSBFilterBufferIndex++;
|
||||
|
||||
calculateLevel(m_modSample);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_modSample.real(0.0f);
|
||||
m_modSample.imag(0.0f);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_modSample.real(0.0f);
|
||||
m_modSample.imag(0.0f);
|
||||
initSquelch(false);
|
||||
}
|
||||
|
||||
if (m_spectrum && m_spectrumEnabled && (m_spectrumChunkCounter < m_spectrumChunkSize - 1))
|
||||
{
|
||||
Sample s;
|
||||
s.m_real = (FixReal) m_modSample.real();
|
||||
s.m_imag = (FixReal) m_modSample.imag();
|
||||
m_sampleBuffer.push_back(s);
|
||||
m_spectrumChunkCounter++;
|
||||
}
|
||||
else if (m_spectrum)
|
||||
{
|
||||
m_spectrum->feed(m_sampleBuffer.begin(), m_sampleBuffer.end(), false);
|
||||
m_sampleBuffer.clear();
|
||||
m_spectrumChunkCounter = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void UDPSource::calculateLevel(Real sample)
|
||||
{
|
||||
if (m_levelCalcCount < m_levelNbSamples)
|
||||
{
|
||||
m_peakLevel = std::max(std::fabs(m_peakLevel), sample);
|
||||
m_levelSum += sample * sample;
|
||||
m_levelCalcCount++;
|
||||
}
|
||||
else
|
||||
{
|
||||
qreal rmsLevel = m_levelSum > 0.0 ? sqrt(m_levelSum / m_levelNbSamples) : 0.0;
|
||||
//qDebug("NFMMod::calculateLevel: %f %f", rmsLevel, m_peakLevel);
|
||||
emit levelChanged(rmsLevel, m_peakLevel, m_levelNbSamples);
|
||||
m_peakLevel = 0.0f;
|
||||
m_levelSum = 0.0f;
|
||||
m_levelCalcCount = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void UDPSource::calculateLevel(Complex sample)
|
||||
{
|
||||
Real t = std::abs(sample);
|
||||
|
||||
if (m_levelCalcCount < m_levelNbSamples)
|
||||
{
|
||||
m_peakLevel = std::max(std::fabs(m_peakLevel), t);
|
||||
m_levelSum += (t * t);
|
||||
m_levelCalcCount++;
|
||||
}
|
||||
else
|
||||
{
|
||||
qreal rmsLevel = m_levelSum > 0.0 ? sqrt((m_levelSum/(SDR_TX_SCALED*SDR_TX_SCALED)) / m_levelNbSamples) : 0.0;
|
||||
emit levelChanged(rmsLevel, m_peakLevel / SDR_TX_SCALEF, m_levelNbSamples);
|
||||
m_peakLevel = 0.0f;
|
||||
m_levelSum = 0.0f;
|
||||
m_levelCalcCount = 0;
|
||||
}
|
||||
m_basebandSource->pull(begin, nbSamples);
|
||||
}
|
||||
|
||||
bool UDPSource::handleMessage(const Message& cmd)
|
||||
{
|
||||
if (UpChannelizer::MsgChannelizerNotification::match(cmd))
|
||||
{
|
||||
UpChannelizer::MsgChannelizerNotification& notif = (UpChannelizer::MsgChannelizerNotification&) cmd;
|
||||
qDebug() << "UDPSource::handleMessage: MsgChannelizerNotification";
|
||||
|
||||
applyChannelSettings(notif.getBasebandSampleRate(), notif.getSampleRate(), notif.getFrequencyOffset());
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (MsgConfigureChannelizer::match(cmd))
|
||||
if (MsgConfigureChannelizer::match(cmd))
|
||||
{
|
||||
MsgConfigureChannelizer& cfg = (MsgConfigureChannelizer&) cmd;
|
||||
qDebug() << "UDPSource::handleMessage: MsgConfigureChannelizer:"
|
||||
<< " sampleRate: " << cfg.getSampleRate()
|
||||
<< " centerFrequency: " << cfg.getCenterFrequency();
|
||||
qDebug() << "AMMod::handleMessage: MsgConfigureChannelizer:"
|
||||
<< " getSourceSampleRate: " << cfg.getSourceSampleRate()
|
||||
<< " getSourceCenterFrequency: " << cfg.getSourceCenterFrequency();
|
||||
|
||||
m_channelizer->configure(m_channelizer->getInputMessageQueue(),
|
||||
cfg.getSampleRate(),
|
||||
cfg.getCenterFrequency());
|
||||
UDPSourceBaseband::MsgConfigureChannelizer *msg
|
||||
= UDPSourceBaseband::MsgConfigureChannelizer::create(cfg.getSourceSampleRate(), cfg.getSourceCenterFrequency());
|
||||
m_basebandSource->getInputMessageQueue()->push(msg);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -360,133 +111,37 @@ bool UDPSource::handleMessage(const Message& cmd)
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (UDPSourceMessages::MsgSampleRateCorrection::match(cmd))
|
||||
{
|
||||
UDPSourceMessages::MsgSampleRateCorrection& cfg = (UDPSourceMessages::MsgSampleRateCorrection&) cmd;
|
||||
Real newSampleRate = m_actualInputSampleRate + cfg.getCorrectionFactor() * m_actualInputSampleRate;
|
||||
|
||||
// exclude values too way out nominal sample rate (20%)
|
||||
if ((newSampleRate < m_settings.m_inputSampleRate * 1.2) && (newSampleRate > m_settings.m_inputSampleRate * 0.8))
|
||||
{
|
||||
m_actualInputSampleRate = newSampleRate;
|
||||
|
||||
if ((cfg.getRawDeltaRatio() > -0.05) && (cfg.getRawDeltaRatio() < 0.05))
|
||||
{
|
||||
if (m_sampleRateAvgCounter < m_sampleRateAverageItems)
|
||||
{
|
||||
m_sampleRateSum += m_actualInputSampleRate;
|
||||
m_sampleRateAvgCounter++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_sampleRateSum = 0.0;
|
||||
m_sampleRateAvgCounter = 0;
|
||||
}
|
||||
|
||||
if (m_sampleRateAvgCounter == m_sampleRateAverageItems)
|
||||
{
|
||||
float avgRate = m_sampleRateSum / m_sampleRateAverageItems;
|
||||
qDebug("UDPSource::handleMessage: MsgSampleRateCorrection: corr: %+.6f new rate: %.0f: avg rate: %.0f",
|
||||
cfg.getCorrectionFactor(),
|
||||
m_actualInputSampleRate,
|
||||
avgRate);
|
||||
m_actualInputSampleRate = avgRate;
|
||||
m_sampleRateSum = 0.0;
|
||||
m_sampleRateAvgCounter = 0;
|
||||
}
|
||||
// else
|
||||
// {
|
||||
// qDebug("UDPSource::handleMessage: MsgSampleRateCorrection: corr: %+.6f new rate: %.0f",
|
||||
// cfg.getCorrectionFactor(),
|
||||
// m_actualInputSampleRate);
|
||||
// }
|
||||
|
||||
m_settingsMutex.lock();
|
||||
m_interpolatorDistanceRemain = 0;
|
||||
m_interpolatorConsumed = false;
|
||||
m_interpolatorDistance = (Real) m_actualInputSampleRate / (Real) m_outputSampleRate;
|
||||
//m_interpolator.create(48, m_actualInputSampleRate, m_settings.m_rfBandwidth / 2.2, 3.0); // causes clicking: leaving at standard frequency
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (MsgUDPSourceSpectrum::match(cmd))
|
||||
{
|
||||
MsgUDPSourceSpectrum& spc = (MsgUDPSourceSpectrum&) cmd;
|
||||
m_spectrumEnabled = spc.getEnabled();
|
||||
qDebug() << "UDPSource::handleMessage: MsgUDPSourceSpectrum: m_spectrumEnabled: " << m_spectrumEnabled;
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (MsgResetReadIndex::match(cmd))
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_udpHandler.resetReadIndex();
|
||||
m_settingsMutex.unlock();
|
||||
|
||||
qDebug() << "UDPSource::handleMessage: MsgResetReadIndex";
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (DSPSignalNotification::match(cmd))
|
||||
{
|
||||
// Forward to the source
|
||||
DSPSignalNotification& notif = (DSPSignalNotification&) cmd;
|
||||
DSPSignalNotification* rep = new DSPSignalNotification(notif); // make a copy
|
||||
qDebug() << "UDPSource::handleMessage: DSPSignalNotification";
|
||||
m_basebandSource->getInputMessageQueue()->push(rep);
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(m_spectrum != 0)
|
||||
{
|
||||
return m_spectrum->handleMessage(cmd);
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void UDPSource::setSpectrumSink(BasebandSampleSink* spectrum)
|
||||
{
|
||||
m_basebandSource->setSpectrumSink(spectrum);
|
||||
}
|
||||
|
||||
void UDPSource::setSpectrum(bool enabled)
|
||||
{
|
||||
Message* cmd = MsgUDPSourceSpectrum::create(enabled);
|
||||
getInputMessageQueue()->push(cmd);
|
||||
Message* cmd = UDPSourceBaseband::MsgUDPSourceSpectrum::create(enabled);
|
||||
m_basebandSource->getInputMessageQueue()->push(cmd);
|
||||
}
|
||||
|
||||
void UDPSource::resetReadIndex()
|
||||
{
|
||||
Message* cmd = MsgResetReadIndex::create();
|
||||
getInputMessageQueue()->push(cmd);
|
||||
}
|
||||
|
||||
void UDPSource::applyChannelSettings(int basebandSampleRate, int outputSampleRate, int inputFrequencyOffset, bool force)
|
||||
{
|
||||
qDebug() << "UDPSource::applyChannelSettings:"
|
||||
<< " basebandSampleRate: " << basebandSampleRate
|
||||
<< " outputSampleRate: " << outputSampleRate
|
||||
<< " inputFrequencyOffset: " << inputFrequencyOffset;
|
||||
|
||||
if ((inputFrequencyOffset != m_inputFrequencyOffset) ||
|
||||
(outputSampleRate != m_outputSampleRate) || force)
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_carrierNco.setFreq(inputFrequencyOffset, outputSampleRate);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
if (((outputSampleRate != m_outputSampleRate) && (!m_settings.m_autoRWBalance)) || force)
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_interpolatorDistanceRemain = 0;
|
||||
m_interpolatorConsumed = false;
|
||||
m_interpolatorDistance = (Real) m_settings.m_inputSampleRate / (Real) outputSampleRate;
|
||||
m_interpolator.create(48, m_settings.m_inputSampleRate, m_settings.m_rfBandwidth / 2.2, 3.0);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
m_basebandSampleRate = basebandSampleRate;
|
||||
m_outputSampleRate = outputSampleRate;
|
||||
m_inputFrequencyOffset = inputFrequencyOffset;
|
||||
Message* cmd = UDPSourceBaseband::MsgResetReadIndex::create();
|
||||
m_basebandSource->getInputMessageQueue()->push(cmd);
|
||||
}
|
||||
|
||||
void UDPSource::applySettings(const UDPSourceSettings& settings, bool force)
|
||||
@@ -565,76 +220,8 @@ void UDPSource::applySettings(const UDPSourceSettings& settings, bool force)
|
||||
reverseAPIKeys.append("stereoInput");
|
||||
}
|
||||
|
||||
if((settings.m_rfBandwidth != m_settings.m_rfBandwidth) ||
|
||||
(settings.m_lowCutoff != m_settings.m_lowCutoff) ||
|
||||
(settings.m_inputSampleRate != m_settings.m_inputSampleRate) || force)
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_interpolatorDistanceRemain = 0;
|
||||
m_interpolatorConsumed = false;
|
||||
m_interpolatorDistance = (Real) settings.m_inputSampleRate / (Real) m_outputSampleRate;
|
||||
m_interpolator.create(48, settings.m_inputSampleRate, settings.m_rfBandwidth / 2.2, 3.0);
|
||||
m_actualInputSampleRate = settings.m_inputSampleRate;
|
||||
m_udpHandler.resetReadIndex();
|
||||
m_sampleRateSum = 0.0;
|
||||
m_sampleRateAvgCounter = 0;
|
||||
m_spectrumChunkSize = settings.m_inputSampleRate * 0.05; // 50 ms chunk
|
||||
m_spectrumChunkCounter = 0;
|
||||
m_levelNbSamples = settings.m_inputSampleRate * 0.01; // every 10 ms
|
||||
m_levelCalcCount = 0;
|
||||
m_peakLevel = 0.0f;
|
||||
m_levelSum = 0.0f;
|
||||
m_udpHandler.resizeBuffer(settings.m_inputSampleRate);
|
||||
m_inMovingAverage.resize(settings.m_inputSampleRate * 0.01, 1e-10); // 10 ms
|
||||
m_squelchThreshold = settings.m_inputSampleRate * settings.m_squelchGate;
|
||||
initSquelch(m_squelchOpen);
|
||||
m_SSBFilter->create_filter(settings.m_lowCutoff / settings.m_inputSampleRate, settings.m_rfBandwidth / settings.m_inputSampleRate);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
if ((settings.m_squelch != m_settings.m_squelch) || force)
|
||||
{
|
||||
m_squelch = CalcDb::powerFromdB(settings.m_squelch);
|
||||
}
|
||||
|
||||
if ((settings.m_squelchGate != m_settings.m_squelchGate) || force)
|
||||
{
|
||||
m_squelchThreshold = m_outputSampleRate * settings.m_squelchGate;
|
||||
initSquelch(m_squelchOpen);
|
||||
}
|
||||
|
||||
if ((settings.m_udpAddress != m_settings.m_udpAddress) ||
|
||||
(settings.m_udpPort != m_settings.m_udpPort) || force)
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_udpHandler.configureUDPLink(settings.m_udpAddress, settings.m_udpPort);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
if ((settings.m_channelMute != m_settings.m_channelMute) || force)
|
||||
{
|
||||
if (!settings.m_channelMute) {
|
||||
m_udpHandler.resetReadIndex();
|
||||
}
|
||||
}
|
||||
|
||||
if ((settings.m_autoRWBalance != m_settings.m_autoRWBalance) || force)
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_udpHandler.setAutoRWBalance(settings.m_autoRWBalance);
|
||||
|
||||
if (!settings.m_autoRWBalance)
|
||||
{
|
||||
m_interpolatorDistanceRemain = 0;
|
||||
m_interpolatorConsumed = false;
|
||||
m_interpolatorDistance = (Real) settings.m_inputSampleRate / (Real) m_outputSampleRate;
|
||||
m_interpolator.create(48, settings.m_inputSampleRate, settings.m_rfBandwidth / 2.2, 3.0);
|
||||
m_actualInputSampleRate = settings.m_inputSampleRate;
|
||||
m_udpHandler.resetReadIndex();
|
||||
}
|
||||
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
UDPSourceBaseband::MsgConfigureUDPSourceBaseband *msg = UDPSourceBaseband::MsgConfigureUDPSourceBaseband::create(settings, force);
|
||||
m_basebandSource->getInputMessageQueue()->push(msg);
|
||||
|
||||
if (settings.m_useReverseAPI)
|
||||
{
|
||||
@@ -854,9 +441,9 @@ void UDPSource::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& respons
|
||||
{
|
||||
response.getUdpSourceReport()->setInputPowerDb(CalcDb::dbPower(getInMagSq()));
|
||||
response.getUdpSourceReport()->setChannelPowerDb(CalcDb::dbPower(getMagSq()));
|
||||
response.getUdpSourceReport()->setSquelch(m_squelchOpen ? 1 : 0);
|
||||
response.getUdpSourceReport()->setSquelch(m_basebandSource->isSquelchOpen() ? 1 : 0);
|
||||
response.getUdpSourceReport()->setBufferGauge(getBufferGauge());
|
||||
response.getUdpSourceReport()->setChannelSampleRate(m_outputSampleRate);
|
||||
response.getUdpSourceReport()->setChannelSampleRate(m_basebandSource->getChannelSampleRate());
|
||||
}
|
||||
|
||||
void UDPSource::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const UDPSourceSettings& settings, bool force)
|
||||
@@ -937,13 +524,14 @@ void UDPSource::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, c
|
||||
m_networkRequest.setUrl(QUrl(channelSettingsURL));
|
||||
m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
|
||||
|
||||
QBuffer *buffer=new QBuffer();
|
||||
QBuffer *buffer = new QBuffer();
|
||||
buffer->open((QBuffer::ReadWrite));
|
||||
buffer->write(swgChannelSettings->asJson().toUtf8());
|
||||
buffer->seek(0);
|
||||
|
||||
// Always use PATCH to avoid passing reverse API settings
|
||||
m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer);
|
||||
QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer);
|
||||
buffer->setParent(reply);
|
||||
|
||||
delete swgChannelSettings;
|
||||
}
|
||||
@@ -958,10 +546,18 @@ void UDPSource::networkManagerFinished(QNetworkReply *reply)
|
||||
<< " error(" << (int) replyError
|
||||
<< "): " << replyError
|
||||
<< ": " << reply->errorString();
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
QString answer = reply->readAll();
|
||||
answer.chop(1); // remove last \n
|
||||
qDebug("UDPSource::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
|
||||
}
|
||||
|
||||
QString answer = reply->readAll();
|
||||
answer.chop(1); // remove last \n
|
||||
qDebug("UDPSource::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
|
||||
reply->deleteLater();
|
||||
}
|
||||
|
||||
void UDPSource::setLevelMeter(QObject *levelMeter)
|
||||
{
|
||||
connect(m_basebandSource, SIGNAL(levelChanged(qreal, qreal, int)), levelMeter, SLOT(levelChanged(qreal, qreal, int)));
|
||||
}
|
||||
Reference in New Issue
Block a user