From 2057ef5206d43d80d3317b793cb0196390c45678 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 24 Apr 2020 09:20:26 +0200 Subject: [PATCH] clean up --- FM.cpp | 8 -------- FMDirectForm1.h | 9 +++------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/FM.cpp b/FM.cpp index 03aa6ec..019e27e 100644 --- a/FM.cpp +++ b/FM.cpp @@ -20,14 +20,6 @@ #include "Globals.h" #include "FM.h" -// 3 stage IIR Butterworth filter generated (if you change the order change the size of m_filterState). Also change the ordre in init call below -// 0.2db band pass ripple -// 300 - 2700Hz -q15_t FILTER_COEFFS[] = {362,724,362,16384,-18947,10676, - 16384,0,-16384,16384,-25170,9526, - 16384,-32768,16384,16384,-32037,15730}; - - CFM::CFM() : m_callsign(), m_rfAck(), diff --git a/FMDirectForm1.h b/FMDirectForm1.h index 857e0a6..4b90245 100644 --- a/FMDirectForm1.h +++ b/FMDirectForm1.h @@ -31,8 +31,8 @@ THE SOFTWARE. #include "Globals.h" -#ifndef DIRECTFORMI_HPP_ -#define DIRECTFORMI_HPP_ +#ifndef DIRECTFORMI_H_ +#define DIRECTFORMI_H_ class CFMDirectFormI { public: @@ -65,9 +65,6 @@ public: c_b2 = my.c_b2; // FIR c_a1 = my.c_a1; c_a2 = my.c_a2; // IIR - - // scaling factor - q_scaling = my.q_scaling; // 2^q_scaling } void reset () @@ -111,4 +108,4 @@ private: q31_t c_a1,c_a2; // IIR }; -#endif /* DIRECTFORMI_HPP_ */ \ No newline at end of file +#endif /* DIRECTFORMI_H */ \ No newline at end of file