diff options
| author |   Josh Morman <jmorman@perspectalabs.com> | 2019-05-14 16:12:06 -0400 |
|---|---|---|
| committer |   Martin Braun <martin.braun@ettus.com> | 2019-05-23 08:52:06 -0700 |
| commit | 8a7214c75359d9b599cccfbf12c1317e5a6d945d (patch) | |
| tree | ece30ca82c2f80d69b15ac865fa88031fabc8fd2 | |
| parent | cmake: remove branching for old CMake versions (diff) | |
| download | gnuradio-8a7214c75359d9b599cccfbf12c1317e5a6d945d.tar.xz gnuradio-8a7214c75359d9b599cccfbf12c1317e5a6d945d.zip | |
Issue #1974 Reduce the history from ntaps+1 to ntaps
Also, add () around the default list parameters in the yml files
4 files changed, 8 insertions, 8 deletions
diff --git a/gr-channels/grc/channels_selective_fading_model.block.yml b/gr-channels/grc/channels_selective_fading_model.block.yml index 9898ee75a..1fb782ce6 100644 --- a/gr-channels/grc/channels_selective_fading_model.block.yml +++ b/gr-channels/grc/channels_selective_fading_model.block.yml @@ -29,11 +29,11 @@ parameters: - id: delays label: PDP Delays (samp) dtype: real_vector - default: 0.0,0.1,1.3 + default: (0.0,0.1,1.3) - id: mags label: PDP Magnitudes dtype: real_vector - default: 1,0.99,0.97 + default: (1,0.99,0.97) - id: ntaps label: Num Taps dtype: int diff --git a/gr-channels/grc/channels_selective_fading_model2.block.yml b/gr-channels/grc/channels_selective_fading_model2.block.yml index 1506c03fb..109cbd17f 100644 --- a/gr-channels/grc/channels_selective_fading_model2.block.yml +++ b/gr-channels/grc/channels_selective_fading_model2.block.yml @@ -29,19 +29,19 @@ parameters: - id: delays label: PDP Delays (in samps) dtype: real_vector - default: 1.0,1.9,2.7 + default: (1.0,1.9,2.7) - id: delay_std label: PDP Delay StdDev (per samp) dtype: real_vector - default: 1e-4,1e-4,1e-4 + default: (1e-4,1e-4,1e-4) - id: delay_maxdev label: PDP Delay Max-Dev (per samp) dtype: real_vector - default: 0.5,0.7,0.9 + default: (0.5,0.7,0.9) - id: mags label: PDP Magnitudes dtype: real_vector - default: 1,0.95,0.8 + default: (1,0.95,0.8) - id: ntaps label: Num Taps dtype: int diff --git a/gr-channels/lib/selective_fading_model2_impl.cc b/gr-channels/lib/selective_fading_model2_impl.cc index c5d8afc64..c14cca3d1 100644 --- a/gr-channels/lib/selective_fading_model2_impl.cc +++ b/gr-channels/lib/selective_fading_model2_impl.cc @@ -77,7 +77,7 @@ namespace gr { // set up tap history if(ntaps < 1){ throw std::runtime_error("ntaps must be >= 1"); } - set_history(1+ntaps); + set_history(ntaps); d_taps.resize(ntaps, gr_complex(0,0)); // set up message port diff --git a/gr-channels/lib/selective_fading_model_impl.cc b/gr-channels/lib/selective_fading_model_impl.cc index 95f7a7b7c..185fa9d52 100644 --- a/gr-channels/lib/selective_fading_model_impl.cc +++ b/gr-channels/lib/selective_fading_model_impl.cc @@ -65,7 +65,7 @@ namespace gr { // set up tap history if(ntaps < 1){ throw std::runtime_error("ntaps must be >= 1"); } - set_history(1+ntaps); + set_history(ntaps); d_taps.resize(ntaps, gr_complex(0,0)); } |