projects / debian / gnuradio / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 56a5893)
Made the window for the pass band filters integers (take firdes.WIN_XXX).
authorJosh Blum <josh@joshknows.com>
Thu, 3 Sep 2009 18:37:27 +0000 (11:37 -0700)
committerJosh Blum <josh@joshknows.com>
Thu, 3 Sep 2009 18:37:27 +0000 (11:37 -0700)
Now a window can be controlled by a variable such as a chooser.

grc/blocks/band_pass_filter.xml patch | blob | history
grc/blocks/band_reject_filter.xml patch | blob | history
grc/blocks/gr_noise_source_x.xml patch | blob | history
grc/blocks/gr_sig_source_x.xml patch | blob | history
grc/blocks/high_pass_filter.xml patch | blob | history
grc/blocks/low_pass_filter.xml patch | blob | history
grc/blocks/options.xml patch | blob | history

diff --git a/grc/blocks/band_pass_filter.xml b/grc/blocks/band_pass_filter.xml
index e2e9acf4ebf9148fff3514ea0fdda93ba718bdd4..af083473d3a59f9a5fd3e76e6dc9b473973a5df1 100644 (file)
--- a/grc/blocks/band_pass_filter.xml
+++ b/grc/blocks/band_pass_filter.xml
@@ -10,8 +10,8 @@
        <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.$(type.fcn)(
-       $gain, $samp_rate, $low_cutoff_freq, $high_cutoff_freq, $width, firdes.$window, $beta))</make>
-       <callback>set_taps(firdes.$(type.fcn)($gain, $samp_rate, $low_cutoff_freq, $high_cutoff_freq, $width, firdes.$window, $beta))</callback>
+       $gain, $samp_rate, $low_cutoff_freq, $high_cutoff_freq, $width, $win, $beta))</make>
+       <callback>set_taps(firdes.$(type.fcn)($gain, $samp_rate, $low_cutoff_freq, $high_cutoff_freq, $width, $win, $beta))</callback>
        <param>
                <name>FIR Type</name>
                <key>type</key>
@@ -118,27 +118,28 @@
        </param>
        <param>
                <name>Window</name>
-               <key>window</key>
-               <type>enum</type>
+               <key>win</key>
+               <value>firdes.WIN_HAMMING</value>
+               <type>int</type>
                <option>
                        <name>Hamming</name>
-                       <key>WIN_HAMMING</key>
+                       <key>firdes.WIN_HAMMING</key>
                </option>
                <option>
                        <name>Hann</name>
-                       <key>WIN_HANN</key>
+                       <key>firdes.WIN_HANN</key>
                </option>
                <option>
                        <name>Blackman</name>
-                       <key>WIN_BLACKMAN</key>
+                       <key>firdes.WIN_BLACKMAN</key>
                </option>
                <option>
                        <name>Rectangular</name>
-                       <key>WIN_RECTANGULAR</key>
+                       <key>firdes.WIN_RECTANGULAR</key>
                </option>
                <option>
                        <name>Kaiser</name>
-                       <key>WIN_KAISER</key>
+                       <key>firdes.WIN_KAISER</key>
                </option>
        </param>
        <param>
diff --git a/grc/blocks/band_reject_filter.xml b/grc/blocks/band_reject_filter.xml
index 3b58f0b51431a1d555c650dcd0e6ddf9a2b6c7de..dd5e7a9d7664a814867dad3ab34b83b7aebabfa5 100644 (file)
--- a/grc/blocks/band_reject_filter.xml
+++ b/grc/blocks/band_reject_filter.xml
@@ -10,8 +10,8 @@
        <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.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>
+       $gain, $samp_rate, $low_cutoff_freq, $high_cutoff_freq, $width, $win, $beta))</make>
+       <callback>set_taps(firdes.band_reject($gain, $samp_rate, $low_cutoff_freq, $high_cutoff_freq, $width, $win, $beta))</callback>
        <param>
                <name>FIR Type</name>
                <key>type</key>
@@ -84,27 +84,28 @@
        </param>
        <param>
                <name>Window</name>
-               <key>window</key>
-               <type>enum</type>
+               <key>win</key>
+               <value>firdes.WIN_HAMMING</value>
+               <type>int</type>
                <option>
                        <name>Hamming</name>
-                       <key>WIN_HAMMING</key>
+                       <key>firdes.WIN_HAMMING</key>
                </option>
                <option>
                        <name>Hann</name>
-                       <key>WIN_HANN</key>
+                       <key>firdes.WIN_HANN</key>
                </option>
                <option>
                        <name>Blackman</name>
-                       <key>WIN_BLACKMAN</key>
+                       <key>firdes.WIN_BLACKMAN</key>
                </option>
                <option>
                        <name>Rectangular</name>
-                       <key>WIN_RECTANGULAR</key>
+                       <key>firdes.WIN_RECTANGULAR</key>
                </option>
                <option>
                        <name>Kaiser</name>
-                       <key>WIN_KAISER</key>
+                       <key>firdes.WIN_KAISER</key>
                </option>
        </param>
        <param>
diff --git a/grc/blocks/gr_noise_source_x.xml b/grc/blocks/gr_noise_source_x.xml
index 4fcef5148d53e167627f2d76e5f892238d2426e5..4789b4400b8a71d3ca7b20ab74ebab56413e066b 100644 (file)
--- a/grc/blocks/gr_noise_source_x.xml
+++ b/grc/blocks/gr_noise_source_x.xml
@@ -40,7 +40,7 @@
                <name>Noise Type</name>
                <key>noise_type</key>
                <value>gr.GR_GAUSSIAN</value>
-               <type>raw</type>
+               <type>int</type>
                <option>
                        <name>Uniform</name>
                        <key>gr.GR_UNIFORM</key>
diff --git a/grc/blocks/gr_sig_source_x.xml b/grc/blocks/gr_sig_source_x.xml
index c329dba67fb0e34790fcc0fe93f44c4c5717f089..644cf52d0c7d50e4f5ea331e38584b190693c242 100644 (file)
--- a/grc/blocks/gr_sig_source_x.xml
+++ b/grc/blocks/gr_sig_source_x.xml
@@ -53,7 +53,7 @@
                <name>Waveform</name>
                <key>waveform</key>
                <value>gr.GR_COS_WAVE</value>
-               <type>raw</type>
+               <type>int</type>
                <option>
                        <name>Constant</name>
                        <key>gr.GR_CONST_WAVE</key>
diff --git a/grc/blocks/high_pass_filter.xml b/grc/blocks/high_pass_filter.xml
index 5be916fa97be3cfab26297f21926411d875d47fb..0e29cbb36f3a9ca8113786f5e5e80a5ac72e2061 100644 (file)
--- a/grc/blocks/high_pass_filter.xml
+++ b/grc/blocks/high_pass_filter.xml
@@ -10,8 +10,8 @@
        <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.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>
+       $gain, $samp_rate, $cutoff_freq, $width, $win, $beta))</make>
+       <callback>set_taps(firdes.high_pass($gain, $samp_rate, $cutoff_freq, $width, $win, $beta))</callback>
        <param>
                <name>FIR Type</name>
                <key>type</key>
@@ -79,27 +79,28 @@
        </param>
        <param>
                <name>Window</name>
-               <key>window</key>
-               <type>enum</type>
+               <key>win</key>
+               <value>firdes.WIN_HAMMING</value>
+               <type>int</type>
                <option>
                        <name>Hamming</name>
-                       <key>WIN_HAMMING</key>
+                       <key>firdes.WIN_HAMMING</key>
                </option>
                <option>
                        <name>Hann</name>
-                       <key>WIN_HANN</key>
+                       <key>firdes.WIN_HANN</key>
                </option>
                <option>
                        <name>Blackman</name>
-                       <key>WIN_BLACKMAN</key>
+                       <key>firdes.WIN_BLACKMAN</key>
                </option>
                <option>
                        <name>Rectangular</name>
-                       <key>WIN_RECTANGULAR</key>
+                       <key>firdes.WIN_RECTANGULAR</key>
                </option>
                <option>
                        <name>Kaiser</name>
-                       <key>WIN_KAISER</key>
+                       <key>firdes.WIN_KAISER</key>
                </option>
        </param>
        <param>
diff --git a/grc/blocks/low_pass_filter.xml b/grc/blocks/low_pass_filter.xml
index 27120c0471d9120bea28748f3005c3a8563038f3..26435fd4d8f36dde9d6ae5f6f7b920fa5f766c85 100644 (file)
--- a/grc/blocks/low_pass_filter.xml
+++ b/grc/blocks/low_pass_filter.xml
@@ -10,8 +10,8 @@
        <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.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>
+       $gain, $samp_rate, $cutoff_freq, $width, $win, $beta))</make>
+       <callback>set_taps(firdes.low_pass($gain, $samp_rate, $cutoff_freq, $width, $win, $beta))</callback>
        <param>
                <name>FIR Type</name>
                <key>type</key>
@@ -79,27 +79,28 @@
        </param>
        <param>
                <name>Window</name>
-               <key>window</key>
-               <type>enum</type>
+               <key>win</key>
+               <value>firdes.WIN_HAMMING</value>
+               <type>int</type>
                <option>
                        <name>Hamming</name>
-                       <key>WIN_HAMMING</key>
+                       <key>firdes.WIN_HAMMING</key>
                </option>
                <option>
                        <name>Hann</name>
-                       <key>WIN_HANN</key>
+                       <key>firdes.WIN_HANN</key>
                </option>
                <option>
                        <name>Blackman</name>
-                       <key>WIN_BLACKMAN</key>
+                       <key>firdes.WIN_BLACKMAN</key>
                </option>
                <option>
                        <name>Rectangular</name>
-                       <key>WIN_RECTANGULAR</key>
+                       <key>firdes.WIN_RECTANGULAR</key>
                </option>
                <option>
                        <name>Kaiser</name>
-                       <key>WIN_KAISER</key>
+                       <key>firdes.WIN_KAISER</key>
                </option>
        </param>
        <param>
diff --git a/grc/blocks/options.xml b/grc/blocks/options.xml
index a28a0b1439eff5ef6bdf0c6eff1525c9dacda5d9..1798a69f88a834c9dccd6ad7e878198b2d147372 100644 (file)
--- a/grc/blocks/options.xml
+++ b/grc/blocks/options.xml
@@ -9,8 +9,9 @@
 <block>
        <name>Options</name>
        <key>options</key>
-       <import>from gnuradio import gr
-#if $generate_options() == 'wx_gui'
+       <import>from gnuradio import gr</import>
+       <import>from gnuradio.gr import firdes</import>
+       <import>#if $generate_options() == 'wx_gui'
 from grc_gnuradio import wxgui as grc_wxgui
 import wx
 #end if
@@ -18,8 +19,7 @@ import wx
 from optparse import OptionParser
 from gnuradio.eng_option import eng_option
 from gnuradio import eng_notation
-#end if
-</import>
+#end if</import>
        <make></make>
        <callback>if $run: self.start()
 else: self.stop(); self.wait()</callback>
Debian packaging of gnuradio