From e246ea2c3991f06f5ef0bf8fc2a9ad635c16215d Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Thu, 27 Aug 2015 13:07:07 -0700 Subject: [PATCH] Extract NarrowbandAMAudio class into separate files. --- firmware/baseband/Makefile | 1 + firmware/baseband/main.cpp | 46 +--------------------- firmware/baseband/proc_am_audio.cpp | 59 +++++++++++++++++++++++++++++ firmware/baseband/proc_am_audio.hpp | 46 ++++++++++++++++++++++ 4 files changed, 107 insertions(+), 45 deletions(-) create mode 100644 firmware/baseband/proc_am_audio.cpp create mode 100644 firmware/baseband/proc_am_audio.hpp diff --git a/firmware/baseband/Makefile b/firmware/baseband/Makefile index 5bdab344..c15e5920 100755 --- a/firmware/baseband/Makefile +++ b/firmware/baseband/Makefile @@ -133,6 +133,7 @@ CPPSRC = main.cpp \ channel_decimator.cpp \ dsp_decimate.cpp \ dsp_demodulate.cpp \ + proc_am_audio.cpp \ dsp_squelch.cpp \ clock_recovery.cpp \ access_code_correlator.cpp \ diff --git a/firmware/baseband/main.cpp b/firmware/baseband/main.cpp index fd7202d6..87c81474 100755 --- a/firmware/baseband/main.cpp +++ b/firmware/baseband/main.cpp @@ -52,6 +52,7 @@ #include "channel_decimator.hpp" #include "baseband_processor.hpp" +#include "proc_am_audio.hpp" #include "clock_recovery.hpp" #include "access_code_correlator.hpp" @@ -77,51 +78,6 @@ constexpr auto baseband_thread_priority = NORMALPRIO + 20; constexpr auto rssi_thread_priority = NORMALPRIO + 10; -class NarrowbandAMAudio : public BasebandProcessor { -public: - void execute(buffer_c8_t buffer) override { - auto decimator_out = decimator.execute(buffer); - - const buffer_c16_t work_baseband_buffer { - (complex16_t*)decimator_out.p, - sizeof(*decimator_out.p) * decimator_out.count - }; - - /* 96kHz complex[64] - * -> FIR filter, 48kHz int16_t[32] */ - auto channel = channel_filter.execute(decimator_out, work_baseband_buffer); - - // TODO: Feed channel_stats post-decimation data? - feed_channel_stats(channel); - feed_channel_spectrum( - channel, - decimator_out.sampling_rate * channel_filter_taps.pass_frequency_normalized, - decimator_out.sampling_rate * channel_filter_taps.stop_frequency_normalized - ); - - const buffer_s16_t work_audio_buffer { - (int16_t*)decimator_out.p, - sizeof(*decimator_out.p) * decimator_out.count - }; - - /* 48kHz complex[32] - * -> AM demodulation - * -> 48kHz int16_t[32] */ - auto audio = demod.execute(channel, work_audio_buffer); - - audio_hpf.execute_in_place(audio); - fill_audio_buffer(audio); - } - -private: - ChannelDecimator decimator { ChannelDecimator::DecimationFactor::By32 }; - const fir_taps_real<64>& channel_filter_taps = taps_64_lp_031_070_tfilter; - dsp::decimate::FIRAndDecimateBy2Complex<64> channel_filter { channel_filter_taps.taps }; - dsp::demodulate::AM demod; - IIRBiquadFilter audio_hpf { audio_hpf_config }; -}; - class NarrowbandFMAudio : public BasebandProcessor { public: void execute(buffer_c8_t buffer) override { diff --git a/firmware/baseband/proc_am_audio.cpp b/firmware/baseband/proc_am_audio.cpp new file mode 100644 index 00000000..7a688a08 --- /dev/null +++ b/firmware/baseband/proc_am_audio.cpp @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. + * + * This file is part of PortaPack. + * + * 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; either version 2, or (at your option) + * any later version. + * + * 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 for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#include "proc_am_audio.hpp" + +#include + +void NarrowbandAMAudio::execute(buffer_c8_t buffer) { + auto decimator_out = decimator.execute(buffer); + + const buffer_c16_t work_baseband_buffer { + (complex16_t*)decimator_out.p, + sizeof(*decimator_out.p) * decimator_out.count + }; + + /* 96kHz complex[64] + * -> FIR filter, 48kHz int16_t[32] */ + auto channel = channel_filter.execute(decimator_out, work_baseband_buffer); + + // TODO: Feed channel_stats post-decimation data? + feed_channel_stats(channel); + feed_channel_spectrum( + channel, + decimator_out.sampling_rate * channel_filter_taps.pass_frequency_normalized, + decimator_out.sampling_rate * channel_filter_taps.stop_frequency_normalized + ); + + const buffer_s16_t work_audio_buffer { + (int16_t*)decimator_out.p, + sizeof(*decimator_out.p) * decimator_out.count + }; + + /* 48kHz complex[32] + * -> AM demodulation + * -> 48kHz int16_t[32] */ + auto audio = demod.execute(channel, work_audio_buffer); + + audio_hpf.execute_in_place(audio); + fill_audio_buffer(audio); +} diff --git a/firmware/baseband/proc_am_audio.hpp b/firmware/baseband/proc_am_audio.hpp new file mode 100644 index 00000000..5ba41302 --- /dev/null +++ b/firmware/baseband/proc_am_audio.hpp @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. + * + * This file is part of PortaPack. + * + * 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; either version 2, or (at your option) + * any later version. + * + * 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 for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __PROC_AM_AUDIO_H__ +#define __PROC_AM_AUDIO_H__ + +#include "baseband_processor.hpp" + +#include "channel_decimator.hpp" +#include "dsp_decimate.hpp" +#include "dsp_demodulate.hpp" +#include "dsp_fir_taps.hpp" +#include "dsp_iir.hpp" +#include "dsp_iir_config.hpp" + +class NarrowbandAMAudio : public BasebandProcessor { +public: + void execute(buffer_c8_t buffer) override; + +private: + ChannelDecimator decimator { ChannelDecimator::DecimationFactor::By32 }; + const fir_taps_real<64>& channel_filter_taps = taps_64_lp_031_070_tfilter; + dsp::decimate::FIRAndDecimateBy2Complex<64> channel_filter { channel_filter_taps.taps }; + dsp::demodulate::AM demod; + IIRBiquadFilter audio_hpf { audio_hpf_config }; +}; + +#endif/*__PROC_AM_AUDIO_H__*/