diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-02-04 13:38:09 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-02-04 13:38:09 -0800 |
| commit | 42c1d6d339139eac1001bbc180907569da5e1702 (patch) | |
| tree | a512ccebcb882faa26e60bd405d0c4a039bbbf44 /gr-blocks | |
| parent | 08f00a15a29f9387c9507387cabdba0943ee4968 (diff) | |
| parent | 25f88309daa2c4c347b8e1d27189c9a237310db2 (diff) | |
Merge remote-tracking branch 'tom/blocks/peak_det_api'
Diffstat (limited to 'gr-blocks')
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t | 2 | ||||
| -rw-r--r-- | gr-blocks/lib/peak_detector_XX_impl.h.t | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t b/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t index bc743571fc..2885a9b8ff 100644 --- a/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t @@ -89,7 +89,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_detector_XX_impl.h.t b/gr-blocks/lib/peak_detector_XX_impl.h.t index ed364a490e..22de961d32 100644 --- a/gr-blocks/lib/peak_detector_XX_impl.h.t +++ b/gr-blocks/lib/peak_detector_XX_impl.h.t @@ -49,7 +49,7 @@ namespace gr { void set_threshold_factor_rise(float thr) { d_threshold_factor_rise = thr; } void set_threshold_factor_fall(float thr) { d_threshold_factor_fall = thr; } void set_look_ahead(int look) { d_look_ahead = look; } - void set_alpha(int alpha) { d_avg_alpha = alpha; } + void set_alpha(float alpha) { d_avg_alpha = alpha; } float threshold_factor_rise() { return d_threshold_factor_rise; } float threshold_factor_fall() { return d_threshold_factor_fall; } int look_ahead() { return d_look_ahead; } |