filter: cleaning up GRC filter blocks.

Author: trondeau

gr-filter/grc/CMakeLists.txt

@@ -36,6 +36,11 @@ install(FILES
     filter_rational_resampler_base_xxx.xml
     filter_single_pole_iir_filter_xx.xml
     filter_channel_model.xml
+    filter_low_pass_filter.xml
+    filter_high_pass_filter.xml
+    filter_band_pass_filter.xml
+    filter_band_reject_filter.xml
+    filter_root_raised_cosine_filter.xml
     DESTINATION ${GRC_BLOCKS_DIR}
     COMPONENT "filter_python"
 )

grc/blocks/band_pass_filter.xml gr-filter/grc/filter_band_pass_filter.xml

@@ -7,9 +7,9 @@
 <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)(
+	<import>from gnuradio import filter</import>
+	<import>from gnuradio.filter import firdes</import>
+	<make>filter.$(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>

grc/blocks/band_reject_filter.xml gr-filter/grc/filter_band_reject_filter.xml

@@ -7,9 +7,9 @@
 <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(
+	<import>from gnuradio import filter</import>
+	<import>from gnuradio.filter import firdes</import>
+	<make>filter.$(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>

gr-filter/grc/filter_block_tree.xml

@@ -30,6 +30,13 @@
 	<name></name> <!-- Blank for Root Name -->
 	<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>
+		<!-- Regular Filter Blocks -->
 		<block>dc_blocker_xx</block>
 		<block>fft_filter_xxx</block>
 		<block>fir_filter_xxx</block>

grc/blocks/high_pass_filter.xml gr-filter/grc/filter_high_pass_filter.xml

@@ -7,9 +7,9 @@
 <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(
+	<import>from gnuradio import filter</import>
+	<import>from gnuradio.filter import firdes</import>
+	<make>filter.$(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>

grc/blocks/low_pass_filter.xml gr-filter/grc/filter_low_pass_filter.xml

@@ -7,9 +7,9 @@
 <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(
+	<import>from gnuradio import filter</import>
+	<import>from gnuradio.filter import firdes</import>
+	<make>filter.$(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>

grc/blocks/root_raised_cosine_filter.xml gr-filter/grc/filter_root_raised_cosine_filter.xml

@@ -7,9 +7,9 @@
 <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(
+	<import>from gnuradio import filter</import>
+	<import>from gnuradio.filter import firdes</import>
+	<make>filter.$(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>

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>