From f64b971f34ab813f70b0680ec7ae02744343ef3c Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 1 May 2012 22:10:17 -0400 Subject: filter: work on creating gr-filter top-level component. Builds but does not bring in libgnuradio-fft.so symbols. --- gr-filter/grc/CMakeLists.txt | 24 ++++++++++++++++++++++++ gr-filter/grc/filter_block_tree.xml | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 gr-filter/grc/CMakeLists.txt create mode 100644 gr-filter/grc/filter_block_tree.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt new file mode 100644 index 000000000..79496183f --- /dev/null +++ b/gr-filter/grc/CMakeLists.txt @@ -0,0 +1,24 @@ +# Copyright 2012 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. + +install(FILES + filter_block_tree.xml + DESTINATION ${GRC_BLOCKS_DIR} + COMPONENT "filter_python" +) diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml new file mode 100644 index 000000000..a97620db9 --- /dev/null +++ b/gr-filter/grc/filter_block_tree.xml @@ -0,0 +1,34 @@ + + + + + + + + + Filters + + -- cgit From 1e18d093dad92f798796f75136943adf088cfe60 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 3 May 2012 14:05:21 -0400 Subject: filter: added GRC block for FFT filters. Fixed example install. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/fft_filter_xxx.xml | 59 +++++++++++++++++++++++++++++++++++++ gr-filter/grc/filter_block_tree.xml | 1 + 3 files changed, 61 insertions(+) create mode 100644 gr-filter/grc/fft_filter_xxx.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 79496183f..9b40395b8 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -19,6 +19,7 @@ install(FILES filter_block_tree.xml + fft_filter_xxx.xml DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "filter_python" ) diff --git a/gr-filter/grc/fft_filter_xxx.xml b/gr-filter/grc/fft_filter_xxx.xml new file mode 100644 index 000000000..29612dffd --- /dev/null +++ b/gr-filter/grc/fft_filter_xxx.xml @@ -0,0 +1,59 @@ + + + + FFT Filter + fft_filter_xxx + from gnuradio import filter + from gnuradio.gr import firdes + filter.fft_filter_$(type)($decim, $taps, $nthreads) + set_taps($taps) + set_nthreads($nthreads) + + Type + type + enum + + + + + Decimation + decim + 1 + int + + + Taps + taps + $type.taps + + + Num. Threads + nthreads + 1 + int + + + in + $type.input + + + out + $type.output + + diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index a97620db9..7d0559857 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -30,5 +30,6 @@ Filters + fft_filter_xxx -- cgit From 897a60220a29fc509802e5e30e645e7ee154e184 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 5 May 2012 17:52:28 -0400 Subject: filter: added hilbert xform block with QA and GRC block. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/hilbert_fc.xml | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 gr-filter/grc/hilbert_fc.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 9b40395b8..00171e6ff 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -20,6 +20,7 @@ install(FILES filter_block_tree.xml fft_filter_xxx.xml + hilbert_fc.xml DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "filter_python" ) diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 7d0559857..c0c2e96e2 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -31,5 +31,6 @@ Filters fft_filter_xxx + hilbert_fc diff --git a/gr-filter/grc/hilbert_fc.xml b/gr-filter/grc/hilbert_fc.xml new file mode 100644 index 000000000..dd4c94b83 --- /dev/null +++ b/gr-filter/grc/hilbert_fc.xml @@ -0,0 +1,26 @@ + + + + Hilbert + hilbert_fc + from gnuradio import filter + filter.hilbert_fc($num_taps) + + Num Taps + num_taps + 64 + int + + + in + float + + + out + complex + + -- cgit From 137cd17199b62409591acff84476605f64e15ff8 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 6 May 2012 16:24:43 -0400 Subject: filter: moved dc_blocker to gr-filter with QA and GRC blocks. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/dc_blocker_xx.xml | 51 +++++++++++++++++++++++++++++++++++++ gr-filter/grc/filter_block_tree.xml | 1 + 3 files changed, 53 insertions(+) create mode 100644 gr-filter/grc/dc_blocker_xx.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 00171e6ff..5241680e8 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -19,6 +19,7 @@ install(FILES filter_block_tree.xml + dc_blocker_xx.xml fft_filter_xxx.xml hilbert_fc.xml DESTINATION ${GRC_BLOCKS_DIR} diff --git a/gr-filter/grc/dc_blocker_xx.xml b/gr-filter/grc/dc_blocker_xx.xml new file mode 100644 index 000000000..9bce5e980 --- /dev/null +++ b/gr-filter/grc/dc_blocker_xx.xml @@ -0,0 +1,51 @@ + + + + DC Blocker + dc_blocker_xx + from gnuradio import filter + filter.dc_blocker_$(type)($length, $long_form) + + + Type + type + enum + + + + + Length + length + 32 + int + + + Long Form + long_form + True + bool + + + + in + $type.input + + + out + $type.output + + diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index c0c2e96e2..709aa89aa 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -30,6 +30,7 @@ Filters + dc_blocker_xx fft_filter_xxx hilbert_fc -- cgit From fc98a2a9775ab8e091413a195ce2584e5b76de99 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 6 May 2012 19:36:03 -0400 Subject: filter: added filter_delay_fc to gr-filter with QA and GRC files. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/filter_delay_fc.xml | 31 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 gr-filter/grc/filter_delay_fc.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 5241680e8..6ace8a8b4 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -21,6 +21,7 @@ install(FILES filter_block_tree.xml dc_blocker_xx.xml fft_filter_xxx.xml + filter_delay_fc.xml hilbert_fc.xml DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "filter_python" diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 709aa89aa..fbc4e7cb5 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -32,6 +32,7 @@ Filters dc_blocker_xx fft_filter_xxx + filter_delay_fc hilbert_fc diff --git a/gr-filter/grc/filter_delay_fc.xml b/gr-filter/grc/filter_delay_fc.xml new file mode 100644 index 000000000..7b77c2caf --- /dev/null +++ b/gr-filter/grc/filter_delay_fc.xml @@ -0,0 +1,31 @@ + + + + Filter Delay + filter_delay_fc + from gnuradio import filter + from gnuradio.filter import firdes + filter.filter_delay_fc($taps) + + Taps + taps + real_vector + + + in + float + + + in + float + 1 + + + out + complex + + -- cgit From 4f08cb7eb6e3ac4b7315b4b78dbc7d812b6c3dd1 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 8 May 2012 22:07:05 -0400 Subject: filter: copied over pfb_channelizer to gr-filter with QA and GRC. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/pfb_channelizer.xml | 62 +++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 gr-filter/grc/pfb_channelizer.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 6ace8a8b4..1c69e47c3 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -23,6 +23,7 @@ install(FILES fft_filter_xxx.xml filter_delay_fc.xml hilbert_fc.xml + pfb_channelizer.xml DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "filter_python" ) diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index fbc4e7cb5..0c685d9f6 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -34,5 +34,6 @@ fft_filter_xxx filter_delay_fc hilbert_fc + pfb_channelizer_ccf diff --git a/gr-filter/grc/pfb_channelizer.xml b/gr-filter/grc/pfb_channelizer.xml new file mode 100644 index 000000000..114abc0f0 --- /dev/null +++ b/gr-filter/grc/pfb_channelizer.xml @@ -0,0 +1,62 @@ + + + + Polyphase Channelizer + pfb_channelizer_ccf + from gnuradio import filter + from gnuradio.filter import firdes + filter.pfb.channelizer_ccf( + $nchans, + $taps, + $osr, + $atten) +self.$(id).set_channel_map($ch_map) + + + set_channel_map($ch_map) + + + Channels + nchans + int + + + Taps + taps + None + real_vector + + + Over Sample Ratio + osr + 1.0 + real + + + Attenuation + atten + 100 + real + + + Channel Map + ch_map + [] + int_vector + + + in + complex + + + out + complex + $nchans + + -- cgit From 59ad06e0e30ad4c24053b64c453cfdbe95cc7500 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 15 Jun 2012 09:57:45 -0400 Subject: filter: improving documentation and adding GRC blocks for fir_filter_xxx blocks. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/fir_filter_xxx.xml | 80 +++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 gr-filter/grc/fir_filter_xxx.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 1c69e47c3..663cc0b00 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -21,6 +21,7 @@ install(FILES filter_block_tree.xml dc_blocker_xx.xml fft_filter_xxx.xml + fir_filter_xxx.xml filter_delay_fc.xml hilbert_fc.xml pfb_channelizer.xml diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 0c685d9f6..988897fcf 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -32,6 +32,7 @@ Filters dc_blocker_xx fft_filter_xxx + fir_filter_xxx filter_delay_fc hilbert_fc pfb_channelizer_ccf diff --git a/gr-filter/grc/fir_filter_xxx.xml b/gr-filter/grc/fir_filter_xxx.xml new file mode 100644 index 000000000..3925eb555 --- /dev/null +++ b/gr-filter/grc/fir_filter_xxx.xml @@ -0,0 +1,80 @@ + + + + Decimating FIR Filter + fir_filter_xxx + from gnuradio import filter + from gnuradio.filter import firdes + filter.fir_filter_$(type)($decim, $taps) + set_taps($taps) + + Type + type + enum + + + + + + + + + Decimation + decim + 1 + int + + + Taps + taps + $type.taps + + + in + $type.input + + + out + $type.output + + -- cgit From 76a6a4c668579ff2e17f8fa44ceb0db381b9053f Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 15 Jun 2012 15:58:28 -0400 Subject: filter: adding single_pole_iir_filter blocks. QA, docs, and GRC. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/single_pole_iir_filter_xx.xml | 51 +++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 gr-filter/grc/single_pole_iir_filter_xx.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 663cc0b00..83036a0b3 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -25,6 +25,7 @@ install(FILES filter_delay_fc.xml hilbert_fc.xml pfb_channelizer.xml + single_pole_iir_filter_xx.xml DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "filter_python" ) diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 988897fcf..6711e809f 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -36,5 +36,6 @@ filter_delay_fc hilbert_fc pfb_channelizer_ccf + single_pole_iir_filter_xx diff --git a/gr-filter/grc/single_pole_iir_filter_xx.xml b/gr-filter/grc/single_pole_iir_filter_xx.xml new file mode 100644 index 000000000..3eaf52625 --- /dev/null +++ b/gr-filter/grc/single_pole_iir_filter_xx.xml @@ -0,0 +1,51 @@ + + + + Single Pole IIR Filter + single_pole_iir_filter_xx + from gnuradio import filter + filter.single_pole_iir_filter_$(type.fcn)($alpha, $vlen) + set_taps($alpha) + + Type + type + enum + + + + + Alpha + alpha + 1.0 + real + + + Vec Length + vlen + 1 + int + + $vlen > 0 + + in + $type + $vlen + + + out + $type + $vlen + + -- cgit From 3cd0ea45255e2ca43931b2f067ec82fc92f4293e Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 15 Jun 2012 17:56:33 -0400 Subject: filter: adding IIR filter. Include QA and GRC. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/iir_filter_ffd.xml | 31 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 gr-filter/grc/iir_filter_ffd.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 83036a0b3..63434fe75 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -24,6 +24,7 @@ install(FILES fir_filter_xxx.xml filter_delay_fc.xml hilbert_fc.xml + iir_filter_ffd.xml pfb_channelizer.xml single_pole_iir_filter_xx.xml DESTINATION ${GRC_BLOCKS_DIR} diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 6711e809f..2ae4eb628 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -35,6 +35,7 @@ fir_filter_xxx filter_delay_fc hilbert_fc + iir_filter_ffd pfb_channelizer_ccf single_pole_iir_filter_xx diff --git a/gr-filter/grc/iir_filter_ffd.xml b/gr-filter/grc/iir_filter_ffd.xml new file mode 100644 index 000000000..261aba320 --- /dev/null +++ b/gr-filter/grc/iir_filter_ffd.xml @@ -0,0 +1,31 @@ + + + + IIR Filter + iir_filter_ffd + from gnuradio import filter + filter.iir_filter_ffd($fftaps, $fbtaps) + set_taps($fftaps, $fbtaps) + + Feed-forward Taps + fftaps + real_vector + + + Feedback Taps + fbtaps + real_vector + + + in + float + + + out + float + + -- cgit From d647fbbaa07554ad314c9eb2b5c1735b6265d13a Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 16 Jun 2012 10:55:36 -0400 Subject: filter: adding freq_xlating_filter. Includes QA and GRC. Update to build_utils adds a FIR_TYPE for the type of filter and CFIR_TYPE for the type of filter where the taps are always complex (needed for freq_xlating_filter). --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/freq_xlating_fir_filter_xxx.xml | 93 +++++++++++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 gr-filter/grc/freq_xlating_fir_filter_xxx.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 63434fe75..531dc5271 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -23,6 +23,7 @@ install(FILES fft_filter_xxx.xml fir_filter_xxx.xml filter_delay_fc.xml + freq_xlating_fir_filter_xxx.xml hilbert_fc.xml iir_filter_ffd.xml pfb_channelizer.xml diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 2ae4eb628..8ab43644b 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -34,6 +34,7 @@ fft_filter_xxx fir_filter_xxx filter_delay_fc + freq_xlating_fir_filter_xxx hilbert_fc iir_filter_ffd pfb_channelizer_ccf diff --git a/gr-filter/grc/freq_xlating_fir_filter_xxx.xml b/gr-filter/grc/freq_xlating_fir_filter_xxx.xml new file mode 100644 index 000000000..178a42f48 --- /dev/null +++ b/gr-filter/grc/freq_xlating_fir_filter_xxx.xml @@ -0,0 +1,93 @@ + + + + Frequency Xlating FIR Filter + freq_xlating_fir_filter_xxx + from gnuradio import filter + from gnuradio.filter import firdes + filter.freq_xlating_fir_filter_$(type)($decim, $taps, $center_freq, $samp_rate) + set_taps($taps) + set_center_freq($center_freq) + + Type + type + enum + + + + + + + + + Decimation + decim + 1 + int + + + Taps + taps + $type.taps + + + Center Frequency + center_freq + 0 + real + + + Sample Rate + samp_rate + samp_rate + real + + + in + $type.input + + + out + $type.output + + -- cgit From f049a184c38a9344efea24ec813a13499237e23b Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 17 Jun 2012 21:49:35 -0400 Subject: filter: adding fractional_interpolator_{cc,ff} with QA and GRC. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/fractional_interpolator_xx.xml | 46 ++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 gr-filter/grc/fractional_interpolator_xx.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 531dc5271..48d452d39 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -23,6 +23,7 @@ install(FILES fft_filter_xxx.xml fir_filter_xxx.xml filter_delay_fc.xml + fractional_interpolator_xx.xml freq_xlating_fir_filter_xxx.xml hilbert_fc.xml iir_filter_ffd.xml diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 8ab43644b..7f34a1b70 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -34,6 +34,7 @@ fft_filter_xxx fir_filter_xxx filter_delay_fc + fractional_interpolator_xx freq_xlating_fir_filter_xxx hilbert_fc iir_filter_ffd diff --git a/gr-filter/grc/fractional_interpolator_xx.xml b/gr-filter/grc/fractional_interpolator_xx.xml new file mode 100644 index 000000000..760e8bb06 --- /dev/null +++ b/gr-filter/grc/fractional_interpolator_xx.xml @@ -0,0 +1,46 @@ + + + + Fractional Interpolator + fractional_interpolator_xx + from gnuradio import filter + filter.fractional_interpolator_$(type.fcn)($phase_shift, $interp_ratio) + set_interp_ratio($interp_ratio) + + Type + type + enum + + + + + Phase Shift + phase_shift + real + + + Interpolation Ratio + interp_ratio + real + + + in + $type + + + out + $type + + -- cgit From f5449ce2e0a665b725a27855cd94f28a976da792 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 18 Jun 2012 13:34:51 -0400 Subject: filter: added interp_fir_filter with QA and GRC. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/interp_fir_filter_xxx.xml | 80 +++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 gr-filter/grc/interp_fir_filter_xxx.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 48d452d39..a269c2b25 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -27,6 +27,7 @@ install(FILES freq_xlating_fir_filter_xxx.xml hilbert_fc.xml iir_filter_ffd.xml + interp_fir_filter_xxx.xml pfb_channelizer.xml single_pole_iir_filter_xx.xml DESTINATION ${GRC_BLOCKS_DIR} diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 7f34a1b70..a5630bc88 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -38,6 +38,7 @@ freq_xlating_fir_filter_xxx hilbert_fc iir_filter_ffd + interp_fir_filter_xxx pfb_channelizer_ccf single_pole_iir_filter_xx diff --git a/gr-filter/grc/interp_fir_filter_xxx.xml b/gr-filter/grc/interp_fir_filter_xxx.xml new file mode 100644 index 000000000..98a143f53 --- /dev/null +++ b/gr-filter/grc/interp_fir_filter_xxx.xml @@ -0,0 +1,80 @@ + + + + Interpolating FIR Filter + interp_fir_filter_xxx + from gnuradio import filter + from gnuradio.filter import firdes + filter.interp_fir_filter_$(type)($interp, $taps) + set_taps($taps) + + Type + type + enum + + + + + + + + + Interpolation + interp + 1 + int + + + Taps + taps + $type.taps + + + in + $type.input + + + out + $type.output + + -- cgit From 622464a324abc90f2724d3f846f0b1bdb38b97fc Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 18 Jun 2012 14:37:49 -0400 Subject: filter: adding PFB decimator with GRC and QA. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/pfb_decimator.xml | 43 +++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 gr-filter/grc/pfb_decimator.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index a269c2b25..a160b00bb 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -29,6 +29,7 @@ install(FILES iir_filter_ffd.xml interp_fir_filter_xxx.xml pfb_channelizer.xml + pfb_decimator.xml single_pole_iir_filter_xx.xml DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "filter_python" diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index a5630bc88..2a0d02346 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -40,6 +40,7 @@ iir_filter_ffd interp_fir_filter_xxx pfb_channelizer_ccf + pfb_decimator_ccf single_pole_iir_filter_xx diff --git a/gr-filter/grc/pfb_decimator.xml b/gr-filter/grc/pfb_decimator.xml new file mode 100644 index 000000000..dea5bdb43 --- /dev/null +++ b/gr-filter/grc/pfb_decimator.xml @@ -0,0 +1,43 @@ + + + + Polyphase Decimator + pfb_decimator_ccf + from gnuradio import filter + from gnuradio.filter import firdes + filter.pfb.decimator_ccf( + $decim, + $taps, + $channel) + + set_taps($taps) + + Decimation + decim + int + + + Taps + taps + None + real_vector + + + Output Channel + channel + 0 + int + + + in + complex + + + out + complex + + -- cgit From 5365daf7ae85c9df88f0b8f3667ece022d93f637 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 18 Jun 2012 15:42:14 -0400 Subject: filter: adding PFB interpolator with GRC and QA. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/pfb_decimator.xml | 2 +- gr-filter/grc/pfb_interpolator.xml | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gr-filter/grc/pfb_interpolator.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index a160b00bb..7fc129d8a 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -30,6 +30,7 @@ install(FILES interp_fir_filter_xxx.xml pfb_channelizer.xml pfb_decimator.xml + pfb_interpolator.xml single_pole_iir_filter_xx.xml DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "filter_python" diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 2a0d02346..0ec9e5dd0 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -41,6 +41,7 @@ interp_fir_filter_xxx pfb_channelizer_ccf pfb_decimator_ccf + pfb_interpolator_ccf single_pole_iir_filter_xx diff --git a/gr-filter/grc/pfb_decimator.xml b/gr-filter/grc/pfb_decimator.xml index dea5bdb43..329d59c3d 100644 --- a/gr-filter/grc/pfb_decimator.xml +++ b/gr-filter/grc/pfb_decimator.xml @@ -1,7 +1,7 @@ diff --git a/gr-filter/grc/pfb_interpolator.xml b/gr-filter/grc/pfb_interpolator.xml new file mode 100644 index 000000000..600493123 --- /dev/null +++ b/gr-filter/grc/pfb_interpolator.xml @@ -0,0 +1,36 @@ + + + + Polyphase Interpolator + pfb_interpolator_ccf + from gnuradio import filter + from gnuradio.filter import firdes + filter.pfb.interpolator_ccf( + $interp, + $taps) + + set_taps($taps) + + Interpolation + interp + int + + + Taps + taps + None + real_vector + + + in + complex + + + out + complex + + -- cgit From e5aead883b8bf82cb0ebd63e825b99b5172048cd Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 19 Jun 2012 00:07:58 -0400 Subject: filter: adding PFB arbitrary resampler (ccf and fff) with GRC and QA. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/pfb_arb_resampler.xml | 61 +++++++++++++++++++++++++++++++++++++ gr-filter/grc/pfb_decimator.xml | 2 +- 4 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 gr-filter/grc/pfb_arb_resampler.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 7fc129d8a..3110e0f1b 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -28,6 +28,7 @@ install(FILES hilbert_fc.xml iir_filter_ffd.xml interp_fir_filter_xxx.xml + pfb_arb_resampler.xml pfb_channelizer.xml pfb_decimator.xml pfb_interpolator.xml diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 0ec9e5dd0..ecc97dd23 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -39,6 +39,7 @@ hilbert_fc iir_filter_ffd interp_fir_filter_xxx + pfb_arb_resampler_xxx pfb_channelizer_ccf pfb_decimator_ccf pfb_interpolator_ccf diff --git a/gr-filter/grc/pfb_arb_resampler.xml b/gr-filter/grc/pfb_arb_resampler.xml new file mode 100644 index 000000000..f3048000a --- /dev/null +++ b/gr-filter/grc/pfb_arb_resampler.xml @@ -0,0 +1,61 @@ + + + + Polyphase Arbitrary Resampler + pfb_arb_resampler_xxx + from gnuradio import filter + from gnuradio.filter import firdes + filter.pfb_arb_resampler_$(type)( + $rrate, + $taps, + $nfilts) + + set_taps($taps) + + Type + type + enum + + + + + Resampling Rate + rrate + real + + + Taps + taps + $type.taps + + + Number of Filters + nfilts + 32 + int + + + in + complex + + + out + complex + + diff --git a/gr-filter/grc/pfb_decimator.xml b/gr-filter/grc/pfb_decimator.xml index 329d59c3d..b0540d3e2 100644 --- a/gr-filter/grc/pfb_decimator.xml +++ b/gr-filter/grc/pfb_decimator.xml @@ -9,7 +9,7 @@ pfb_decimator_ccf from gnuradio import filter from gnuradio.filter import firdes - filter.pfb.decimator_ccf( + filter.pfb_decimator_ccf( $decim, $taps, $channel) -- cgit From 5ab78aaeedb87f4a30c41dd9e7ede56b5dc01d04 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 19 Jun 2012 18:10:59 -0400 Subject: filter: adding rational resampler with GRC and QA. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/rational_resampler_base_xxx.xml | 86 +++++++++++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 gr-filter/grc/rational_resampler_base_xxx.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 3110e0f1b..0747c7240 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -32,6 +32,7 @@ install(FILES pfb_channelizer.xml pfb_decimator.xml pfb_interpolator.xml + rational_resampler_base_xxx.xml single_pole_iir_filter_xx.xml DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "filter_python" diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index ecc97dd23..de840a3fd 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -43,6 +43,7 @@ pfb_channelizer_ccf pfb_decimator_ccf pfb_interpolator_ccf + rational_resampler_base_xxx single_pole_iir_filter_xx diff --git a/gr-filter/grc/rational_resampler_base_xxx.xml b/gr-filter/grc/rational_resampler_base_xxx.xml new file mode 100644 index 000000000..399bfc74c --- /dev/null +++ b/gr-filter/grc/rational_resampler_base_xxx.xml @@ -0,0 +1,86 @@ + + + + Rational Resampler Base + rational_resampler_base_xxx + from gnuradio import filter + from gnuradio.filter import firdes + filter.rational_resampler_base_$(type)($interp, $decim, $taps) + set_taps($taps) + + Type + type + enum + + + + + + + + + Interpolation + interp + 1 + int + + + Decimation + decim + 1 + int + + + Taps + taps + $type.taps + + + in + $type.input + + + out + $type.output + + -- cgit From fad32dc397d731493dc88367d2b4648b35bb905b Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 19 Jun 2012 20:36:04 -0400 Subject: filter: adding PFB synthesis filter with GRC and QA. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/filter_block_tree.xml | 1 + gr-filter/grc/pfb_synthesizer.xml | 57 +++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 gr-filter/grc/pfb_synthesizer.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 0747c7240..8bbb4c9e0 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -32,6 +32,7 @@ install(FILES pfb_channelizer.xml pfb_decimator.xml pfb_interpolator.xml + pfb_synthesizer.xml rational_resampler_base_xxx.xml single_pole_iir_filter_xx.xml DESTINATION ${GRC_BLOCKS_DIR} diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index de840a3fd..b16966eae 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -43,6 +43,7 @@ pfb_channelizer_ccf pfb_decimator_ccf pfb_interpolator_ccf + pfb_synthesizer_ccf rational_resampler_base_xxx single_pole_iir_filter_xx diff --git a/gr-filter/grc/pfb_synthesizer.xml b/gr-filter/grc/pfb_synthesizer.xml new file mode 100644 index 000000000..e84b25e62 --- /dev/null +++ b/gr-filter/grc/pfb_synthesizer.xml @@ -0,0 +1,57 @@ + + + + Polyphase Synthesizer + pfb_synthesizer_ccf + from gnuradio import filter + from gnuradio.filter import firdes + filter.pfb_synthesizer_ccf( + $numchans, $taps, $twox) +self.$(id).set_channel_map($ch_map) + + set_taps($taps) + set_channel_map($ch_map) + + + Channels + numchans + 2 + int + + + Connections + connections + 2 + int + + + Taps + taps + real_vector + + + 2x Sample Rate + twox + False + bool + + + Channel Map + ch_map + [] + int_vector + + + in + complex + $connections + + + out + complex + + -- cgit From d8d8e992e3f94792fefa74c61d32494903f77dfb Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 19 Jun 2012 22:22:06 -0400 Subject: filter: added channel_model block with GRC. Dummy QA test needs work. More documentation. --- gr-filter/grc/CMakeLists.txt | 1 + gr-filter/grc/channel_model.xml | 61 +++++++++++++++++++++++++++++++++++++ gr-filter/grc/filter_block_tree.xml | 1 + 3 files changed, 63 insertions(+) create mode 100644 gr-filter/grc/channel_model.xml (limited to 'gr-filter/grc') diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 8bbb4c9e0..2e3fef4f0 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -35,6 +35,7 @@ install(FILES pfb_synthesizer.xml rational_resampler_base_xxx.xml single_pole_iir_filter_xx.xml + channel_model.xml DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "filter_python" ) diff --git a/gr-filter/grc/channel_model.xml b/gr-filter/grc/channel_model.xml new file mode 100644 index 000000000..6d780974a --- /dev/null +++ b/gr-filter/grc/channel_model.xml @@ -0,0 +1,61 @@ + + + + Channel Model + channel_model + from gnuradio import filter + from gnuradio.filter import firdes + filter.channel_model( + noise_voltage=$noise_voltage, + frequency_offset=$freq_offset, + epsilon=$epsilon, + taps=$taps, + noise_seed=$seed, +) + set_noise_voltage($noise_voltage) + set_frequency_offset($freq_offset) + set_taps($taps) + set_timing_offset($epsilon) + + Noise Voltage + noise_voltage + 0.0 + real + + + Frequency Offset + freq_offset + 0.0 + real + + + Epsilon + epsilon + 1.0 + real + + + Taps + taps + 1.0 + 1.0j + complex_vector + + + Seed + seed + 0 + int + + + in + complex + + + out + complex + + diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index b16966eae..711ce4059 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -46,5 +46,6 @@ pfb_synthesizer_ccf rational_resampler_base_xxx single_pole_iir_filter_xx + channel_model -- cgit