diff options
| author | Josh Blum | 2013-04-07 11:26:34 -0700 |
|---|---|---|
| committer | Josh Blum | 2013-04-07 11:26:34 -0700 |
| commit | d99eb362def2c50c3c9b80c63c33f85df2babacb (patch) | |
| tree | 7712c8e4f45c9642c8e4a8da7352c1bb89f70095 /gr-filter | |
| parent | 82d7cf75c5c8891d25379e4d60c0f90bad2d57d2 (diff) | |
| parent | f1fb6bc5fb0f031e7e4b7f7290290ca6075faf07 (diff) | |
| download | gnuradio-d99eb362def2c50c3c9b80c63c33f85df2babacb.tar.gz gnuradio-d99eb362def2c50c3c9b80c63c33f85df2babacb.tar.bz2 gnuradio-d99eb362def2c50c3c9b80c63c33f85df2babacb.zip | |
Merge branch 'maint' into v3.6.4git_gras_support
Diffstat (limited to 'gr-filter')
| -rw-r--r-- | gr-filter/grc/pfb_arb_resampler.xml | 10 | ||||
| -rw-r--r-- | gr-filter/lib/interp_fir_filter_XXX_impl.cc.t | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/gr-filter/grc/pfb_arb_resampler.xml b/gr-filter/grc/pfb_arb_resampler.xml index f3048000a..774cb9186 100644 --- a/gr-filter/grc/pfb_arb_resampler.xml +++ b/gr-filter/grc/pfb_arb_resampler.xml @@ -9,10 +9,14 @@ <key>pfb_arb_resampler_xxx</key> <import>from gnuradio import filter</import> <import>from gnuradio.filter import firdes</import> - <make>filter.pfb_arb_resampler_$(type)( + <make>filter.pfb.arb_resampler_$(type)( $rrate, - $taps, - $nfilts) +#if $taps() + taps=$taps, +#else + taps=None, +#end if + flt_size=$nfilts) </make> <callback>set_taps($taps)</callback> <param> diff --git a/gr-filter/lib/interp_fir_filter_XXX_impl.cc.t b/gr-filter/lib/interp_fir_filter_XXX_impl.cc.t index c9127d737..fea3b1c8e 100644 --- a/gr-filter/lib/interp_fir_filter_XXX_impl.cc.t +++ b/gr-filter/lib/interp_fir_filter_XXX_impl.cc.t @@ -54,6 +54,10 @@ namespace gr { throw std::out_of_range("@IMPL_NAME@: interpolation must be > 0\n"); } + if(taps.size() == 0) { + throw std::runtime_error("@IMPL_NAME@: no filter taps provided.\n"); + } + std::vector<@TAP_TYPE@> dummy_taps; for(unsigned i = 0; i < interpolation; i++) { |