diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-13 07:36:16 +1000 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-13 07:36:16 +1000 |
| commit | a4fe510a69190162452889cd629fa258084f46ff (patch) | |
| tree | 4da725d8bad7641fb8d9db8b153e61beb313715d /gr-digital/lib/ofdm_sync_sc_cfb_impl.cc | |
| parent | c7a2cecdd4e9e04d66b4b20b9debce86696e6290 (diff) | |
| parent | 2405532f945576470d1915a4668b91ff35c05775 (diff) | |
Merge branch 'next' into runtime_pimpl
Conflicts:
gr-blocks/swig/blocks_swig0.i
gr-digital/lib/ofdm_chanest_vcvc_impl.cc
gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc
gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h
gr-digital/lib/ofdm_sync_sc_cfb_impl.cc
gr-digital/lib/packet_header_default.cc
gr-digital/lib/packet_headerparser_b_impl.cc
Diffstat (limited to 'gr-digital/lib/ofdm_sync_sc_cfb_impl.cc')
| -rw-r--r-- | gr-digital/lib/ofdm_sync_sc_cfb_impl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc index 1a75883de7..9b3e9687bc 100644 --- a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc +++ b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc @@ -43,14 +43,14 @@ namespace gr { namespace digital { ofdm_sync_sc_cfb::sptr - ofdm_sync_sc_cfb::make(int fft_len, int cp_len) + ofdm_sync_sc_cfb::make(int fft_len, int cp_len, bool use_even_carriers) { - return gnuradio::get_initial_sptr (new ofdm_sync_sc_cfb_impl(fft_len, cp_len)); + return gnuradio::get_initial_sptr (new ofdm_sync_sc_cfb_impl(fft_len, cp_len, use_even_carriers)); } - ofdm_sync_sc_cfb_impl::ofdm_sync_sc_cfb_impl(int fft_len, int cp_len) + ofdm_sync_sc_cfb_impl::ofdm_sync_sc_cfb_impl(int fft_len, int cp_len, bool use_even_carriers) : hier_block2 ("ofdm_sync_sc_cfb", - io_signature::make(1, 1, sizeof (gr_complex)), + io_signature::make(1, 1, sizeof (gr_complex)), #ifndef SYNC_ADD_DEBUG_OUTPUT io_signature::make2(2, 2, sizeof (float), sizeof (unsigned char))) #else @@ -61,7 +61,7 @@ namespace gr { gr::blocks::delay::sptr delay(gr::blocks::delay::make(sizeof(gr_complex), fft_len/2)); gr::blocks::conjugate_cc::sptr delay_conjugate(gr::blocks::conjugate_cc::make()); gr::blocks::multiply_cc::sptr delay_corr(gr::blocks::multiply_cc::make()); - gr::filter::fir_filter_ccf::sptr delay_ma(gr::filter::fir_filter_ccf::make(1, std::vector<float>(fft_len/2, 1.0))); + gr::filter::fir_filter_ccf::sptr delay_ma(gr::filter::fir_filter_ccf::make(1, std::vector<float>(fft_len/2, use_even_carriers ? 1.0 : -1.0))); gr::blocks::complex_to_mag_squared::sptr delay_magsquare(gr::blocks::complex_to_mag_squared::make()); gr::blocks::divide_ff::sptr delay_normalize(gr::blocks::divide_ff::make()); |