VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-04-30 03:14:01 -04:00
Code Issues Projects Releases Wiki Activity

Replace NCOF with NCO as the latter has better SFDR.

Browse Source
This commit is contained in:
Jon Beniston 2026-01-25 11:11:20 +00:00
parent 29357a8244
commit bffe587c18
17 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/channelrx/chanalyzer/chanalyzersink.h
View File

@ -22,7 +22,7 @@
#include "dsp/channelsamplesink.h"
#include "dsp/interpolator.h"
#include "dsp/decimatorc.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "dsp/fftcorr.h"
#include "dsp/fftfilt.h"
#include "dsp/phaselockcomplex.h"
@ -65,7 +65,7 @@ private:
bool m_usb;
double m_magsq;
NCOF m_nco;
NCO m_nco;
Interpolator m_interpolator;
Real m_interpolatorDistance;
Real m_interpolatorDistanceRemain;

4
plugins/channelrx/demodfreedv/freedvdemodsink.h
View File

@ -25,7 +25,7 @@
#include <QRecursiveMutex>
#include "dsp/channelsamplesink.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/fftfilt.h"
#include "dsp/agc.h"
@ -171,7 +171,7 @@ private:
DoubleBufferFIFO<fftfilt::cmplx> m_squelchDelayLine;
bool m_audioActive; //!< True if an audio signal is produced (no AGC or AGC and above threshold)
NCOF m_nco;
NCO m_nco;
Interpolator m_interpolator;
Real m_interpolatorDistance;
Real m_interpolatorDistanceRemain;

4
plugins/channelrx/demodft8/ft8demodsink.h
View File

@ -21,7 +21,7 @@
#include <QVector>
#include "dsp/channelsamplesink.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/fftfilt.h"
#include "dsp/agc.h"
@ -123,7 +123,7 @@ private:
bool m_agcActive;
bool m_audioActive; //!< True if an audio signal is produced (no AGC or AGC and above threshold)
NCOF m_nco;
NCO m_nco;
Interpolator m_interpolator;
Real m_interpolatorDistance;
Real m_interpolatorDistanceRemain;

4
plugins/channelrx/demodssb/ssbdemodsink.h
View File

@ -21,7 +21,7 @@
#include <QVector>
#include "dsp/channelsamplesink.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/fftfilt.h"
#include "dsp/agc.h"
@ -115,7 +115,7 @@ private:
Lowpass<Real> m_lowpassQ;
NCOF m_nco;
NCO m_nco;
Interpolator m_interpolator;
Real m_interpolatorDistance;
Real m_interpolatorDistanceRemain;

4
plugins/channelrx/filesink/filesinksink.h
View File

@ -25,7 +25,7 @@
#include "dsp/filerecordinterface.h"
#include "dsp/decimatorc.h"
#include "dsp/samplesimplefifo.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "filesinksettings.h"
@ -65,7 +65,7 @@ private:
int m_channelFrequencyOffset;
int m_sinkSampleRate;
int64_t m_centerFrequency;
NCOF m_nco;
NCO m_nco;
DecimatorC m_decimator;
SampleVector m_sampleBuffer;
FileSinkSettings m_settings;

4
plugins/channelrx/freqtracker/freqtrackersink.h
View File

@ -23,7 +23,7 @@
#include <vector>
#include "dsp/channelsamplesink.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "util/movingaverage.h"
#include "dsp/phaselockcomplex.h"
@ -103,7 +103,7 @@ private:
Complex m_sum;
int m_undersampleCount;
NCOF m_nco;
NCO m_nco;
PhaseLockComplex m_pll;
FreqLockComplex m_fll;
Interpolator m_interpolator;

4
plugins/channelrx/sigmffilesink/sigmffilesinksink.h
View File

@ -24,7 +24,7 @@
#include "dsp/sigmffilerecord.h"
#include "dsp/decimatorc.h"
#include "dsp/samplesimplefifo.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "sigmffilesinksettings.h"
@ -64,7 +64,7 @@ private:
int m_channelFrequencyOffset;
int m_sinkSampleRate;
int64_t m_centerFrequency;
NCOF m_nco;
NCO m_nco;
DecimatorC m_decimator;
SampleVector m_sampleBuffer;
SigMFFileSinkSettings m_settings;

4
plugins/channelrx/wdsprx/wdsprxsink.h
View File

@ -21,7 +21,7 @@
#include <QVector>
#include "dsp/channelsamplesink.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/fftfilt.h"
#include "dsp/firfilter.h"
@ -100,7 +100,7 @@ private:
DoubleBufferFIFO<fftfilt::cmplx> m_squelchDelayLine;
bool m_audioActive; //!< True if an audio signal is produced (no AGC or AGC and above threshold)
NCOF m_nco;
NCO m_nco;
Interpolator m_interpolator;
Real m_interpolatorDistance;
Real m_interpolatorDistanceRemain;

3
plugins/channeltx/modam/ammodsource.h
View File

@ -28,7 +28,6 @@
#include "dsp/channelsamplesource.h"
#include "dsp/nco.h"
#include "dsp/ncof.h"
#include "dsp/interpolator.h"
#include "util/movingaverage.h"
#include "audio/audiofifo.h"
@ -76,7 +75,7 @@ private:
ChannelAPI *m_channel;
NCO m_carrierNco;
NCOF m_toneNco;
NCO m_toneNco;
Complex m_modSample;
Interpolator m_interpolator;

6
plugins/channeltx/modfreedv/freedvmodsource.h
View File

@ -26,7 +26,7 @@
#include <fstream>
#include "dsp/channelsamplesource.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/fftfilt.h"
#include "util/movingaverage.h"
@ -78,8 +78,8 @@ private:
Real m_hiCutoff;
FreeDVModSettings m_settings;
NCOF m_carrierNco;
NCOF m_toneNco;
NCO m_carrierNco;
NCO m_toneNco;
Complex m_modSample;
Interpolator m_interpolator;

3
plugins/channeltx/modm17/m17modsource.h
View File

@ -29,7 +29,6 @@
#include "dsp/channelsamplesource.h"
#include "dsp/nco.h"
#include "dsp/ncof.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/filterrc.h"
@ -80,7 +79,7 @@ private:
ChannelAPI *m_channel;
NCO m_carrierNco;
NCOF m_toneNco;
NCO m_toneNco;
float m_modPhasor; //!< baseband modulator phasor
Complex m_modSample;

5
plugins/channeltx/modnfm/nfmmodsource.h
View File

@ -28,7 +28,6 @@
#include "dsp/channelsamplesource.h"
#include "dsp/nco.h"
#include "dsp/ncof.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/filterrc.h"
@ -80,8 +79,8 @@ private:
ChannelAPI *m_channel;
NCO m_carrierNco;
NCOF m_toneNco;
NCOF m_ctcssNco;
NCO m_toneNco;
NCO m_ctcssNco;
NFMModDCS m_dcsMod;
float m_modPhasor = 0.0f; //!< baseband modulator phasor
Complex m_modSample;

6
plugins/channeltx/modssb/ssbmodsource.h
View File

@ -27,7 +27,7 @@
#include <fstream>
#include "dsp/channelsamplesource.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/fftfilt.h"
#include "dsp/cwkeyer.h"
@ -79,8 +79,8 @@ private:
SSBModSettings m_settings;
ChannelAPI *m_channel;
NCOF m_carrierNco;
NCOF m_toneNco;
NCO m_carrierNco;
NCO m_toneNco;
Complex m_modSample;
Interpolator m_interpolator;

6
plugins/channeltx/modwfm/wfmmodsource.h
View File

@ -28,7 +28,7 @@
#include "dsp/channelsamplesource.h"
#include "dsp/nco.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/fftfilt.h"
#include "util/movingaverage.h"
@ -76,8 +76,8 @@ private:
ChannelAPI *m_channel;
NCO m_carrierNco;
NCOF m_toneNco;
NCOF m_cwToneNco;
NCO m_toneNco;
NCO m_cwToneNco;
float m_modPhasor; //!< baseband modulator phasor
Complex m_modSample;

6
plugins/samplemimo/testmi/testmiworker.h
View File

@ -25,7 +25,7 @@
#include <QDebug>
#include "dsp/decimators.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "util/messagequeue.h"
#include "testmisettings.h"
@ -70,8 +70,8 @@ private:
SampleVector m_convertBuffer;
SampleMIFifo* m_sampleFifo;
int m_streamIndex;
NCOF m_nco;
NCOF m_toneNco;
NCO m_nco;
NCO m_toneNco;
int m_frequencyShift;
int m_toneFrequency;
TestMIStreamSettings::Modulation m_modulation;

6
plugins/samplesource/testsource/testsourceworker.h
View File

@ -28,7 +28,7 @@
#include "dsp/samplesinkfifo.h"
#include "dsp/decimators.h"
#include "dsp/ncof.h"
#include "dsp/nco.h"
#include "util/messagequeue.h"
#include "testsourcesettings.h"
@ -70,8 +70,8 @@ private:
quint32 m_chunksize;
SampleVector m_convertBuffer;
SampleSinkFifo* m_sampleFifo;
NCOF m_nco;
NCOF m_toneNco;
NCO m_nco;
NCO m_toneNco;
int m_frequencyShift;
int m_toneFrequency;
TestSourceSettings::Modulation m_modulation;

2
sdrbase/CMakeLists.txt
View File

@ -163,7 +163,6 @@ set(sdrbase_SOURCES
dsp/mimochannel.cpp
dsp/morsedemod.cpp
dsp/nco.cpp
dsp/ncof.cpp
dsp/phaselock.cpp
dsp/phaselockcomplex.cpp
dsp/projector.cpp
@ -413,7 +412,6 @@ set(sdrbase_HEADERS
dsp/movingaverage.h
dsp/morsedemod.h
dsp/nco.h
dsp/ncof.h
dsp/phasediscri.h
dsp/phaselock.h
dsp/phaselockcomplex.h