[Commit-gnuradio] r11248 - gnuradio/branches/developers/jblum/grc/grc/blocks

[jblum]

Author: jblum
Date: 2009-06-20 01:03:43 -0600 (Sat, 20 Jun 2009)
New Revision: 11248

Modified:
   gnuradio/branches/developers/jblum/grc/grc/blocks/band_pass_filter.xml
Log:
added support for firdes.complex_band_pass in filter convenience wrapper

Modified: gnuradio/branches/developers/jblum/grc/grc/blocks/band_pass_filter.xml
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/blocks/band_pass_filter.xml      
2009-06-20 06:25:20 UTC (rev 11247)
+++ gnuradio/branches/developers/jblum/grc/grc/blocks/band_pass_filter.xml      
2009-06-20 07:03:43 UTC (rev 11248)
@@ -11,35 +11,83 @@
        <import>from gnuradio.gr import firdes</import>
        <make>gr.$(type)(#if str($type).startswith('interp') then $interp else 
$decim#, firdes.band_pass(
        $gain, $samp_rate, $low_cutoff_freq, $high_cutoff_freq, $width, 
firdes.$window, $beta))</make>
-       <callback>set_taps(firdes.band_pass($gain, $samp_rate, 
$low_cutoff_freq, $high_cutoff_freq, $width, firdes.$window, $beta))</callback>
+       <callback>set_taps(firdes.$(type.fcn)($gain, $samp_rate, 
$low_cutoff_freq, $high_cutoff_freq, $width, firdes.$window, $beta))</callback>
        <param>
                <name>FIR Type</name>
                <key>type</key>
                <type>enum</type>
+               <!-- Real Band Pass Taps -->
                <option>
-                       <name>Complex->Complex (Decimating)</name>
+                       <name>Complex->Complex (Real Taps) (Decim)</name>
                        <key>fir_filter_ccf</key>
                        <opt>input:complex</opt>
                        <opt>output:complex</opt>
+                       <opt>fcn:band_pass</opt>
                </option>
                <option>
-                       <name>Complex->Complex (Interpolating)</name>
+                       <name>Complex->Complex (Real Taps) (Interp)</name>
                        <key>interp_fir_filter_ccf</key>
                        <opt>input:complex</opt>
                        <opt>output:complex</opt>
+                       <opt>fcn:band_pass</opt>
                </option>
                <option>
-                       <name>Float->Float (Decimating)</name>
+                       <name>Float->Float (Real Taps) (Decim)</name>
                        <key>fir_filter_fff</key>
                        <opt>input:float</opt>
                        <opt>output:float</opt>
+                       <opt>fcn:band_pass</opt>
                </option>
                <option>
-                       <name>Float->Float (Interpolating)</name>
+                       <name>Float->Float (Real Taps) (Interp)</name>
                        <key>interp_fir_filter_fff</key>
                        <opt>input:float</opt>
                        <opt>output:float</opt>
+                       <opt>fcn:band_pass</opt>
                </option>
+               <!-- Complex Band Pass Taps -->
+               <option>
+                       <name>Complex->Complex (Complex Taps) (Decim)</name>
+                       <key>fir_filter_ccc</key>
+                       <opt>input:complex</opt>
+                       <opt>output:complex</opt>
+                       <opt>fcn:complex_band_pass</opt>
+               </option>
+               <option>
+                       <name>Complex->Complex (Complex Taps) (Interp)</name>
+                       <key>interp_fir_filter_ccc</key>
+                       <opt>input:complex</opt>
+                       <opt>output:complex</opt>
+                       <opt>fcn:complex_band_pass</opt>
+               </option>
+               <option>
+                       <name>Float->Complex (Complex Taps) (Decim)</name>
+                       <key>fir_filter_fcc</key>
+                       <opt>input:complex</opt>
+                       <opt>output:complex</opt>
+                       <opt>fcn:complex_band_pass</opt>
+               </option>
+               <option>
+                       <name>Float->Complex (Complex Taps) (Interp)</name>
+                       <key>interp_fir_filter_fcc</key>
+                       <opt>input:complex</opt>
+                       <opt>output:complex</opt>
+                       <opt>fcn:complex_band_pass</opt>
+               </option>
+               <option>
+                       <name>Float->Float (Complex Taps) (Decim)</name>
+                       <key>fir_filter_ffc</key>
+                       <opt>input:float</opt>
+                       <opt>output:float</opt>
+                       <opt>fcn:complex_band_pass</opt>
+               </option>
+               <option>
+                       <name>Float->Float (Complex Taps) (Interp)</name>
+                       <key>interp_fir_filter_ffc</key>
+                       <opt>input:float</opt>
+                       <opt>output:float</opt>
+                       <opt>fcn:complex_band_pass</opt>
+               </option>
        </param>
        <param>
                <name>Decimation</name>