Extract NarrowbandFMAudio into separate files.

firmware/baseband/Makefile

@@ -134,6 +134,7 @@ CPPSRC = main.cpp \
          dsp_decimate.cpp \
          dsp_demodulate.cpp \
          proc_am_audio.cpp \
+         proc_nfm_audio.cpp \
          dsp_squelch.cpp \
          clock_recovery.cpp \
          access_code_correlator.cpp \

firmware/baseband/main.cpp

@@ -53,6 +53,7 @@
 #include "channel_decimator.hpp"
 #include "baseband_processor.hpp"
 #include "proc_am_audio.hpp"
+#include "proc_nfm_audio.hpp"
 
 #include "clock_recovery.hpp"
 #include "access_code_correlator.hpp"
@@ -78,67 +79,6 @@
 constexpr auto baseband_thread_priority = NORMALPRIO + 20;
 constexpr auto rssi_thread_priority = NORMALPRIO + 10;
 
-class NarrowbandFMAudio : public BasebandProcessor {
-public:
-	void execute(buffer_c8_t buffer) override {
-		/* Called every 2048/3072000 second -- 1500Hz. */
-
-		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<int16_t>[64]
-		 * -> FIR filter, <6kHz (0.063fs) pass, gain 1.0
-		 * -> 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<int16_t>[32]
-		 * -> FM demodulation
-		 * -> 48kHz int16_t[32] */
-		auto audio = demod.execute(channel, work_audio_buffer);
-
-		static uint64_t audio_present_history = 0;
-		const auto audio_present_now = squelch.execute(audio);
-		audio_present_history = (audio_present_history << 1) | (audio_present_now ? 1 : 0);
-		const bool audio_present = (audio_present_history != 0);
-
-		if( !audio_present ) {
-			// Zero audio buffer.
-			for(size_t i=0; i<audio.count; i++) {
-				audio.p[i] = 0;
-			}
-		}
-
-		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_042_078_tfilter;
-	dsp::decimate::FIRAndDecimateBy2Complex<64> channel_filter { channel_filter_taps.taps };
-	dsp::demodulate::FM demod { 48000, 7500 };
-
-	IIRBiquadFilter audio_hpf { audio_hpf_config };
-	FMSquelch squelch;
-};
-
 class WidebandFMAudio : public BasebandProcessor {
 public:
 	void execute(buffer_c8_t buffer) override {

firmware/baseband/proc_nfm_audio.cpp

@@ -0,0 +1,74 @@
+/*
+ * 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_nfm_audio.hpp"
+
+#include <cstdint>
+#include <cstddef>
+
+void NarrowbandFMAudio::execute(buffer_c8_t buffer) {
+	/* Called every 2048/3072000 second -- 1500Hz. */
+
+	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<int16_t>[64]
+	 * -> FIR filter, <6kHz (0.063fs) pass, gain 1.0
+	 * -> 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<int16_t>[32]
+	 * -> FM demodulation
+	 * -> 48kHz int16_t[32] */
+	auto audio = demod.execute(channel, work_audio_buffer);
+
+	static uint64_t audio_present_history = 0;
+	const auto audio_present_now = squelch.execute(audio);
+	audio_present_history = (audio_present_history << 1) | (audio_present_now ? 1 : 0);
+	const bool audio_present = (audio_present_history != 0);
+
+	if( !audio_present ) {
+		// Zero audio buffer.
+		for(size_t i=0; i<audio.count; i++) {
+			audio.p[i] = 0;
+		}
+	}
+
+	audio_hpf.execute_in_place(audio);
+	fill_audio_buffer(audio);
+}

firmware/baseband/proc_nfm_audio.hpp

@@ -0,0 +1,49 @@
+/*
+ * 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_NFM_AUDIO_H__
+#define __PROC_NFM_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"
+#include "dsp_squelch.hpp"
+
+class NarrowbandFMAudio : 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_042_078_tfilter;
+	dsp::decimate::FIRAndDecimateBy2Complex<64> channel_filter { channel_filter_taps.taps };
+	dsp::demodulate::FM demod { 48000, 7500 };
+
+	IIRBiquadFilter audio_hpf { audio_hpf_config };
+	FMSquelch squelch;
+};
+
+#endif/*__PROC_NFM_AUDIO_H__*/