diff options
| author | Josh Blum | 2009-08-24 21:34:25 -0700 |
|---|---|---|
| committer | Josh Blum | 2009-08-24 21:34:25 -0700 |
| commit | 07d9b76e4bf8799d87775bd5546abf1f9ac5c995 (patch) | |
| tree | cd1af16d1000f318ba636a754a159c5ee2833ca9 /grc | |
| parent | b8df6584312f1f03d0bf86375945b8d743b6a6d7 (diff) | |
| parent | 9f2ca841018fd24644be39b4400784806015aef2 (diff) | |
| download | gnuradio-07d9b76e4bf8799d87775bd5546abf1f9ac5c995.tar.gz gnuradio-07d9b76e4bf8799d87775bd5546abf1f9ac5c995.tar.bz2 gnuradio-07d9b76e4bf8799d87775bd5546abf1f9ac5c995.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into grc
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/blocks/Makefile.am | 1 | ||||
| -rw-r--r-- | grc/blocks/blks2_pfb_arb_resampler.xml | 42 | ||||
| -rw-r--r-- | grc/blocks/block_tree.xml | 2 |
3 files changed, 45 insertions, 0 deletions
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index fbd8f4bb4..caae6ce75 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -45,6 +45,7 @@ dist_ourdata_DATA = \ blks2_ofdm_mod.xml \ blks2_packet_decoder.xml \ blks2_packet_encoder.xml \ + blks2_pfb_arb_resampler.xml \ blks2_qamx_demod.xml \ blks2_qamx_mod.xml \ blks2_rational_resampler_xxx.xml \ diff --git a/grc/blocks/blks2_pfb_arb_resampler.xml b/grc/blocks/blks2_pfb_arb_resampler.xml new file mode 100644 index 000000000..062b0dd98 --- /dev/null +++ b/grc/blocks/blks2_pfb_arb_resampler.xml @@ -0,0 +1,42 @@ +<?xml version="1.0"?> +<!-- +################################################### +##Polyphase Arbitrary Resampler +################################################### + --> +<block> + <name>Polyphase Resampler</name> + <key>blks2_pfb_arb_resampler_ccf</key> + <import>from gnuradio import blks2</import> + <import>from gnuradio.gr import firdes</import> + <make>blks2.pfb_arb_resampler_ccf( + $rate, + $taps, + $size, +)</make> + <callback>set_taps($taps)</callback> + <param> + <name>Resample Rate</name> + <key>rate</key> + <type>real</type> + </param> + <param> + <name>Taps</name> + <key>taps</key> + <type>real_vector</type> + </param> + <param> + <name>Size (# phases)</name> + <key>size</key> + <value>32</value> + <type>int</type> + </param> + <sink> + <name>in</name> + <type>complex</type> + </sink> + <source> + <name>out</name> + <type>complex</type> + </source> +</block> diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 2cedb45a2..5b45466f5 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -176,6 +176,8 @@ <!-- Filter banks --> <block>blks2_synthesis_filterbank</block> <block>blks2_analysis_filterbank</block> + <!-- Polyphase filers --> + <block>blks2_pfb_arb_resampler_ccf</block> <!-- Other filters --> <block>gr_single_pole_iir_filter_xx</block> <block>gr_hilbert_fc</block> |