Change NBFM audio fs->24k, AM ->12k.

Send channel decimation factor from application to baseband.
This commit is contained in:
Jared Boone 2016-01-29 19:23:30 -08:00
parent 65d224be14
commit aead1d8798
6 changed files with 18 additions and 14 deletions

View file

@ -70,11 +70,11 @@ void NarrowbandAMAudio::configure(const AMConfigureMessage& message) {
constexpr size_t decim_1_output_fs = decim_1_input_fs / decim_1.decimation_factor;
constexpr size_t channel_filter_input_fs = decim_1_output_fs;
constexpr size_t channel_filter_output_fs = channel_filter_input_fs / channel_filter_decimation_factor;
const size_t channel_filter_output_fs = channel_filter_input_fs / message.channel_decimation;
decim_0.configure(message.decim_0_filter.taps, 33554432);
decim_1.configure(message.decim_1_filter.taps, 131072);
channel_filter.configure(message.channel_filter.taps, channel_filter_decimation_factor);
channel_filter.configure(message.channel_filter.taps, message.channel_decimation);
channel_filter_pass_f = message.channel_filter.pass_frequency_normalized * channel_filter_input_fs;
channel_filter_stop_f = message.channel_filter.stop_frequency_normalized * channel_filter_input_fs;
channel_spectrum.set_decimation_factor(std::floor((channel_filter_output_fs / 2) / ((channel_filter_pass_f + channel_filter_stop_f) / 2)));