diff options
author | Marcus Müller <marcus.mueller@ettus.com> | 2018-03-30 20:50:04 +0200 |
---|---|---|
committer | Marcus Müller <marcus.mueller@ettus.com> | 2018-03-30 20:50:04 +0200 |
commit | 61c0382eb2935a6da6c81bd93c8b9c8ef2893df2 (patch) | |
tree | 5e67df4059f5522ccc62cd85f33100ee96bb7988 /gr-channels/lib/selective_fading_model_impl.cc | |
parent | 9a6bf484394f5954483477856f6a6712331b9ee6 (diff) | |
parent | 20d463d138782fd56397f5324be6e34af156b239 (diff) |
Merge branch 'maint' through 'last_merge_to_master'
This is the last time we're merging 'maint' to 'master'. The 'maint'
branch will cease to exist shortly; we'll have a 'maint-3.7' branch.
For further information on the new development model:
http://lists.gnu.org/archive/html/discuss-gnuradio/2018-02/msg00133.html
Diffstat (limited to 'gr-channels/lib/selective_fading_model_impl.cc')
-rw-r--r-- | gr-channels/lib/selective_fading_model_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-channels/lib/selective_fading_model_impl.cc b/gr-channels/lib/selective_fading_model_impl.cc index dfd7b74ca9..3594ec4aa0 100644 --- a/gr-channels/lib/selective_fading_model_impl.cc +++ b/gr-channels/lib/selective_fading_model_impl.cc @@ -95,7 +95,7 @@ namespace gr { gr_complex ff_H(d_faders[j]->next_sample()); for(size_t k=0; k<d_taps.size(); k++){ float dist = k-d_delays[j]; - float interpmag = d_sintable.sinc(2*M_PI*dist); + float interpmag = d_sintable.sinc(M_PI*dist); d_taps[k] += ff_H * interpmag * d_mags[j]; } } |