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_equalizer_base.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_equalizer_base.cc')
| -rw-r--r-- | gr-digital/lib/ofdm_equalizer_base.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gr-digital/lib/ofdm_equalizer_base.cc b/gr-digital/lib/ofdm_equalizer_base.cc index 7e69b07634..27ba9e99e9 100644 --- a/gr-digital/lib/ofdm_equalizer_base.cc +++ b/gr-digital/lib/ofdm_equalizer_base.cc @@ -30,8 +30,7 @@ namespace gr { // *** Base class **************************************************** ofdm_equalizer_base::ofdm_equalizer_base(int fft_len) : - d_fft_len(fft_len), - d_carr_offset(0) + d_fft_len(fft_len) { } @@ -54,7 +53,7 @@ namespace gr { d_pilot_carriers(pilot_carriers.size(), std::vector<bool>(fft_len, false)), d_pilot_symbols(pilot_symbols.size(), std::vector<gr_complex>(fft_len, gr_complex(0, 0))), d_symbols_skipped(symbols_skipped), - d_pilot_carr_set(symbols_skipped), + d_pilot_carr_set(pilot_carriers.empty() ? 0 : symbols_skipped % pilot_carriers.size()), d_channel_state(fft_len, gr_complex(1, 0)) { int fft_shift_width = 0; @@ -107,7 +106,7 @@ namespace gr { ofdm_equalizer_1d_pilots::reset() { std::fill(d_channel_state.begin(), d_channel_state.end(), gr_complex(1, 0)); - d_pilot_carr_set = d_symbols_skipped; + d_pilot_carr_set = d_pilot_carriers.empty() ? 0 : d_symbols_skipped % d_pilot_carriers.size(); } |