From 9b6aae348e06dfb3c52f3281aa80563848d7760c Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 19 Dec 2016 08:28:50 +0100 Subject: [PATCH] SSB mod and demod: use precision NCOs --- plugins/channelrx/demodssb/ssbdemod.h | 4 ++-- plugins/channeltx/modssb/ssbmod.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/channelrx/demodssb/ssbdemod.h b/plugins/channelrx/demodssb/ssbdemod.h index 2e5c89039..bff505959 100644 --- a/plugins/channelrx/demodssb/ssbdemod.h +++ b/plugins/channelrx/demodssb/ssbdemod.h @@ -21,7 +21,7 @@ #include #include #include -#include "dsp/nco.h" +#include "dsp/ncof.h" #include "dsp/interpolator.h" #include "dsp/fftfilt.h" #include "audio/audiofifo.h" @@ -143,7 +143,7 @@ private: Real m_magsqPeak; int m_magsqCount; - NCO m_nco; + NCOF m_nco; Interpolator m_interpolator; Real m_sampleDistanceRemain; fftfilt* SSBFilter; diff --git a/plugins/channeltx/modssb/ssbmod.h b/plugins/channeltx/modssb/ssbmod.h index 53f18d5ad..c420fceaa 100644 --- a/plugins/channeltx/modssb/ssbmod.h +++ b/plugins/channeltx/modssb/ssbmod.h @@ -24,7 +24,7 @@ #include "dsp/basebandsamplesource.h" #include "dsp/basebandsamplesink.h" -#include "dsp/nco.h" +#include "dsp/ncof.h" #include "dsp/interpolator.h" #include "dsp/movingaverage.h" #include "dsp/agc.h" @@ -336,8 +336,8 @@ private: Config m_config; Config m_running; - NCO m_carrierNco; - NCO m_toneNco; + NCOF m_carrierNco; + NCOF m_toneNco; Complex m_modSample; Interpolator m_interpolator; Real m_interpolatorDistance;