diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-08 16:13:31 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-08 16:13:31 -0700 |
| commit | 74b8b8aebc2dffea1ef56541b32096e30a821deb (patch) | |
| tree | f2027fdf4fc88515a5541478be0f3f1e312ebaa3 | |
| parent | d8ffe561153bb0b8d79f028212de7a12c031a067 (diff) | |
| parent | 86759e94bb1cc7d3ff071e398e972ec1a6ceed70 (diff) | |
Merge remote-tracking branch 'tom/blocks/peak_detector2_alpha'
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h | 2 | ||||
| -rw-r--r-- | gr-blocks/lib/peak_detector2_fb_impl.cc | 8 | ||||
| -rw-r--r-- | gr-blocks/lib/peak_detector2_fb_impl.h | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h b/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h index 7336a46f8e..da2d9fc740 100644 --- a/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h +++ b/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h @@ -71,7 +71,7 @@ namespace gr { /*! \brief Set the running average alpha * \param alpha new alpha for running average */ - virtual void set_alpha(int alpha) = 0; + virtual void set_alpha(float alpha) = 0; /*! \brief Get the threshold factor value for the rise time * \return threshold factor diff --git a/gr-blocks/lib/peak_detector2_fb_impl.cc b/gr-blocks/lib/peak_detector2_fb_impl.cc index dd1b677222..7ff7f542ec 100644 --- a/gr-blocks/lib/peak_detector2_fb_impl.cc +++ b/gr-blocks/lib/peak_detector2_fb_impl.cc @@ -43,8 +43,8 @@ namespace gr { peak_detector2_fb_impl::peak_detector2_fb_impl(float threshold_factor_rise, int look_ahead, float alpha) : sync_block("peak_detector2_fb", - io_signature::make(1, 1, sizeof(float)), - io_signature::make2(1, 2, sizeof(char), sizeof(float))), + io_signature::make(1, 1, sizeof(float)), + io_signature::make2(1, 2, sizeof(char), sizeof(float))), d_threshold_factor_rise(threshold_factor_rise), d_look_ahead(look_ahead), d_alpha(alpha), d_avg(0.0f), d_found(false) { @@ -62,8 +62,6 @@ namespace gr { float *iptr = (float *)input_items[0]; char *optr = (char *)output_items[0]; - assert(noutput_items >= 2); - memset(optr, 0, noutput_items*sizeof(char)); for(int i = 0; i < noutput_items; i++) { @@ -114,5 +112,3 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - - diff --git a/gr-blocks/lib/peak_detector2_fb_impl.h b/gr-blocks/lib/peak_detector2_fb_impl.h index 53c06ca810..f5a8ac1a6b 100644 --- a/gr-blocks/lib/peak_detector2_fb_impl.h +++ b/gr-blocks/lib/peak_detector2_fb_impl.h @@ -47,7 +47,7 @@ namespace gr { void set_threshold_factor_rise(float thr) { d_threshold_factor_rise = thr; } void set_look_ahead(int look) { d_look_ahead = look; } - void set_alpha(int alpha) { d_alpha = alpha; } + void set_alpha(float alpha) { d_alpha = alpha; } float threshold_factor_rise() { return d_threshold_factor_rise; } int look_ahead() { return d_look_ahead; } |