From 42efb683104e591df7fe2bda38d2d79a7a167306 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 19 Dec 2020 12:40:57 +0100 Subject: [PATCH] Fix building with new GNU Radio firdes API. No functional change, since WIN_HAMMING is the default --- .../resampler/adapters/mmse_resampler_conditioner.cc | 3 +-- src/core/receiver/gnss_flowgraph.cc | 3 +-- .../observables/hybrid_observables_test.cc | 3 +-- .../signal-processing-blocks/tracking/tracking_pull-in_test.cc | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc index a8a9e3a90..5a683c88b 100644 --- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc @@ -55,8 +55,7 @@ MmseResamplerConditioner::MmseResamplerConditioner( std::vector taps = gr::filter::firdes::low_pass(1.0, sample_freq_in_, sample_freq_out_ / 2.1, - sample_freq_out_ / 5, - gr::filter::firdes::win_type::WIN_HAMMING); + sample_freq_out_ / 5); std::cout << "Enabled fractional resampler low pass filter with " << taps.size() << " taps\n"; fir_filter_ccf_ = gr::filter::fir_filter_ccf::make(1, taps); diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index d331ed7c9..09495bf5d 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -464,8 +464,7 @@ void GNSSFlowgraph::connect() std::vector taps = gr::filter::firdes::low_pass(1.0, fs, acq_fs_decimated / 2.1, - acq_fs_decimated / 2, - gr::filter::firdes::win_type::WIN_HAMMING); + acq_fs_decimated / 2); gr::basic_block_sptr fir_filter_ccf_ = gr::filter::fir_filter_ccf::make(decimation, taps); diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc index 7db35bcb0..465acfa3a 100644 --- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc @@ -544,8 +544,7 @@ bool HybridObservablesTest::acquire_signal() taps = gr::filter::firdes::low_pass(1.0, baseband_sampling_freq, acq_fs / 2.1, - acq_fs / 10, - gr::filter::firdes::win_type::WIN_HAMMING); + acq_fs / 10); std::cout << "Enabled decimation low pass filter with " << taps.size() << " taps and decimation factor of " << decimation << '\n'; acquisition->set_resampler_latency((taps.size() - 1) / 2); gr::basic_block_sptr fir_filter_ccf_ = gr::filter::fir_filter_ccf::make(decimation, taps); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc index fe44bc98e..cbce94180 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc @@ -558,8 +558,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID) taps = gr::filter::firdes::low_pass(1.0, baseband_sampling_freq, acq_fs / 2.1, - acq_fs / 10, - gr::filter::firdes::win_type::WIN_HAMMING); + acq_fs / 10); std::cout << "Enabled decimation low pass filter with " << taps.size() << " taps and decimation factor of " << decimation << '\n'; acquisition->set_resampler_latency((taps.size() - 1) / 2); gr::basic_block_sptr fir_filter_ccf_ = gr::filter::fir_filter_ccf::make(decimation, taps);