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

[jblum]

Author: jblum
Date: 2009-06-18 15:33:07 -0600 (Thu, 18 Jun 2009)
New Revision: 11233

Added:
   
gnuradio/branches/developers/jblum/grc/grc/blocks/root_raised_cosine_filter.xml
Modified:
   gnuradio/branches/developers/jblum/grc/grc/blocks/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/blocks/band_pass_filter.xml
   gnuradio/branches/developers/jblum/grc/grc/blocks/band_reject_filter.xml
   gnuradio/branches/developers/jblum/grc/grc/blocks/block_tree.xml
   gnuradio/branches/developers/jblum/grc/grc/blocks/high_pass_filter.xml
   gnuradio/branches/developers/jblum/grc/grc/blocks/low_pass_filter.xml
Log:
Added convenience filter for root raised cosine.
Modified other convenience filters to have separate param for decimation vs 
interpolation.



Modified: gnuradio/branches/developers/jblum/grc/grc/blocks/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/blocks/Makefile.am       
2009-06-18 18:02:07 UTC (rev 11232)
+++ gnuradio/branches/developers/jblum/grc/grc/blocks/Makefile.am       
2009-06-18 21:33:07 UTC (rev 11233)
@@ -191,6 +191,7 @@
        parameter.xml \
        probe_function.xml \
        random_source_x.xml \
+       root_raised_cosine_filter.xml \
        trellis_encoder_xx.xml \
        trellis_metrics_x.xml \
        trellis_permutation.xml \

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-18 18:02:07 UTC (rev 11232)
+++ gnuradio/branches/developers/jblum/grc/grc/blocks/band_pass_filter.xml      
2009-06-18 21:33:07 UTC (rev 11233)
@@ -9,7 +9,7 @@
        <key>band_pass_filter</key>
        <import>from gnuradio import gr</import>
        <import>from gnuradio.gr import firdes</import>
-       <make>gr.$(type)($decim, firdes.band_pass(
+       <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>
        <param>
@@ -46,8 +46,16 @@
                <key>decim</key>
                <value>1</value>
                <type>int</type>
+               <hide>#if str($type).startswith('interp') then 'all' else 
'none'#</hide>
        </param>
        <param>
+               <name>Interpolation</name>
+               <key>interp</key>
+               <value>1</value>
+               <type>int</type>
+               <hide>#if str($type).startswith('interp') then 'none' else 
'all'#</hide>
+       </param>
+       <param>
                <name>Gain</name>
                <key>gain</key>
                <value>1</value>
@@ -116,8 +124,6 @@
        <doc>
 This filter is a convenience wrapper for an fir filter and a firdes taps 
generating function.
 
-The decimation paramater becomes interpolation when the filter type is set to 
interpolating.
-
 Sample rate, cutoff frequency, and transition width are in Hertz.
 
 The beta paramater only applies to the Kaiser window.

Modified: 
gnuradio/branches/developers/jblum/grc/grc/blocks/band_reject_filter.xml
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/blocks/band_reject_filter.xml    
2009-06-18 18:02:07 UTC (rev 11232)
+++ gnuradio/branches/developers/jblum/grc/grc/blocks/band_reject_filter.xml    
2009-06-18 21:33:07 UTC (rev 11233)
@@ -9,7 +9,7 @@
        <key>band_reject_filter</key>
        <import>from gnuradio import gr</import>
        <import>from gnuradio.gr import firdes</import>
-       <make>gr.$(type)($decim, firdes.band_reject(
+       <make>gr.$(type)(#if str($type).startswith('interp') then $interp else 
$decim#, firdes.band_reject(
        $gain, $samp_rate, $low_cutoff_freq, $high_cutoff_freq, $width, 
firdes.$window, $beta))</make>
        <callback>set_taps(firdes.band_reject($gain, $samp_rate, 
$low_cutoff_freq, $high_cutoff_freq, $width, firdes.$window, $beta))</callback>
        <param>
@@ -46,8 +46,16 @@
                <key>decim</key>
                <value>1</value>
                <type>int</type>
+               <hide>#if str($type).startswith('interp') then 'all' else 
'none'#</hide>
        </param>
        <param>
+               <name>Interpolation</name>
+               <key>interp</key>
+               <value>1</value>
+               <type>int</type>
+               <hide>#if str($type).startswith('interp') then 'none' else 
'all'#</hide>
+       </param>
+       <param>
                <name>Gain</name>
                <key>gain</key>
                <value>1</value>
@@ -116,8 +124,6 @@
        <doc>
 This filter is a convenience wrapper for an fir filter and a firdes taps 
generating function.
 
-The decimation paramater becomes interpolation when the filter type is set to 
interpolating.
-
 Sample rate, cutoff frequency, and transition width are in Hertz.
 
 The beta paramater only applies to the Kaiser window.

Modified: gnuradio/branches/developers/jblum/grc/grc/blocks/block_tree.xml
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/blocks/block_tree.xml    
2009-06-18 18:02:07 UTC (rev 11232)
+++ gnuradio/branches/developers/jblum/grc/grc/blocks/block_tree.xml    
2009-06-18 21:33:07 UTC (rev 11233)
@@ -162,6 +162,7 @@
                <block>high_pass_filter</block>
                <block>band_pass_filter</block>
                <block>band_reject_filter</block>
+               <block>root_raised_cosine_filter</block>
                <!-- Filters that take taps as aruments -->
                <block>gr_fir_filter_xxx</block>
                <block>gr_interp_fir_filter_xxx</block>

Modified: gnuradio/branches/developers/jblum/grc/grc/blocks/high_pass_filter.xml
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/blocks/high_pass_filter.xml      
2009-06-18 18:02:07 UTC (rev 11232)
+++ gnuradio/branches/developers/jblum/grc/grc/blocks/high_pass_filter.xml      
2009-06-18 21:33:07 UTC (rev 11233)
@@ -9,7 +9,7 @@
        <key>high_pass_filter</key>
        <import>from gnuradio import gr</import>
        <import>from gnuradio.gr import firdes</import>
-       <make>gr.$(type)($decim, firdes.high_pass(
+       <make>gr.$(type)(#if str($type).startswith('interp') then $interp else 
$decim#, firdes.high_pass(
        $gain, $samp_rate, $cutoff_freq, $width, firdes.$window, $beta))</make>
        <callback>set_taps(firdes.high_pass($gain, $samp_rate, $cutoff_freq, 
$width, firdes.$window, $beta))</callback>
        <param>
@@ -46,8 +46,16 @@
                <key>decim</key>
                <value>1</value>
                <type>int</type>
+               <hide>#if str($type).startswith('interp') then 'all' else 
'none'#</hide>
        </param>
        <param>
+               <name>Interpolation</name>
+               <key>interp</key>
+               <value>1</value>
+               <type>int</type>
+               <hide>#if str($type).startswith('interp') then 'none' else 
'all'#</hide>
+       </param>
+       <param>
                <name>Gain</name>
                <key>gain</key>
                <value>1</value>
@@ -111,8 +119,6 @@
        <doc>
 This filter is a convenience wrapper for an fir filter and a firdes taps 
generating function.
 
-The decimation paramater becomes interpolation when the filter type is set to 
interpolating.
-
 Sample rate, cutoff frequency, and transition width are in Hertz.
 
 The beta paramater only applies to the Kaiser window.

Modified: gnuradio/branches/developers/jblum/grc/grc/blocks/low_pass_filter.xml
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/blocks/low_pass_filter.xml       
2009-06-18 18:02:07 UTC (rev 11232)
+++ gnuradio/branches/developers/jblum/grc/grc/blocks/low_pass_filter.xml       
2009-06-18 21:33:07 UTC (rev 11233)
@@ -9,7 +9,7 @@
        <key>low_pass_filter</key>
        <import>from gnuradio import gr</import>
        <import>from gnuradio.gr import firdes</import>
-       <make>gr.$(type)($decim, firdes.low_pass(
+       <make>gr.$(type)(#if str($type).startswith('interp') then $interp else 
$decim#, firdes.low_pass(
        $gain, $samp_rate, $cutoff_freq, $width, firdes.$window, $beta))</make>
        <callback>set_taps(firdes.low_pass($gain, $samp_rate, $cutoff_freq, 
$width, firdes.$window, $beta))</callback>
        <param>
@@ -46,8 +46,16 @@
                <key>decim</key>
                <value>1</value>
                <type>int</type>
+               <hide>#if str($type).startswith('interp') then 'all' else 
'none'#</hide>
        </param>
        <param>
+               <name>Interpolation</name>
+               <key>interp</key>
+               <value>1</value>
+               <type>int</type>
+               <hide>#if str($type).startswith('interp') then 'none' else 
'all'#</hide>
+       </param>
+       <param>
                <name>Gain</name>
                <key>gain</key>
                <value>1</value>
@@ -111,8 +119,6 @@
        <doc>
 This filter is a convenience wrapper for an fir filter and a firdes taps 
generating function.
 
-The decimation paramater becomes interpolation when the filter type is set to 
interpolating.
-
 Sample rate, cutoff frequency, and transition width are in Hertz.
 
 The beta paramater only applies to the Kaiser window.

Added: 
gnuradio/branches/developers/jblum/grc/grc/blocks/root_raised_cosine_filter.xml
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/blocks/root_raised_cosine_filter.xml 
                            (rev 0)
+++ 
gnuradio/branches/developers/jblum/grc/grc/blocks/root_raised_cosine_filter.xml 
    2009-06-18 21:33:07 UTC (rev 11233)
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Root Raised Cosine Filter: Custom wrapper
+###################################################
+ -->
+<block>
+       <name>Root Raised Cosine Filter</name>
+       <key>root_raised_cosine_filter</key>
+       <import>from gnuradio import gr</import>
+       <import>from gnuradio.gr import firdes</import>
+       <make>gr.$(type)(#if str($type).startswith('interp') then $interp else 
$decim#, firdes.root_raised_cosine(
+       $gain, $samp_rate, $sym_rate, $alpha, $ntaps))</make>
+       <callback>set_taps(firdes.root_raised_cosine($gain, $samp_rate, 
$sym_rate, $alpha, $ntaps))</callback>
+       <param>
+               <name>FIR Type</name>
+               <key>type</key>
+               <type>enum</type>
+               <option>
+                       <name>Complex->Complex (Decimating)</name>
+                       <key>fir_filter_ccf</key>
+                       <opt>input:complex</opt>
+                       <opt>output:complex</opt>
+               </option>
+               <option>
+                       <name>Complex->Complex (Interpolating)</name>
+                       <key>interp_fir_filter_ccf</key>
+                       <opt>input:complex</opt>
+                       <opt>output:complex</opt>
+               </option>
+               <option>
+                       <name>Float->Float (Decimating)</name>
+                       <key>fir_filter_fff</key>
+                       <opt>input:float</opt>
+                       <opt>output:float</opt>
+               </option>
+               <option>
+                       <name>Float->Float (Interpolating)</name>
+                       <key>interp_fir_filter_fff</key>
+                       <opt>input:float</opt>
+                       <opt>output:float</opt>
+               </option>
+       </param>
+       <param>
+               <name>Decimation</name>
+               <key>decim</key>
+               <value>1</value>
+               <type>int</type>
+               <hide>#if str($type).startswith('interp') then 'all' else 
'none'#</hide>
+       </param>
+       <param>
+               <name>Interpolation</name>
+               <key>interp</key>
+               <value>1</value>
+               <type>int</type>
+               <hide>#if str($type).startswith('interp') then 'none' else 
'all'#</hide>
+       </param>
+       <param>
+               <name>Gain</name>
+               <key>gain</key>
+               <value>1</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Sample Rate</name>
+               <key>samp_rate</key>
+               <value>samp_rate</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Symbol Rate</name>
+               <key>sym_rate</key>
+               <value>1.0</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Alpha</name>
+               <key>alpha</key>
+               <value>0.35</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Num Taps</name>
+               <key>ntaps</key>
+               <value>11*samp_rate</value>
+               <type>int</type>
+       </param>
+       <sink>
+               <name>in</name>
+               <type>$type.input</type>
+       </sink>
+       <source>
+               <name>out</name>
+               <type>$type.output</type>
+       </source>
+       <doc>
+This filter is a convenience wrapper for an fir filter and a firdes taps 
generating function.
+
+Sample rate in Hertz.
+       </doc>
+</block>