TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-14 04:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move some MatchedFilter code to .cpp file.

Browse Source
This commit is contained in:
Jared Boone 2015-10-02 22:42:42 -07:00
parent aff7865c61
commit 8198db768d
3 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/baseband/Makefile
View File

@ -133,6 +133,7 @@ CPPSRC = main.cpp \
channel_decimator.cpp \
dsp_decimate.cpp \
dsp_demodulate.cpp \
matched_filter.cpp \
proc_am_audio.cpp \
proc_nfm_audio.cpp \
proc_wfm_audio.cpp \

47
firmware/baseband/matched_filter.cpp Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright (C) 2015 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 "matched_filter.hpp"
namespace dsp {
namespace matched_filter {
bool MatchedFilter::execute_once(
const sample_t input
) {
samples[samples.size() - decimation_factor + decimation_phase] = input;
advance_decimation_phase();
if( is_new_decimation_cycle() ) {
output = std::inner_product(samples.cbegin(), samples.cend(), taps.cbegin(), sample_t { 0.0f, 0.0f });
shift_by_decimation_factor();
return true;
} else {
return false;
}
}
void MatchedFilter::shift_by_decimation_factor() {
std::rotate(samples.begin(), samples.begin() + decimation_factor, samples.end());
}
} /* namespace matched_filter */
} /* namespace dsp */

17
firmware/baseband/matched_filter.hpp
View File

@ -54,18 +54,7 @@ public:
bool execute_once(
const sample_t input
) {
samples[samples.size() - decimation_factor + decimation_phase] = input;
advance_decimation_phase();
if( is_new_decimation_cycle() ) {
output = std::inner_product(samples.cbegin(), samples.cend(), taps.cbegin(), sample_t { 0.0f, 0.0f });
shift_by_decimation_factor();
return true;
} else {
return false;
}
}
);
sample_t get_output() const {
return output;
@ -80,9 +69,7 @@ private:
size_t decimation_phase { 0 };
sample_t output;
void shift_by_decimation_factor() {
std::rotate(samples.begin(), samples.begin() + decimation_factor, samples.end());
}
void shift_by_decimation_factor();
void advance_decimation_phase() {
decimation_phase = (decimation_phase + 1) % decimation_factor;