diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-05 11:31:33 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-05 11:31:33 -0400 |
| commit | e772651919d7fd64d80f8b618bfcf73f4384c068 (patch) | |
| tree | 89ddca397c9af6a23119305ca5e8d942ba6f6e4b | |
| parent | 3a97145d2f7829b5f5396677ddd99a02a58e9081 (diff) | |
| parent | 06c0d3898032df9348ae59b215ec3db0b3e196a6 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-filter/grc/filter_pfb_arb_resampler.xml
| -rw-r--r-- | gr-filter/grc/filter_pfb_arb_resampler.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gr-filter/grc/filter_pfb_arb_resampler.xml b/gr-filter/grc/filter_pfb_arb_resampler.xml index b3418b9f2c..6b127074fc 100644 --- a/gr-filter/grc/filter_pfb_arb_resampler.xml +++ b/gr-filter/grc/filter_pfb_arb_resampler.xml @@ -11,9 +11,12 @@ <import>from gnuradio.filter import firdes</import> <make>pfb.arb_resampler_$(type)( $rrate, - $taps, - $nfilts, - $atten) +#if $taps() + taps=$taps, +#else + taps=None, +#end if + flt_size=$nfilts) </make> <callback>set_taps($taps)</callback> <callback>set_rate($rrate)</callback> |