summaryrefslogtreecommitdiff
path: root/gr-filter/grc
diff options
context:
space:
mode:
authorTom Rondeau2012-06-19 00:07:58 -0400
committerTom Rondeau2012-06-19 00:07:58 -0400
commite5aead883b8bf82cb0ebd63e825b99b5172048cd (patch)
tree2482c0ba05b9460a1cba309fc39d6f560c3279ef /gr-filter/grc
parent5365daf7ae85c9df88f0b8f3667ece022d93f637 (diff)
downloadgnuradio-e5aead883b8bf82cb0ebd63e825b99b5172048cd.tar.gz
gnuradio-e5aead883b8bf82cb0ebd63e825b99b5172048cd.tar.bz2
gnuradio-e5aead883b8bf82cb0ebd63e825b99b5172048cd.zip
filter: adding PFB arbitrary resampler (ccf and fff) with GRC and QA.
Diffstat (limited to 'gr-filter/grc')
-rw-r--r--gr-filter/grc/CMakeLists.txt1
-rw-r--r--gr-filter/grc/filter_block_tree.xml1
-rw-r--r--gr-filter/grc/pfb_arb_resampler.xml61
-rw-r--r--gr-filter/grc/pfb_decimator.xml2
4 files changed, 64 insertions, 1 deletions
diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt
index 7fc129d8a..3110e0f1b 100644
--- a/gr-filter/grc/CMakeLists.txt
+++ b/gr-filter/grc/CMakeLists.txt
@@ -28,6 +28,7 @@ install(FILES
hilbert_fc.xml
iir_filter_ffd.xml
interp_fir_filter_xxx.xml
+ pfb_arb_resampler.xml
pfb_channelizer.xml
pfb_decimator.xml
pfb_interpolator.xml
diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml
index 0ec9e5dd0..ecc97dd23 100644
--- a/gr-filter/grc/filter_block_tree.xml
+++ b/gr-filter/grc/filter_block_tree.xml
@@ -39,6 +39,7 @@
<block>hilbert_fc</block>
<block>iir_filter_ffd</block>
<block>interp_fir_filter_xxx</block>
+ <block>pfb_arb_resampler_xxx</block>
<block>pfb_channelizer_ccf</block>
<block>pfb_decimator_ccf</block>
<block>pfb_interpolator_ccf</block>
diff --git a/gr-filter/grc/pfb_arb_resampler.xml b/gr-filter/grc/pfb_arb_resampler.xml
new file mode 100644
index 000000000..f3048000a
--- /dev/null
+++ b/gr-filter/grc/pfb_arb_resampler.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Polyphase Arbitrary Resampler
+###################################################
+ -->
+<block>
+ <name>Polyphase Arbitrary Resampler</name>
+ <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)(
+ $rrate,
+ $taps,
+ $nfilts)
+ </make>
+ <callback>set_taps($taps)</callback>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex->Complex (Real Taps)</name>
+ <key>ccf</key>
+ <opt>input:complex</opt>
+ <opt>output:complex</opt>
+ <opt>taps:real_vector</opt>
+ </option>
+ <option>
+ <name>Float->Float (Real Taps)</name>
+ <key>fff</key>
+ <opt>input:float</opt>
+ <opt>output:float</opt>
+ <opt>taps:real_vector</opt>
+ </option>
+ </param>
+ <param>
+ <name>Resampling Rate</name>
+ <key>rrate</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Taps</name>
+ <key>taps</key>
+ <type>$type.taps</type>
+ </param>
+ <param>
+ <name>Number of Filters</name>
+ <key>nfilts</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/gr-filter/grc/pfb_decimator.xml b/gr-filter/grc/pfb_decimator.xml
index 329d59c3d..b0540d3e2 100644
--- a/gr-filter/grc/pfb_decimator.xml
+++ b/gr-filter/grc/pfb_decimator.xml
@@ -9,7 +9,7 @@
<key>pfb_decimator_ccf</key>
<import>from gnuradio import filter</import>
<import>from gnuradio.filter import firdes</import>
- <make>filter.pfb.decimator_ccf(
+ <make>filter.pfb_decimator_ccf(
$decim,
$taps,
$channel)