diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-08-21 22:17:20 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-08-22 21:25:23 -0400 |
| commit | 3757197293ef59fe08caa9f391f9e77f072ea19f (patch) | |
| tree | a257bf4e591631c48141d95b543d771c758588c5 /grc | |
| parent | 4a60c41913d7ebddf666d24e288533b453ee41ae (diff) | |
filter: fixing PFB GRC blocks.
Removing from grc dir and using Python-wrapper blocks for GRC components in gr-filter. Updated Python wrapper to take an empty tuple (generated by GRC when no input for a vector type) to auto-generate the taps for the PFBs.
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/blocks/blks2_analysis_filterbank.xml | 32 | ||||
| -rw-r--r-- | grc/blocks/blks2_pfb_arb_resampler.xml | 45 | ||||
| -rw-r--r-- | grc/blocks/blks2_pfb_channelizer.xml | 62 | ||||
| -rw-r--r-- | grc/blocks/blks2_synthesis_filterbank.xml | 32 | ||||
| -rw-r--r-- | grc/blocks/block_tree.xml | 6 |
5 files changed, 0 insertions, 177 deletions
diff --git a/grc/blocks/blks2_analysis_filterbank.xml b/grc/blocks/blks2_analysis_filterbank.xml deleted file mode 100644 index 93cfa30afd..0000000000 --- a/grc/blocks/blks2_analysis_filterbank.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##Analysis Filterbank -################################################### - --> -<block> - <name>Analysis Filterbank</name> - <key>blks2_analysis_filterbank</key> - <import>from gnuradio import blks2</import> - <make>blks2.analysis_filterbank(mpoints=$mpoints, taps=$taps)</make> - <param> - <name>MPoints</name> - <key>mpoints</key> - <value>3</value> - <type>int</type> - </param> - <param> - <name>Taps</name> - <key>taps</key> - <type>complex_vector</type> - </param> - <sink> - <name>in</name> - <type>complex</type> - </sink> - <source> - <name>out</name> - <type>complex</type> - <nports>$mpoints</nports> - </source> -</block> diff --git a/grc/blocks/blks2_pfb_arb_resampler.xml b/grc/blocks/blks2_pfb_arb_resampler.xml deleted file mode 100644 index b58e70f1cb..0000000000 --- a/grc/blocks/blks2_pfb_arb_resampler.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?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> - <!-- Set taps not implemented yet - <callback>set_taps($taps)</callback> - --> - <callback>set_rate($rate)</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/blks2_pfb_channelizer.xml b/grc/blocks/blks2_pfb_channelizer.xml deleted file mode 100644 index 5a93c08664..0000000000 --- a/grc/blocks/blks2_pfb_channelizer.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##Polyphase Channelizer -################################################### - --> -<block> - <name>Polyphase Channelizer</name> - <key>blks2_pfb_channelizer_ccf</key> - <import>from gnuradio import blks2</import> - <import>from gnuradio.gr import firdes</import> - <make>blks2.pfb_channelizer_ccf( - $nchans, - $taps, - $osr, - $atten) -self.$(id).set_channel_map($ch_map) - </make> - <!-- Set taps not implemented yet - <callback>set_taps($taps)</callback> - --> - <callback>set_channel_map($ch_map)</callback> - - <param> - <name>Channels</name> - <key>nchans</key> - <type>int</type> - </param> - <param> - <name>Taps</name> - <key>taps</key> - <value>None</value> - <type>real_vector</type> - </param> - <param> - <name>Over Sample Ratio</name> - <key>osr</key> - <value>1.0</value> - <type>real</type> - </param> - <param> - <name>Attenuation</name> - <key>atten</key> - <value>100</value> - <type>real</type> - </param> - <param> - <name>Channel Map</name> - <key>ch_map</key> - <value>[]</value> - <type>int_vector</type> - </param> - <sink> - <name>in</name> - <type>complex</type> - </sink> - <source> - <name>out</name> - <type>complex</type> - <nports>$nchans</nports> - </source> -</block> diff --git a/grc/blocks/blks2_synthesis_filterbank.xml b/grc/blocks/blks2_synthesis_filterbank.xml deleted file mode 100644 index 5979ed3f79..0000000000 --- a/grc/blocks/blks2_synthesis_filterbank.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##Synthesis Filterbank -################################################### - --> -<block> - <name>Synthesis Filterbank</name> - <key>blks2_synthesis_filterbank</key> - <import>from gnuradio import blks2</import> - <make>blks2.synthesis_filterbank(mpoints=$mpoints, taps=$taps)</make> - <param> - <name>MPoints</name> - <key>mpoints</key> - <value>3</value> - <type>int</type> - </param> - <param> - <name>Taps</name> - <key>taps</key> - <type>complex_vector</type> - </param> - <sink> - <name>in</name> - <type>complex</type> - <nports>$mpoints</nports> - </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 59052afa90..30dfdb05d5 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -150,12 +150,6 @@ </cat> <cat> <name>Filters</name> - <!-- Filters that take taps as arguments --> - <block>blks2_synthesis_filterbank</block> - <block>blks2_analysis_filterbank</block> - <!-- Polyphase filters --> - <block>blks2_pfb_arb_resampler_ccf</block> - <block>blks2_pfb_channelizer_ccf</block> <!-- Other filters --> <block>blks2_rational_resampler_xxx</block> <block>gr_keep_one_in_n</block> |