diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-09-25 08:43:59 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-09-25 08:43:59 -0700 |
commit | 5cfb11516f028f4e6a9e02c2bff0c2b1358fd880 (patch) | |
tree | 172296b2ce99a8546797bd603d2bd6d827bf1716 /gr-analog | |
parent | 9792b280d2b49e0f0d8ff0b4a9ace8fd6dbc8fea (diff) | |
parent | 57ed3253d51788bdbba7502322c5ee4dc3ffb1de (diff) |
Merge branch 'maint'
Diffstat (limited to 'gr-analog')
-rw-r--r-- | gr-analog/lib/pwr_squelch_cc_impl.cc | 2 | ||||
-rw-r--r-- | gr-analog/lib/pwr_squelch_ff_impl.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-analog/lib/pwr_squelch_cc_impl.cc b/gr-analog/lib/pwr_squelch_cc_impl.cc index 44fd5dc668..6c832bc392 100644 --- a/gr-analog/lib/pwr_squelch_cc_impl.cc +++ b/gr-analog/lib/pwr_squelch_cc_impl.cc @@ -43,7 +43,7 @@ namespace gr { io_signature::make(1, 1, sizeof(gr_complex)), io_signature::make(1, 1, sizeof(gr_complex))), squelch_base_cc_impl("pwr_squelch_cc", ramp, gate), - d_iir(alpha) + d_pwr(0), d_iir(alpha) { set_threshold(threshold); } diff --git a/gr-analog/lib/pwr_squelch_ff_impl.cc b/gr-analog/lib/pwr_squelch_ff_impl.cc index 812011bbb5..955f2fc630 100644 --- a/gr-analog/lib/pwr_squelch_ff_impl.cc +++ b/gr-analog/lib/pwr_squelch_ff_impl.cc @@ -43,7 +43,7 @@ namespace gr { io_signature::make(1, 1, sizeof(float)), io_signature::make(1, 1, sizeof(float))), squelch_base_ff_impl("pwr_squelch_ff", ramp, gate), - d_iir(alpha) + d_pwr(0), d_iir(alpha) { set_threshold(threshold); } |