From d984532190a7c36bf870efc1ffa6d8e62ee4dc7b Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Fri, 29 Jan 2016 16:18:03 -0800 Subject: [PATCH] Converging AM, NBFM processors for eventual merging. --- firmware/baseband/proc_am_audio.hpp | 4 ++-- firmware/baseband/proc_nfm_audio.hpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/firmware/baseband/proc_am_audio.hpp b/firmware/baseband/proc_am_audio.hpp index 2035c40cc..877363f7a 100644 --- a/firmware/baseband/proc_am_audio.hpp +++ b/firmware/baseband/proc_am_audio.hpp @@ -57,8 +57,8 @@ private: dsp::decimate::FIRC8xR16x24FS4Decim8 decim_0; dsp::decimate::FIRC16xR16x32Decim8 decim_1; dsp::decimate::FIRAndDecimateComplex channel_filter; - uint32_t channel_filter_pass_f; - uint32_t channel_filter_stop_f; + uint32_t channel_filter_pass_f = 0; + uint32_t channel_filter_stop_f = 0; BlockDecimator<32> channel_block_buffer { post_channel_decimation_factor }; diff --git a/firmware/baseband/proc_nfm_audio.hpp b/firmware/baseband/proc_nfm_audio.hpp index 0b2c806d6..08847a1f9 100644 --- a/firmware/baseband/proc_nfm_audio.hpp +++ b/firmware/baseband/proc_nfm_audio.hpp @@ -30,6 +30,8 @@ #include "audio_output.hpp" #include "spectrum_collector.hpp" +#include + class NarrowbandFMAudio : public BasebandProcessor { public: void execute(const buffer_c8_t& buffer) override; @@ -54,7 +56,6 @@ private: dsp::decimate::FIRC8xR16x24FS4Decim8 decim_0; dsp::decimate::FIRC16xR16x32Decim8 decim_1; - dsp::decimate::FIRAndDecimateComplex channel_filter; uint32_t channel_filter_pass_f = 0; uint32_t channel_filter_stop_f = 0;