diff --git a/include-gpl/dsp/pidcontroller.h b/include-gpl/dsp/pidcontroller.h new file mode 100644 index 000000000..7b96793fa --- /dev/null +++ b/include-gpl/dsp/pidcontroller.h @@ -0,0 +1,28 @@ +#ifndef INCLUDE_PIDCONTROLLER_H +#define INCLUDE_PIDCONTROLLER_H + +#include "dsp/dsptypes.h" + +class PIDController { +private: + Real m_p; + Real m_i; + Real m_d; + Real m_int; + Real m_diff; + +public: + PIDController(); + + void setup(Real p, Real i, Real d); + + Real feed(Real v) + { + m_int += v * m_i; + Real d = m_d * (m_diff - v); + m_diff = v; + return (v * m_p) + m_int + d; + } +}; + +#endif // INCLUDE_PIDCONTROLLER_H diff --git a/plugins/channel/nfm/nfmdemod.cpp b/plugins/channel/nfm/nfmdemod.cpp index 4a8e20781..a9566b5f4 100644 --- a/plugins/channel/nfm/nfmdemod.cpp +++ b/plugins/channel/nfm/nfmdemod.cpp @@ -17,9 +17,11 @@ #include #include +#include #include "nfmdemod.h" #include "audio/audiooutput.h" #include "dsp/dspcommands.h" +#include "dsp/pidcontroller.h" MESSAGE_CLASS_DEFINITION(NFMDemod::MsgConfigureNFMDemod, Message) @@ -27,21 +29,17 @@ NFMDemod::NFMDemod(AudioFifo* audioFifo, SampleSink* sampleSink) : m_sampleSink(sampleSink), m_audioFifo(audioFifo) { - m_rfBandwidth = 12500; - m_volume = 2.0; - m_squelchLevel = pow(10.0, -40.0 / 10.0); - m_sampleRate = 500000; - m_frequency = 0; - m_scale = 0; - m_framedrop = 0; + m_config.m_inputSampleRate = 96000; + m_config.m_inputFrequencyOffset = 0; + m_config.m_rfBandwidth = 12500; + m_config.m_afBandwidth = 3000; + m_config.m_squelch = -40.0; + m_config.m_volume = 2.0; + m_config.m_audioSampleRate = 48000; - m_nco.setFreq(m_frequency, m_sampleRate); - m_interpolator.create(16, m_sampleRate, 12500); - m_sampleDistanceRemain = (Real)m_sampleRate / 48000.0; + apply(); - m_lowpass.create(21, 48000, 3000); - - m_audioBuffer.resize(256); + m_audioBuffer.resize(16384); m_audioBufferFill = 0; m_movingAverage.resize(16, 0); @@ -57,70 +55,126 @@ void NFMDemod::configure(MessageQueue* messageQueue, Real rfBandwidth, Real afBa cmd->submit(messageQueue, this); } -void NFMDemod::feed(SampleVector::const_iterator begin, SampleVector::const_iterator end, bool positiveOnly) +float arctan2(Real y, Real x) +{ + Real coeff_1 = M_PI / 4; + Real coeff_2 = 3 * coeff_1; + Real abs_y = fabs(y) + 1e-10; // kludge to prevent 0/0 condition + Real angle; + if( x>= 0) { + Real r = (x - abs_y) / (x + abs_y); + angle = coeff_1 - coeff_1 * r; + } else { + Real r = (x + abs_y) / (abs_y - x); + angle = coeff_2 - coeff_1 * r; + } + if(y < 0) + return(-angle); + else return(angle); +} + +Real angleDist(Real a, Real b) +{ + Real dist = b - a; + + while(dist <= M_PI) + dist += 2 * M_PI; + while(dist >= M_PI) + dist -= 2 * M_PI; + + return dist; +} + +void NFMDemod::feed(SampleVector::const_iterator begin, SampleVector::const_iterator end, bool firstOfBurst) { Complex ci; - qint16 sample; - Real a, b, s, demod; - double meansqr = 1.0; - for(SampleVector::const_iterator it = begin; it < end; ++it) { + if(m_audioFifo->size() <= 0) + return; + + for(SampleVector::const_iterator it = begin; it != end; ++it) { Complex c(it->real() / 32768.0, it->imag() / 32768.0); c *= m_nco.nextIQ(); - if(m_interpolator.interpolate(&m_sampleDistanceRemain, c, &ci)) { - s = ci.real() * ci.real() + ci.imag() * ci.imag(); - meansqr += s; - m_movingAverage.feed(s); - if(m_movingAverage.average() >= m_squelchLevel) - m_squelchState = m_sampleRate / 50; + { + if(m_interpolator.interpolate(&m_interpolatorDistanceRemain, c, &ci)) { + m_sampleBuffer.push_back(Sample(ci.real() * 32767.0, ci.imag() * 32767.0)); - a = m_scale * m_this.real() * (m_last.imag() - ci.imag()); - b = m_scale * m_this.imag() * (m_last.real() - ci.real()); - m_last = m_this; - m_this = Complex(ci.real(), ci.imag()); + m_movingAverage.feed(ci.real() * ci.real() + ci.imag() * ci.imag()); + if(m_movingAverage.average() >= m_squelchLevel) + m_squelchState = m_running.m_audioSampleRate/ 20; - demod = m_volume * m_lowpass.filter(b - a); - sample = demod * 30000; + qint16 sample; + if(m_squelchState > 0) { + m_squelchState--; + /* + Real argument = arg(ci); + Real demod = argument - m_lastArgument; + m_lastArgument = argument; + */ - // Display audio spectrum to 12kHz - if (++m_framedrop & 1) - m_sampleBuffer.push_back(Sample(sample, sample)); + Complex d = conj(m_lastSample) * ci; + m_lastSample = ci; + Real demod = atan2(d.imag(), d.real()); + //Real demod = arctan2(d.imag(), d.real()); +/* + Real argument1 = arg(ci);//atan2(ci.imag(), ci.real()); + Real argument2 = m_lastSample.real(); + Real demod = angleDist(argument2, argument1); + m_lastSample = Complex(argument1, 0); +*/ + + + demod /= M_PI; + + demod = m_lowpass.filter(demod); + + if(demod < -1) + demod = -1; + else if(demod > 1) + demod = 1; + + demod *= m_running.m_volume; + sample = demod * 32700; + + } else { + sample = 0; + } - if(m_squelchState > 0) - m_squelchState--; - else - sample = 0; - { m_audioBuffer[m_audioBufferFill].l = sample; m_audioBuffer[m_audioBufferFill].r = sample; ++m_audioBufferFill; if(m_audioBufferFill >= m_audioBuffer.size()) { uint res = m_audioFifo->write((const quint8*)&m_audioBuffer[0], m_audioBufferFill, 1); if(res != m_audioBufferFill) - qDebug("lost %u samples", m_audioBufferFill - res); + qDebug("lost %u audio samples", m_audioBufferFill - res); m_audioBufferFill = 0; } - } - m_sampleDistanceRemain += (Real)m_sampleRate / 48000.0; + m_interpolatorDistanceRemain += m_interpolatorDistance; + } } } - if(m_audioFifo->write((const quint8*)&m_audioBuffer[0], m_audioBufferFill, 0) != m_audioBufferFill) - ;//qDebug("lost samples"); - m_audioBufferFill = 0; + if(m_audioBufferFill > 0) { + uint res = m_audioFifo->write((const quint8*)&m_audioBuffer[0], m_audioBufferFill, 1); + if(res != m_audioBufferFill) + qDebug("lost %u samples", m_audioBufferFill - res); + m_audioBufferFill = 0; + } if(m_sampleSink != NULL) - m_sampleSink->feed(m_sampleBuffer.begin(), m_sampleBuffer.end(), true); + m_sampleSink->feed(m_sampleBuffer.begin(), m_sampleBuffer.end(), false); m_sampleBuffer.clear(); - - // TODO: correct levels - m_scale = ( end - begin) * m_sampleRate / 48000 / meansqr; } void NFMDemod::start() { m_squelchState = 0; + m_audioFifo->clear(); + m_interpolatorRegulation = 0.9999; + m_interpolatorDistance = 1.0; + m_interpolatorDistanceRemain = 0.0; + m_lastSample = 0; } void NFMDemod::stop() @@ -131,22 +185,19 @@ bool NFMDemod::handleMessage(Message* cmd) { if(DSPSignalNotification::match(cmd)) { DSPSignalNotification* signal = (DSPSignalNotification*)cmd; - qDebug("%d samples/sec, %lld Hz offset", signal->getSampleRate(), signal->getFrequencyOffset()); - m_sampleRate = signal->getSampleRate(); - m_nco.setFreq(-signal->getFrequencyOffset(), m_sampleRate); - m_interpolator.create(16, m_sampleRate, m_rfBandwidth / 2.1); - m_sampleDistanceRemain = m_sampleRate / 48000.0; - m_squelchState = 0; + + m_config.m_inputSampleRate = signal->getSampleRate(); + m_config.m_inputFrequencyOffset = signal->getFrequencyOffset(); + apply(); cmd->completed(); return true; } else if(MsgConfigureNFMDemod::match(cmd)) { MsgConfigureNFMDemod* cfg = (MsgConfigureNFMDemod*)cmd; - m_rfBandwidth = cfg->getRFBandwidth(); - m_interpolator.create(16, m_sampleRate, m_rfBandwidth / 2.1); - m_lowpass.create(21, 48000, cfg->getAFBandwidth()); - m_squelchLevel = pow(10.0, cfg->getSquelch() / 10.0); - m_volume = cfg->getVolume(); - cmd->completed(); + m_config.m_rfBandwidth = cfg->getRFBandwidth(); + m_config.m_afBandwidth = cfg->getAFBandwidth(); + m_config.m_volume = cfg->getVolume(); + m_config.m_squelch = cfg->getSquelch(); + apply(); return true; } else { if(m_sampleSink != NULL) @@ -154,3 +205,36 @@ bool NFMDemod::handleMessage(Message* cmd) else return false; } } + +void NFMDemod::apply() +{ + + if((m_config.m_inputFrequencyOffset != m_running.m_inputFrequencyOffset) || + (m_config.m_inputSampleRate != m_running.m_inputSampleRate)) { + m_nco.setFreq(-m_config.m_inputFrequencyOffset, m_config.m_inputSampleRate); + } + + if((m_config.m_inputSampleRate != m_running.m_inputSampleRate) || + (m_config.m_rfBandwidth != m_running.m_rfBandwidth)) { + m_interpolator.create(16, m_config.m_inputSampleRate, m_config.m_rfBandwidth / 2.2); + m_interpolatorDistanceRemain = 0; + m_interpolatorDistance = 1.0; + } + + if((m_config.m_afBandwidth != m_running.m_afBandwidth) || + (m_config.m_audioSampleRate != m_running.m_audioSampleRate)) { + m_lowpass.create(21, m_config.m_audioSampleRate, m_config.m_afBandwidth); + } + + if(m_config.m_squelch != m_running.m_squelch) { + m_squelchLevel = pow(10.0, m_config.m_squelch / 20.0); + m_squelchLevel *= m_squelchLevel; + } + + m_running.m_inputSampleRate = m_config.m_inputSampleRate; + m_running.m_inputFrequencyOffset = m_config.m_inputFrequencyOffset; + m_running.m_rfBandwidth = m_config.m_rfBandwidth; + m_running.m_squelch = m_config.m_squelch; + m_running.m_volume = m_config.m_volume; + m_running.m_audioSampleRate = m_config.m_audioSampleRate; +} diff --git a/plugins/channel/nfm/nfmdemod.h b/plugins/channel/nfm/nfmdemod.h index 301e5216e..702a68e01 100644 --- a/plugins/channel/nfm/nfmdemod.h +++ b/plugins/channel/nfm/nfmdemod.h @@ -36,7 +36,7 @@ public: void configure(MessageQueue* messageQueue, Real rfBandwidth, Real afBandwidth, Real volume, Real squelch); - void feed(SampleVector::const_iterator begin, SampleVector::const_iterator end, bool positiveOnly); + void feed(SampleVector::const_iterator begin, SampleVector::const_iterator end, bool po); void start(); void stop(); bool handleMessage(Message* cmd); @@ -77,30 +77,56 @@ private: }; typedef std::vector AudioVector; - Real m_rfBandwidth; - Real m_volume; - Real m_squelchLevel; - int m_sampleRate; - int m_frequency; + enum RateState { + RSInitialFill, + RSRunning + }; + + struct Config { + int m_inputSampleRate; + qint64 m_inputFrequencyOffset; + Real m_rfBandwidth; + Real m_afBandwidth; + Real m_squelch; + Real m_volume; + quint32 m_audioSampleRate; + + Config() : + m_inputSampleRate(-1), + m_inputFrequencyOffset(0), + m_rfBandwidth(-1), + m_afBandwidth(-1), + m_squelch(0), + m_volume(0), + m_audioSampleRate(0) + { } + }; + + Config m_config; + Config m_running; NCO m_nco; + Real m_interpolatorRegulation; Interpolator m_interpolator; - Real m_sampleDistanceRemain; + Real m_interpolatorDistance; + Real m_interpolatorDistanceRemain; Lowpass m_lowpass; + Real m_squelchLevel; int m_squelchState; - int m_framedrop; - double m_scale; - Complex m_last, m_this; + Real m_lastArgument; + Complex m_lastSample; MovingAverage m_movingAverage; AudioVector m_audioBuffer; uint m_audioBufferFill; SampleSink* m_sampleSink; - SampleVector m_sampleBuffer; AudioFifo* m_audioFifo; + SampleVector m_sampleBuffer; + + void apply(); }; #endif // INCLUDE_NFMDEMOD_H diff --git a/plugins/channel/nfm/nfmdemodgui.cpp b/plugins/channel/nfm/nfmdemodgui.cpp index ed022220e..ce24a01e9 100644 --- a/plugins/channel/nfm/nfmdemodgui.cpp +++ b/plugins/channel/nfm/nfmdemodgui.cpp @@ -155,7 +155,7 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, QWidget* parent) : connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool))); connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked())); - m_audioFifo = new AudioFifo(4, 48000 / 4); + m_audioFifo = new AudioFifo(4, 48000); m_spectrumVis = new SpectrumVis(ui->glSpectrum); m_nfmDemod = new NFMDemod(m_audioFifo, m_spectrumVis); m_channelizer = new Channelizer(m_nfmDemod); @@ -163,8 +163,8 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, QWidget* parent) : m_pluginAPI->addAudioSource(m_audioFifo); m_pluginAPI->addSampleSink(m_threadedSampleSink); - ui->glSpectrum->setCenterFrequency(6000); - ui->glSpectrum->setSampleRate(12000); + ui->glSpectrum->setCenterFrequency(0); + ui->glSpectrum->setSampleRate(48000); ui->glSpectrum->setDisplayWaterfall(true); ui->glSpectrum->setDisplayMaxHold(true); m_spectrumVis->configure(m_threadedSampleSink->getMessageQueue(), 64, 10, FFTWindow::BlackmanHarris); diff --git a/plugins/channel/nfm_testing/CMakeLists.txt b/plugins/channel/nfm_testing/CMakeLists.txt new file mode 100644 index 000000000..feeb89116 --- /dev/null +++ b/plugins/channel/nfm_testing/CMakeLists.txt @@ -0,0 +1,47 @@ +project(nfm) + +set(nfm_SOURCES + nfmdemod.cpp + nfmdemodgui.cpp + nfmplugin.cpp +) + +set(nfm_HEADERS + nfmdemod.h + nfmdemodgui.h + nfmplugin.h +) + +set(nfm_FORMS + nfmdemodgui.ui +) + +include_directories( + . + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/include-gpl + ${OPENGL_INCLUDE_DIR} +) + +#include(${QT_USE_FILE}) +add_definitions(${QT_DEFINITIONS}) +add_definitions(-DQT_PLUGIN) +add_definitions(-DQT_SHARED) + +#qt5_wrap_cpp(nfm_HEADERS_MOC ${nfm_HEADERS}) +qt5_wrap_ui(nfm_FORMS_HEADERS ${nfm_FORMS}) + +add_library(demodnfm SHARED + ${nfm_SOURCES} + ${nfm_HEADERS_MOC} + ${nfm_FORMS_HEADERS} +) + +target_link_libraries(demodnfm + ${QT_LIBRARIES} + ${OPENGL_LIBRARIES} + sdrbase +) + +qt5_use_modules(demodnfm Core Widgets OpenGL Multimedia) \ No newline at end of file diff --git a/plugins/channel/nfm_testing/nfmdemod.cpp b/plugins/channel/nfm_testing/nfmdemod.cpp new file mode 100644 index 000000000..4a8e20781 --- /dev/null +++ b/plugins/channel/nfm_testing/nfmdemod.cpp @@ -0,0 +1,156 @@ +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany // +// written by Christian Daniel // +// // +// 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 // +// the Free Software Foundation as version 3 of the License, or // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include "nfmdemod.h" +#include "audio/audiooutput.h" +#include "dsp/dspcommands.h" + +MESSAGE_CLASS_DEFINITION(NFMDemod::MsgConfigureNFMDemod, Message) + +NFMDemod::NFMDemod(AudioFifo* audioFifo, SampleSink* sampleSink) : + m_sampleSink(sampleSink), + m_audioFifo(audioFifo) +{ + m_rfBandwidth = 12500; + m_volume = 2.0; + m_squelchLevel = pow(10.0, -40.0 / 10.0); + m_sampleRate = 500000; + m_frequency = 0; + m_scale = 0; + m_framedrop = 0; + + m_nco.setFreq(m_frequency, m_sampleRate); + m_interpolator.create(16, m_sampleRate, 12500); + m_sampleDistanceRemain = (Real)m_sampleRate / 48000.0; + + m_lowpass.create(21, 48000, 3000); + + m_audioBuffer.resize(256); + m_audioBufferFill = 0; + + m_movingAverage.resize(16, 0); +} + +NFMDemod::~NFMDemod() +{ +} + +void NFMDemod::configure(MessageQueue* messageQueue, Real rfBandwidth, Real afBandwidth, Real volume, Real squelch) +{ + Message* cmd = MsgConfigureNFMDemod::create(rfBandwidth, afBandwidth, volume, squelch); + cmd->submit(messageQueue, this); +} + +void NFMDemod::feed(SampleVector::const_iterator begin, SampleVector::const_iterator end, bool positiveOnly) +{ + Complex ci; + qint16 sample; + Real a, b, s, demod; + double meansqr = 1.0; + + for(SampleVector::const_iterator it = begin; it < end; ++it) { + Complex c(it->real() / 32768.0, it->imag() / 32768.0); + c *= m_nco.nextIQ(); + + if(m_interpolator.interpolate(&m_sampleDistanceRemain, c, &ci)) { + s = ci.real() * ci.real() + ci.imag() * ci.imag(); + meansqr += s; + m_movingAverage.feed(s); + if(m_movingAverage.average() >= m_squelchLevel) + m_squelchState = m_sampleRate / 50; + + a = m_scale * m_this.real() * (m_last.imag() - ci.imag()); + b = m_scale * m_this.imag() * (m_last.real() - ci.real()); + m_last = m_this; + m_this = Complex(ci.real(), ci.imag()); + + demod = m_volume * m_lowpass.filter(b - a); + sample = demod * 30000; + + // Display audio spectrum to 12kHz + if (++m_framedrop & 1) + m_sampleBuffer.push_back(Sample(sample, sample)); + + if(m_squelchState > 0) + m_squelchState--; + else + sample = 0; + { + m_audioBuffer[m_audioBufferFill].l = sample; + m_audioBuffer[m_audioBufferFill].r = sample; + ++m_audioBufferFill; + if(m_audioBufferFill >= m_audioBuffer.size()) { + uint res = m_audioFifo->write((const quint8*)&m_audioBuffer[0], m_audioBufferFill, 1); + if(res != m_audioBufferFill) + qDebug("lost %u samples", m_audioBufferFill - res); + m_audioBufferFill = 0; + } + } + + m_sampleDistanceRemain += (Real)m_sampleRate / 48000.0; + } + } + if(m_audioFifo->write((const quint8*)&m_audioBuffer[0], m_audioBufferFill, 0) != m_audioBufferFill) + ;//qDebug("lost samples"); + m_audioBufferFill = 0; + + if(m_sampleSink != NULL) + m_sampleSink->feed(m_sampleBuffer.begin(), m_sampleBuffer.end(), true); + m_sampleBuffer.clear(); + + // TODO: correct levels + m_scale = ( end - begin) * m_sampleRate / 48000 / meansqr; +} + +void NFMDemod::start() +{ + m_squelchState = 0; +} + +void NFMDemod::stop() +{ +} + +bool NFMDemod::handleMessage(Message* cmd) +{ + if(DSPSignalNotification::match(cmd)) { + DSPSignalNotification* signal = (DSPSignalNotification*)cmd; + qDebug("%d samples/sec, %lld Hz offset", signal->getSampleRate(), signal->getFrequencyOffset()); + m_sampleRate = signal->getSampleRate(); + m_nco.setFreq(-signal->getFrequencyOffset(), m_sampleRate); + m_interpolator.create(16, m_sampleRate, m_rfBandwidth / 2.1); + m_sampleDistanceRemain = m_sampleRate / 48000.0; + m_squelchState = 0; + cmd->completed(); + return true; + } else if(MsgConfigureNFMDemod::match(cmd)) { + MsgConfigureNFMDemod* cfg = (MsgConfigureNFMDemod*)cmd; + m_rfBandwidth = cfg->getRFBandwidth(); + m_interpolator.create(16, m_sampleRate, m_rfBandwidth / 2.1); + m_lowpass.create(21, 48000, cfg->getAFBandwidth()); + m_squelchLevel = pow(10.0, cfg->getSquelch() / 10.0); + m_volume = cfg->getVolume(); + cmd->completed(); + return true; + } else { + if(m_sampleSink != NULL) + return m_sampleSink->handleMessage(cmd); + else return false; + } +} diff --git a/plugins/channel/nfm_testing/nfmdemod.h b/plugins/channel/nfm_testing/nfmdemod.h new file mode 100644 index 000000000..301e5216e --- /dev/null +++ b/plugins/channel/nfm_testing/nfmdemod.h @@ -0,0 +1,106 @@ +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany // +// written by Christian Daniel // +// // +// 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 // +// the Free Software Foundation as version 3 of the License, or // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#ifndef INCLUDE_NFMDEMOD_H +#define INCLUDE_NFMDEMOD_H + +#include +#include "dsp/samplesink.h" +#include "dsp/nco.h" +#include "dsp/interpolator.h" +#include "dsp/lowpass.h" +#include "dsp/movingaverage.h" +#include "audio/audiofifo.h" +#include "util/message.h" + +class AudioFifo; + +class NFMDemod : public SampleSink { +public: + NFMDemod(AudioFifo* audioFifo, SampleSink* sampleSink); + ~NFMDemod(); + + void configure(MessageQueue* messageQueue, Real rfBandwidth, Real afBandwidth, Real volume, Real squelch); + + void feed(SampleVector::const_iterator begin, SampleVector::const_iterator end, bool positiveOnly); + void start(); + void stop(); + bool handleMessage(Message* cmd); + +private: + class MsgConfigureNFMDemod : public Message { + MESSAGE_CLASS_DECLARATION + + public: + Real getRFBandwidth() const { return m_rfBandwidth; } + Real getAFBandwidth() const { return m_afBandwidth; } + Real getVolume() const { return m_volume; } + Real getSquelch() const { return m_squelch; } + + static MsgConfigureNFMDemod* create(Real rfBandwidth, Real afBandwidth, Real volume, Real squelch) + { + return new MsgConfigureNFMDemod(rfBandwidth, afBandwidth, volume, squelch); + } + + private: + Real m_rfBandwidth; + Real m_afBandwidth; + Real m_volume; + Real m_squelch; + + MsgConfigureNFMDemod(Real rfBandwidth, Real afBandwidth, Real volume, Real squelch) : + Message(), + m_rfBandwidth(rfBandwidth), + m_afBandwidth(afBandwidth), + m_volume(volume), + m_squelch(squelch) + { } + }; + + struct AudioSample { + qint16 l; + qint16 r; + }; + typedef std::vector AudioVector; + + Real m_rfBandwidth; + Real m_volume; + Real m_squelchLevel; + int m_sampleRate; + int m_frequency; + + NCO m_nco; + Interpolator m_interpolator; + Real m_sampleDistanceRemain; + Lowpass m_lowpass; + + int m_squelchState; + int m_framedrop; + + double m_scale; + Complex m_last, m_this; + MovingAverage m_movingAverage; + + AudioVector m_audioBuffer; + uint m_audioBufferFill; + + SampleSink* m_sampleSink; + SampleVector m_sampleBuffer; + AudioFifo* m_audioFifo; +}; + +#endif // INCLUDE_NFMDEMOD_H diff --git a/plugins/channel/nfm_testing/nfmdemodgui.cpp b/plugins/channel/nfm_testing/nfmdemodgui.cpp new file mode 100644 index 000000000..ed022220e --- /dev/null +++ b/plugins/channel/nfm_testing/nfmdemodgui.cpp @@ -0,0 +1,210 @@ +#include +#include +#include "nfmdemodgui.h" +#include "ui_nfmdemodgui.h" +#include "nfmdemodgui.h" +#include "ui_nfmdemodgui.h" +#include "dsp/threadedsamplesink.h" +#include "dsp/channelizer.h" +#include "nfmdemod.h" +#include "dsp/spectrumvis.h" +#include "gui/glspectrum.h" +#include "plugin/pluginapi.h" +#include "util/simpleserializer.h" +#include "gui/basicchannelsettingswidget.h" + +const int NFMDemodGUI::m_rfBW[] = { + 5000, 6250, 8330, 10000, 12500, 15000, 20000, 25000, 40000 +}; + +NFMDemodGUI* NFMDemodGUI::create(PluginAPI* pluginAPI) +{ + NFMDemodGUI* gui = new NFMDemodGUI(pluginAPI); + return gui; +} + +void NFMDemodGUI::destroy() +{ + delete this; +} + +void NFMDemodGUI::setName(const QString& name) +{ + setObjectName(name); +} + +void NFMDemodGUI::resetToDefaults() +{ + ui->rfBW->setValue(4); + ui->afBW->setValue(3); + ui->volume->setValue(20); + ui->squelch->setValue(-40); + ui->spectrumGUI->resetToDefaults(); + applySettings(); +} + +QByteArray NFMDemodGUI::serialize() const +{ + SimpleSerializer s(1); + s.writeS32(1, m_channelMarker->getCenterFrequency()); + s.writeS32(2, ui->rfBW->value()); + s.writeS32(3, ui->afBW->value()); + s.writeS32(4, ui->volume->value()); + s.writeS32(5, ui->squelch->value()); + s.writeBlob(6, ui->spectrumGUI->serialize()); + s.writeU32(7, m_channelMarker->getColor().rgb()); + return s.final(); +} + +bool NFMDemodGUI::deserialize(const QByteArray& data) +{ + SimpleDeserializer d(data); + + if(!d.isValid()) { + resetToDefaults(); + return false; + } + + if(d.getVersion() == 1) { + QByteArray bytetmp; + quint32 u32tmp; + qint32 tmp; + d.readS32(1, &tmp, 0); + m_channelMarker->setCenterFrequency(tmp); + d.readS32(2, &tmp, 4); + ui->rfBW->setValue(tmp); + d.readS32(3, &tmp, 3); + ui->afBW->setValue(tmp); + d.readS32(4, &tmp, 20); + ui->volume->setValue(tmp); + d.readS32(5, &tmp, -40); + ui->squelch->setValue(tmp); + d.readBlob(6, &bytetmp); + ui->spectrumGUI->deserialize(bytetmp); + if(d.readU32(7, &u32tmp)) + m_channelMarker->setColor(u32tmp); + applySettings(); + return true; + } else { + resetToDefaults(); + return false; + } +} + +bool NFMDemodGUI::handleMessage(Message* message) +{ + return false; +} + +void NFMDemodGUI::viewChanged() +{ + applySettings(); +} + +void NFMDemodGUI::on_rfBW_valueChanged(int value) +{ + ui->rfBWText->setText(QString("%1 kHz").arg(m_rfBW[value] / 1000.0)); + m_channelMarker->setBandwidth(m_rfBW[value]); + applySettings(); +} + +void NFMDemodGUI::on_afBW_valueChanged(int value) +{ + ui->afBWText->setText(QString("%1 kHz").arg(value)); + applySettings(); +} + +void NFMDemodGUI::on_volume_valueChanged(int value) +{ + ui->volumeText->setText(QString("%1").arg(value / 10.0, 0, 'f', 1)); + applySettings(); +} + +void NFMDemodGUI::on_squelch_valueChanged(int value) +{ + ui->squelchText->setText(QString("%1 dB").arg(value)); + applySettings(); +} + + +void NFMDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) +{ + /* + if((widget == ui->spectrumContainer) && (m_nfmDemod != NULL)) + m_nfmDemod->setSpectrum(m_threadedSampleSink->getMessageQueue(), rollDown); + */ +} + +void NFMDemodGUI::onMenuDoubleClicked() +{ + if(!m_basicSettingsShown) { + m_basicSettingsShown = true; + BasicChannelSettingsWidget* bcsw = new BasicChannelSettingsWidget(m_channelMarker, this); + bcsw->show(); + } +} + +NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, QWidget* parent) : + RollupWidget(parent), + ui(new Ui::NFMDemodGUI), + m_pluginAPI(pluginAPI), + m_basicSettingsShown(false) +{ + ui->setupUi(this); + setAttribute(Qt::WA_DeleteOnClose, true); + connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool))); + connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked())); + + m_audioFifo = new AudioFifo(4, 48000 / 4); + m_spectrumVis = new SpectrumVis(ui->glSpectrum); + m_nfmDemod = new NFMDemod(m_audioFifo, m_spectrumVis); + m_channelizer = new Channelizer(m_nfmDemod); + m_threadedSampleSink = new ThreadedSampleSink(m_channelizer); + m_pluginAPI->addAudioSource(m_audioFifo); + m_pluginAPI->addSampleSink(m_threadedSampleSink); + + ui->glSpectrum->setCenterFrequency(6000); + ui->glSpectrum->setSampleRate(12000); + ui->glSpectrum->setDisplayWaterfall(true); + ui->glSpectrum->setDisplayMaxHold(true); + m_spectrumVis->configure(m_threadedSampleSink->getMessageQueue(), 64, 10, FFTWindow::BlackmanHarris); + + m_channelMarker = new ChannelMarker(this); + m_channelMarker->setColor(Qt::red); + m_channelMarker->setBandwidth(12500); + m_channelMarker->setCenterFrequency(0); + m_channelMarker->setVisible(true); + connect(m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged())); + m_pluginAPI->addChannelMarker(m_channelMarker); + + ui->spectrumGUI->setBuddies(m_threadedSampleSink->getMessageQueue(), m_spectrumVis, ui->glSpectrum); + + applySettings(); +} + +NFMDemodGUI::~NFMDemodGUI() +{ + m_pluginAPI->removeChannelInstance(this); + m_pluginAPI->removeAudioSource(m_audioFifo); + m_pluginAPI->removeSampleSink(m_threadedSampleSink); + delete m_threadedSampleSink; + delete m_channelizer; + delete m_nfmDemod; + delete m_spectrumVis; + delete m_audioFifo; + delete m_channelMarker; + delete ui; +} + +void NFMDemodGUI::applySettings() +{ + setTitleColor(m_channelMarker->getColor()); + m_channelizer->configure(m_threadedSampleSink->getMessageQueue(), + 48000, + m_channelMarker->getCenterFrequency()); + m_nfmDemod->configure(m_threadedSampleSink->getMessageQueue(), + m_rfBW[ui->rfBW->value()], + ui->afBW->value() * 1000.0, + ui->volume->value() / 10.0, + ui->squelch->value()); +} diff --git a/plugins/channel/nfm_testing/nfmdemodgui.h b/plugins/channel/nfm_testing/nfmdemodgui.h new file mode 100644 index 000000000..edfb80860 --- /dev/null +++ b/plugins/channel/nfm_testing/nfmdemodgui.h @@ -0,0 +1,64 @@ +#ifndef INCLUDE_NFMDEMODGUI_H +#define INCLUDE_NFMDEMODGUI_H + +#include "gui/rollupwidget.h" +#include "plugin/plugingui.h" + +class PluginAPI; +class ChannelMarker; + +class AudioFifo; +class ThreadedSampleSink; +class Channelizer; +class NFMDemod; +class SpectrumVis; + +namespace Ui { + class NFMDemodGUI; +} + +class NFMDemodGUI : public RollupWidget, public PluginGUI { + Q_OBJECT + +public: + static NFMDemodGUI* create(PluginAPI* pluginAPI); + void destroy(); + + void setName(const QString& name); + + void resetToDefaults(); + QByteArray serialize() const; + bool deserialize(const QByteArray& data); + + bool handleMessage(Message* message); + +private slots: + void viewChanged(); + void on_rfBW_valueChanged(int value); + void on_afBW_valueChanged(int value); + void on_volume_valueChanged(int value); + void on_squelch_valueChanged(int value); + void onWidgetRolled(QWidget* widget, bool rollDown); + void onMenuDoubleClicked(); + +private: + Ui::NFMDemodGUI* ui; + PluginAPI* m_pluginAPI; + ChannelMarker* m_channelMarker; + bool m_basicSettingsShown; + + AudioFifo* m_audioFifo; + ThreadedSampleSink* m_threadedSampleSink; + Channelizer* m_channelizer; + NFMDemod* m_nfmDemod; + SpectrumVis* m_spectrumVis; + + static const int m_rfBW[]; + + explicit NFMDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL); + ~NFMDemodGUI(); + + void applySettings(); +}; + +#endif // INCLUDE_NFMDEMODGUI_H diff --git a/plugins/channel/nfm_testing/nfmdemodgui.ui b/plugins/channel/nfm_testing/nfmdemodgui.ui new file mode 100644 index 000000000..64cc44921 --- /dev/null +++ b/plugins/channel/nfm_testing/nfmdemodgui.ui @@ -0,0 +1,250 @@ + + + NFMDemodGUI + + + + 0 + 0 + 302 + 410 + + + + NFM Demodulator + + + + + 35 + 35 + 242 + 96 + + + + Settings + + + + 2 + + + 3 + + + + + RF Bandwidth + + + + + + + 8 + + + 1 + + + 4 + + + Qt::Horizontal + + + + + + + + 50 + 0 + + + + 12.5kHz + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + AF Bandwidth + + + + + + + 1 + + + 20 + + + 1 + + + 3 + + + Qt::Horizontal + + + + + + + + 50 + 0 + + + + 3 kHz + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Volume + + + + + + + 100 + + + 20 + + + Qt::Horizontal + + + + + + + + 50 + 0 + + + + 2.0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Squelch + + + + + + + -100 + + + 0 + + + -40 + + + Qt::Horizontal + + + + + + + + 50 + 0 + + + + -40dB + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + 40 + 140 + 218 + 184 + + + + Channel Spectrum + + + + 2 + + + 3 + + + + + + 200 + 150 + + + + + + + + + + + + + GLSpectrum + QWidget +
gui/glspectrum.h
+ 1 + + + GLSpectrumGUI + QWidget +
gui/glspectrumgui.h
+ 1 + + + RollupWidget + QWidget +
gui/rollupwidget.h
+ 1 + + + + + diff --git a/plugins/channel/nfm_testing/nfmplugin.cpp b/plugins/channel/nfm_testing/nfmplugin.cpp new file mode 100644 index 000000000..57b5b9249 --- /dev/null +++ b/plugins/channel/nfm_testing/nfmplugin.cpp @@ -0,0 +1,53 @@ +#include +#include +#include "plugin/pluginapi.h" +#include "nfmplugin.h" +#include "nfmdemodgui.h" + +const PluginDescriptor NFMPlugin::m_pluginDescriptor = { + QString("NFM Demodulator"), + QString("---"), + QString("(c) maintech GmbH (written by Christian Daniel)"), + QString("http://www.maintech.de"), + true, + QString("http://www.maintech.de") +}; + +NFMPlugin::NFMPlugin(QObject* parent) : + QObject(parent) +{ +} + +const PluginDescriptor& NFMPlugin::getPluginDescriptor() const +{ + return m_pluginDescriptor; +} + +void NFMPlugin::initPlugin(PluginAPI* pluginAPI) +{ + m_pluginAPI = pluginAPI; + + // register NFM demodulator + QAction* action = new QAction(tr("&NFM Demodulator"), this); + connect(action, SIGNAL(triggered()), this, SLOT(createInstanceNFM())); + m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.nfm", this, action); +} + +PluginGUI* NFMPlugin::createChannel(const QString& channelName) +{ + if(channelName == "de.maintech.sdrangelove.channel.nfm") { + NFMDemodGUI* gui = NFMDemodGUI::create(m_pluginAPI); + m_pluginAPI->registerChannelInstance("de.maintech.sdrangelove.channel.nfm", gui); + m_pluginAPI->addChannelRollup(gui); + return gui; + } else { + return NULL; + } +} + +void NFMPlugin::createInstanceNFM() +{ + NFMDemodGUI* gui = NFMDemodGUI::create(m_pluginAPI); + m_pluginAPI->registerChannelInstance("de.maintech.sdrangelove.channel.nfm", gui); + m_pluginAPI->addChannelRollup(gui); +} diff --git a/plugins/channel/nfm_testing/nfmplugin.h b/plugins/channel/nfm_testing/nfmplugin.h new file mode 100644 index 000000000..0cd345b8f --- /dev/null +++ b/plugins/channel/nfm_testing/nfmplugin.h @@ -0,0 +1,29 @@ +#ifndef INCLUDE_NFMPLUGIN_H +#define INCLUDE_NFMPLUGIN_H + +#include +#include "plugin/plugininterface.h" + +class NFMPlugin : public QObject, PluginInterface { + Q_OBJECT + Q_INTERFACES(PluginInterface) + Q_PLUGIN_METADATA(IID "de.maintech.sdrangelove.channel.nfm") + +public: + explicit NFMPlugin(QObject* parent = NULL); + + const PluginDescriptor& getPluginDescriptor() const; + void initPlugin(PluginAPI* pluginAPI); + + PluginGUI* createChannel(const QString& channelName); + +private: + static const PluginDescriptor m_pluginDescriptor; + + PluginAPI* m_pluginAPI; + +private slots: + void createInstanceNFM(); +}; + +#endif // INCLUDE_NFMPLUGIN_H