filter: cleaning up GRC filter blocks.

author: Tom Rondeau <trondeau@vt.edu> 2012-08-20 22:49:38 -0400
committer: Tom Rondeau <trondeau@vt.edu> 2012-08-20 22:50:09 -0400
commit: 5f720e1beb27f7457f20555f8ce1bb8c34c27cbe (patch)
tree: 12334badeef2e43eeba95927f768887584412d31 /grc
parent: 527dc0e6ec8008bdfc18a2f690596cac34a77080 (diff)
19 files changed, 0 insertions, 1393 deletions
diff --git a/grc/blocks/band_pass_filter.xml b/grc/blocks/band_pass_filter.xml
deleted file mode 100644
index af083473d3..0000000000
--- a/grc/blocks/band_pass_filter.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Band Pass Filter: Custom wrapper
-###################################################
- -->
-<block>
-	<name>Band Pass Filter</name>
-	<key>band_pass_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.$(type.fcn)(
-	$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>
-		<type>enum</type>
-		<!-- Real Band Pass Taps -->
-		<option>
-			<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 (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 (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 (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:float</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:float</opt>
-			<opt>output:complex</opt>
-			<opt>fcn:complex_band_pass</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>Low Cutoff Freq</name>
-		<key>low_cutoff_freq</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>High Cutoff Freq</name>
-		<key>high_cutoff_freq</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Transition Width</name>
-		<key>width</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Window</name>
-		<key>win</key>
-		<value>firdes.WIN_HAMMING</value>
-		<type>int</type>
-		<option>
-			<name>Hamming</name>
-			<key>firdes.WIN_HAMMING</key>
-		</option>
-		<option>
-			<name>Hann</name>
-			<key>firdes.WIN_HANN</key>
-		</option>
-		<option>
-			<name>Blackman</name>
-			<key>firdes.WIN_BLACKMAN</key>
-		</option>
-		<option>
-			<name>Rectangular</name>
-			<key>firdes.WIN_RECTANGULAR</key>
-		</option>
-		<option>
-			<name>Kaiser</name>
-			<key>firdes.WIN_KAISER</key>
-		</option>
-	</param>
-	<param>
-		<name>Beta</name>
-		<key>beta</key>
-		<value>6.76</value>
-		<type>real</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, cutoff frequency, and transition width are in Hertz.
-
-The beta paramater only applies to the Kaiser window.
-	</doc>
-</block>
diff --git a/grc/blocks/band_reject_filter.xml b/grc/blocks/band_reject_filter.xml
deleted file mode 100644
index dd5e7a9d76..0000000000
--- a/grc/blocks/band_reject_filter.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Band Reject Filter: Custom wrapper
-###################################################
- -->
-<block>
-	<name>Band Reject Filter</name>
-	<key>band_reject_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.band_reject(
-	$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>
-		<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>Low Cutoff Freq</name>
-		<key>low_cutoff_freq</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>High Cutoff Freq</name>
-		<key>high_cutoff_freq</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Transition Width</name>
-		<key>width</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Window</name>
-		<key>win</key>
-		<value>firdes.WIN_HAMMING</value>
-		<type>int</type>
-		<option>
-			<name>Hamming</name>
-			<key>firdes.WIN_HAMMING</key>
-		</option>
-		<option>
-			<name>Hann</name>
-			<key>firdes.WIN_HANN</key>
-		</option>
-		<option>
-			<name>Blackman</name>
-			<key>firdes.WIN_BLACKMAN</key>
-		</option>
-		<option>
-			<name>Rectangular</name>
-			<key>firdes.WIN_RECTANGULAR</key>
-		</option>
-		<option>
-			<name>Kaiser</name>
-			<key>firdes.WIN_KAISER</key>
-		</option>
-	</param>
-	<param>
-		<name>Beta</name>
-		<key>beta</key>
-		<value>6.76</value>
-		<type>real</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, cutoff frequency, and transition width are in Hertz.
-
-The beta paramater only applies to the Kaiser window.
-	</doc>
-</block>
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 90430df309..466b378807 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -151,37 +151,17 @@
 	</cat>
 	<cat>
 		<name>Filters</name>
-		<!-- FIR convenience filters -->
-		<block>low_pass_filter</block>
-		<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 arguments -->
-		<block>gr_fir_filter_xxx</block>
-		<block>gr_interp_fir_filter_xxx</block>
-		<block>gr_fft_filter_xxx</block>
-		<block>gr_freq_xlating_fir_filter_xxx</block>
-		<block>gr_iir_filter_ffd</block>
-		<block>gr_filter_delay_fc</block>
-		<block>gr_channel_model</block>
-		<!-- Filter banks -->
 		<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>gr_single_pole_iir_filter_xx</block>
-		<block>gr_hilbert_fc</block>
-		<block>gr_rational_resampler_base_xxx</block>
 		<block>blks2_rational_resampler_xxx</block>
-		<block>gr_fractional_interpolator_xx</block>
 		<block>gr_keep_one_in_n</block>
 		<block>gr_keep_m_in_n</block>
 		<block>gr_moving_average_xx</block>
-		<block>gr_iqcomp_cc</block>
-		<block>gr_dc_blocker</block>
 	</cat>
 	<cat>
 		<name>Modulators</name>
diff --git a/grc/blocks/gr_channel_model.xml b/grc/blocks/gr_channel_model.xml
deleted file mode 100644
index d0d178d345..0000000000
--- a/grc/blocks/gr_channel_model.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Channel Model
-###################################################
- -->
-<block>
-	<name>Channel Model</name>
-	<key>gr_channel_model</key>
-	<import>from gnuradio import gr</import>
-	<import>from gnuradio.gr import firdes</import>
-	<make>gr.channel_model(
-	noise_voltage=$noise_voltage,
-	frequency_offset=$freq_offset,
-	epsilon=$epsilon,
-	taps=$taps,
-	noise_seed=$seed,
-)</make>
-	<callback>set_noise_voltage($noise_voltage)</callback>
-	<callback>set_frequency_offset($freq_offset)</callback>
-	<callback>set_taps($taps)</callback>
-	<callback>set_timing_offset($epsilon)</callback>
-	<param>
-		<name>Noise Voltage</name>
-		<key>noise_voltage</key>
-		<value>0.0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Frequency Offset</name>
-		<key>freq_offset</key>
-		<value>0.0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Epsilon</name>
-		<key>epsilon</key>
-		<value>1.0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Taps</name>
-		<key>taps</key>
-		<value>1.0 + 1.0j</value>
-		<type>complex_vector</type>
-	</param>
-	<param>
-		<name>Seed</name>
-		<key>seed</key>
-		<value>0</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/gr_dc_blocker.xml b/grc/blocks/gr_dc_blocker.xml
deleted file mode 100644
index 05c3420747..0000000000
--- a/grc/blocks/gr_dc_blocker.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-## DC Blocker
-###################################################
- -->
-<block>
-	<name>DC Blocker</name>
-	<key>gr_dc_blocker</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.dc_blocker_$(type)($length, $long_form)</make>
-	<!-- <callback>set_length($length)</callback> -->
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex->Complex</name>
-			<key>cc</key>
-			<opt>input:complex</opt>
-			<opt>output:complex</opt>
-		</option>
-		<option>
-			<name>Float->Float</name>
-			<key>ff</key>
-			<opt>input:float</opt>
-			<opt>output:float</opt>
-		</option>
-	</param>
-	<param>
-		<name>Length</name>
-		<key>length</key>
-		<value>32</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Long Form</name>
-		<key>long_form</key>
-		<value>True</value>
-		<type>bool</type>
-	</param>
-
-	<sink>
-		<name>in</name>
-		<type>$type.input</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type.output</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_fft_filter_xxx.xml b/grc/blocks/gr_fft_filter_xxx.xml
deleted file mode 100644
index 5b4cd83cca..0000000000
--- a/grc/blocks/gr_fft_filter_xxx.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##FFT Filter
-###################################################
- -->
-<block>
-	<name>FFT Filter</name>
-	<key>gr_fft_filter_xxx</key>
-	<import>from gnuradio import gr</import>
-	<import>from gnuradio.gr import firdes</import>
-	<make>gr.fft_filter_$(type)($decim, $taps, $nthreads)</make>
-	<callback>set_taps($taps)</callback>
-	<callback>set_nthreads($nthreads)</callback>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex->Complex (Complex Taps)</name>
-			<key>ccc</key>
-			<opt>input:complex</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_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>Decimation</name>
-		<key>decim</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Taps</name>
-		<key>taps</key>
-		<type>$type.taps</type>
-	</param>
-	<param>
-		<name>Num. Threads</name>
-		<key>nthreads</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type.input</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type.output</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_filter_delay_fc.xml b/grc/blocks/gr_filter_delay_fc.xml
deleted file mode 100644
index 30d65bf825..0000000000
--- a/grc/blocks/gr_filter_delay_fc.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Filter Delay
-###################################################
- -->
-<block>
-	<name>Filter Delay</name>
-	<key>gr_filter_delay_fc</key>
-	<import>from gnuradio import gr</import>
-	<import>from gnuradio.gr import firdes</import>
-	<make>gr.filter_delay_fc($taps)</make>
-	<param>
-		<name>Taps</name>
-		<key>taps</key>
-		<type>real_vector</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>float</type>
-	</sink>
-	<sink>
-		<name>in</name>
-		<type>float</type>
-		<optional>1</optional>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_fir_filter_xxx.xml b/grc/blocks/gr_fir_filter_xxx.xml
deleted file mode 100644
index c4de8f539d..0000000000
--- a/grc/blocks/gr_fir_filter_xxx.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Decimating FIR Filter
-###################################################
- -->
-<block>
-	<name>Decimating FIR Filter</name>
-	<key>gr_fir_filter_xxx</key>
-	<import>from gnuradio import gr</import>
-	<import>from gnuradio.gr import firdes</import>
-	<make>gr.fir_filter_$(type)($decim, $taps)</make>
-	<callback>set_taps($taps)</callback>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex->Complex (Complex Taps)</name>
-			<key>ccc</key>
-			<opt>input:complex</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_vector</opt>
-		</option>
-		<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->Complex (Complex Taps)</name>
-			<key>fcc</key>
-			<opt>input:float</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_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>
-		<option>
-			<name>Float->Short (Real Taps)</name>
-			<key>fsf</key>
-			<opt>input:float</opt>
-			<opt>output:short</opt>
-			<opt>taps:real_vector</opt>
-		</option>
-		<option>
-			<name>Short->Complex (Complex Taps)</name>
-			<key>scc</key>
-			<opt>input:short</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_vector</opt>
-		</option>
-	</param>
-	<param>
-		<name>Decimation</name>
-		<key>decim</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Taps</name>
-		<key>taps</key>
-		<type>$type.taps</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type.input</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type.output</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_fractional_interpolator_xx.xml b/grc/blocks/gr_fractional_interpolator_xx.xml
deleted file mode 100644
index 8d65ff8bfc..0000000000
--- a/grc/blocks/gr_fractional_interpolator_xx.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Fractional Interpolator
-###################################################
- -->
-<block>
-	<name>Fractional Interpolator</name>
-	<key>gr_fractional_interpolator_xx</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.fractional_interpolator_$(type.fcn)($phase_shift, $interp_ratio)</make>
-	<callback>set_interp_ratio($interp_ratio)</callback>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:cc</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:ff</opt>
-		</option>
-	</param>
-	<param>
-		<name>Phase Shift</name>
-		<key>phase_shift</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Interpolation Ratio</name>
-		<key>interp_ratio</key>
-		<type>real</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_freq_xlating_fir_filter_xxx.xml b/grc/blocks/gr_freq_xlating_fir_filter_xxx.xml
deleted file mode 100644
index e3ee66977d..0000000000
--- a/grc/blocks/gr_freq_xlating_fir_filter_xxx.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Frequency Xlating Filter
-###################################################
- -->
-<block>
-	<name>Frequency Xlating FIR Filter</name>
-	<key>gr_freq_xlating_fir_filter_xxx</key>
-	<import>from gnuradio import gr</import>
-	<import>from gnuradio.gr import firdes</import>
-	<make>gr.freq_xlating_fir_filter_$(type)($decim, $taps, $center_freq, $samp_rate)</make>
-	<callback>set_taps($taps)</callback>
-	<callback>set_center_freq($center_freq)</callback>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex->Complex (Complex Taps)</name>
-			<key>ccc</key>
-			<opt>input:complex</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_vector</opt>
-		</option>
-		<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->Complex (Complex Taps)</name>
-			<key>fcc</key>
-			<opt>input:float</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_vector</opt>
-		</option>
-		<option>
-			<name>Float->Complex (Real Taps)</name>
-			<key>fcf</key>
-			<opt>input:float</opt>
-			<opt>output:complex</opt>
-			<opt>taps:real_vector</opt>
-		</option>
-		<option>
-			<name>Short->Complex (Complex Taps)</name>
-			<key>scc</key>
-			<opt>input:short</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_vector</opt>
-		</option>
-		<option>
-			<name>Short->Complex (Real Taps)</name>
-			<key>scf</key>
-			<opt>input:short</opt>
-			<opt>output:complex</opt>
-			<opt>taps:real_vector</opt>
-		</option>
-	</param>
-	<param>
-		<name>Decimation</name>
-		<key>decim</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Taps</name>
-		<key>taps</key>
-		<type>$type.taps</type>
-	</param>
-	<param>
-		<name>Center Frequency</name>
-		<key>center_freq</key>
-		<value>0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Sample Rate</name>
-		<key>samp_rate</key>
-		<value>samp_rate</value>
-		<type>real</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type.input</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type.output</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_hilbert_fc.xml b/grc/blocks/gr_hilbert_fc.xml
deleted file mode 100644
index 165e8da237..0000000000
--- a/grc/blocks/gr_hilbert_fc.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Hilbert
-###################################################
- -->
-<block>
-	<name>Hilbert</name>
-	<key>gr_hilbert_fc</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.hilbert_fc($num_taps)</make>
-	<param>
-		<name>Num Taps</name>
-		<key>num_taps</key>
-		<value>64</value>
-		<type>int</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>float</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_iir_filter_ffd.xml b/grc/blocks/gr_iir_filter_ffd.xml
deleted file mode 100644
index 9799150e80..0000000000
--- a/grc/blocks/gr_iir_filter_ffd.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##IIR Filter
-###################################################
- -->
-<block>
-	<name>IIR Filter</name>
-	<key>gr_iir_filter_ffd</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.iir_filter_ffd($fftaps, $fbtaps)</make>
-	<callback>set_taps($fftaps, $fbtaps)</callback>
-	<param>
-		<name>Feed-forward Taps</name>
-		<key>fftaps</key>
-		<type>real_vector</type>
-	</param>
-	<param>
-		<name>Feedback Taps</name>
-		<key>fbtaps</key>
-		<type>real_vector</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>float</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>float</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_interp_fir_filter_xxx.xml b/grc/blocks/gr_interp_fir_filter_xxx.xml
deleted file mode 100644
index 55375ae021..0000000000
--- a/grc/blocks/gr_interp_fir_filter_xxx.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Interpolating FIR Filter
-###################################################
- -->
-<block>
-	<name>Interpolating FIR Filter</name>
-	<key>gr_interp_fir_filter_xxx</key>
-	<import>from gnuradio import gr</import>
-	<import>from gnuradio.gr import firdes</import>
-	<make>gr.interp_fir_filter_$(type)($interp, $taps)</make>
-	<callback>set_taps($taps)</callback>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex->Complex (Complex Taps)</name>
-			<key>ccc</key>
-			<opt>input:complex</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_vector</opt>
-		</option>
-		<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->Complex (Complex Taps)</name>
-			<key>fcc</key>
-			<opt>input:float</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_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>
-		<option>
-			<name>Float->Short (Real Taps)</name>
-			<key>fsf</key>
-			<opt>input:float</opt>
-			<opt>output:short</opt>
-			<opt>taps:real_vector</opt>
-		</option>
-		<option>
-			<name>Short->Complex (Complex Taps)</name>
-			<key>scc</key>
-			<opt>input:short</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_vector</opt>
-		</option>
-	</param>
-	<param>
-		<name>Interpolation</name>
-		<key>interp</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Taps</name>
-		<key>taps</key>
-		<type>$type.taps</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type.input</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type.output</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_iqcomp_cc.xml b/grc/blocks/gr_iqcomp_cc.xml
deleted file mode 100644
index 1603bdc42b..0000000000
--- a/grc/blocks/gr_iqcomp_cc.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##IQ Comp
-###################################################
- -->
-<block>
-	<name>IQ Comp</name>
-	<key>gr_iqcomp_cc</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.iqcomp_cc($mu)</make>
-	<param>
-		<name>Mu</name>
-		<key>mu</key>
-		<type>real</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>complex</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_rational_resampler_base_xxx.xml b/grc/blocks/gr_rational_resampler_base_xxx.xml
deleted file mode 100644
index 4b7720173c..0000000000
--- a/grc/blocks/gr_rational_resampler_base_xxx.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Rational Resampler Base
-###################################################
- -->
-<block>
-	<name>Rational Resampler Base</name>
-	<key>gr_rational_resampler_base_xxx</key>
-	<import>from gnuradio import gr</import>
-	<import>from gnuradio.gr import firdes</import>
-	<make>gr.rational_resampler_base_$(type)($interp, $decim, $taps)</make>
-	<callback>set_taps($taps)</callback>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex->Complex (Complex Taps)</name>
-			<key>ccc</key>
-			<opt>input:complex</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_vector</opt>
-		</option>
-		<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->Complex (Complex Taps)</name>
-			<key>fcc</key>
-			<opt>input:float</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_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>
-		<option>
-			<name>Float->Short (Real Taps)</name>
-			<key>fsf</key>
-			<opt>input:float</opt>
-			<opt>output:short</opt>
-			<opt>taps:real_vector</opt>
-		</option>
-		<option>
-			<name>Short->Complex (Complex Taps)</name>
-			<key>scc</key>
-			<opt>input:short</opt>
-			<opt>output:complex</opt>
-			<opt>taps:complex_vector</opt>
-		</option>
-	</param>
-	<param>
-		<name>Interpolation</name>
-		<key>interp</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Decimation</name>
-		<key>decim</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Taps</name>
-		<key>taps</key>
-		<type>$type.taps</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type.input</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type.output</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_single_pole_iir_filter_xx.xml b/grc/blocks/gr_single_pole_iir_filter_xx.xml
deleted file mode 100644
index 50cf4a82d8..0000000000
--- a/grc/blocks/gr_single_pole_iir_filter_xx.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Single Pole IIR Filter
-###################################################
- -->
-<block>
-	<name>Single Pole IIR Filter</name>
-	<key>gr_single_pole_iir_filter_xx</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.single_pole_iir_filter_$(type.fcn)($alpha, $vlen)</make>
-	<callback>set_taps($alpha)</callback>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:cc</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:ff</opt>
-		</option>
-	</param>
-	<param>
-		<name>Alpha</name>
-		<key>alpha</key>
-		<value>1.0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</source>
-</block>
diff --git a/grc/blocks/high_pass_filter.xml b/grc/blocks/high_pass_filter.xml
deleted file mode 100644
index 0e29cbb36f..0000000000
--- a/grc/blocks/high_pass_filter.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##High Pass Filter: Custom wrapper
-###################################################
- -->
-<block>
-	<name>High Pass Filter</name>
-	<key>high_pass_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.high_pass(
-	$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>
-		<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>Cutoff Freq</name>
-		<key>cutoff_freq</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Transition Width</name>
-		<key>width</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Window</name>
-		<key>win</key>
-		<value>firdes.WIN_HAMMING</value>
-		<type>int</type>
-		<option>
-			<name>Hamming</name>
-			<key>firdes.WIN_HAMMING</key>
-		</option>
-		<option>
-			<name>Hann</name>
-			<key>firdes.WIN_HANN</key>
-		</option>
-		<option>
-			<name>Blackman</name>
-			<key>firdes.WIN_BLACKMAN</key>
-		</option>
-		<option>
-			<name>Rectangular</name>
-			<key>firdes.WIN_RECTANGULAR</key>
-		</option>
-		<option>
-			<name>Kaiser</name>
-			<key>firdes.WIN_KAISER</key>
-		</option>
-	</param>
-	<param>
-		<name>Beta</name>
-		<key>beta</key>
-		<value>6.76</value>
-		<type>real</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, cutoff frequency, and transition width are in Hertz.
-
-The beta paramater only applies to the Kaiser window.
-	</doc>
-</block>
diff --git a/grc/blocks/low_pass_filter.xml b/grc/blocks/low_pass_filter.xml
deleted file mode 100644
index 26435fd4d8..0000000000
--- a/grc/blocks/low_pass_filter.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Low Pass Filter: Custom wrapper
-###################################################
- -->
-<block>
-	<name>Low Pass Filter</name>
-	<key>low_pass_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.low_pass(
-	$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>
-		<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>Cutoff Freq</name>
-		<key>cutoff_freq</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Transition Width</name>
-		<key>width</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Window</name>
-		<key>win</key>
-		<value>firdes.WIN_HAMMING</value>
-		<type>int</type>
-		<option>
-			<name>Hamming</name>
-			<key>firdes.WIN_HAMMING</key>
-		</option>
-		<option>
-			<name>Hann</name>
-			<key>firdes.WIN_HANN</key>
-		</option>
-		<option>
-			<name>Blackman</name>
-			<key>firdes.WIN_BLACKMAN</key>
-		</option>
-		<option>
-			<name>Rectangular</name>
-			<key>firdes.WIN_RECTANGULAR</key>
-		</option>
-		<option>
-			<name>Kaiser</name>
-			<key>firdes.WIN_KAISER</key>
-		</option>
-	</param>
-	<param>
-		<name>Beta</name>
-		<key>beta</key>
-		<value>6.76</value>
-		<type>real</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, cutoff frequency, and transition width are in Hertz.
-
-The beta paramater only applies to the Kaiser window.
-	</doc>
-</block>
diff --git a/grc/blocks/root_raised_cosine_filter.xml b/grc/blocks/root_raised_cosine_filter.xml
deleted file mode 100644
index 81688d2973..0000000000
--- a/grc/blocks/root_raised_cosine_filter.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?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>
author	Tom Rondeau <trondeau@vt.edu>	2012-08-20 22:49:38 -0400
committer	Tom Rondeau <trondeau@vt.edu>	2012-08-20 22:50:09 -0400
commit	5f720e1beb27f7457f20555f8ce1bb8c34c27cbe (patch)
tree	12334badeef2e43eeba95927f768887584412d31 /grc
parent	527dc0e6ec8008bdfc18a2f690596cac34a77080 (diff)