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/swig/CMakeLists.txt | 53 +++++++++++++++++++++++++++++++++++++++++++ gr-filter/swig/filter_swig.i | 36 +++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 gr-filter/swig/CMakeLists.txt create mode 100644 gr-filter/swig/filter_swig.i (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/CMakeLists.txt b/gr-filter/swig/CMakeLists.txt new file mode 100644 index 000000000..5dff9f631 --- /dev/null +++ b/gr-filter/swig/CMakeLists.txt @@ -0,0 +1,53 @@ +# 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. + +######################################################################## +# Setup swig generation +######################################################################## +include(GrPython) +include(GrSwig) + +set(GR_SWIG_INCLUDE_DIRS + ${FILTER_INCLUDE_DIRS} + ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${FFT_INCLUDE_DIRS} + ${FFTW3F_INCLUDE_DIRS} +) + +# FIXME: rename to filter_swig_doc.i when gnuradio-core is updated +set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/gr_filter_swig_doc.i) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib) + +set(GR_SWIG_LIBRARIES gnuradio-filter gnuradio-fft) + +GR_SWIG_MAKE(filter_swig filter_swig.i) + +GR_SWIG_INSTALL( + TARGETS filter_swig + DESTINATION ${GR_PYTHON_DIR}/gnuradio/filter + COMPONENT "filter_python" +) + +install( + FILES + filter_swig.i + ${CMAKE_CURRENT_BINARY_DIR}/gr_filter_swig_doc.i + DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig + COMPONENT "filter_swig" +) diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i new file mode 100644 index 000000000..55ee3c56c --- /dev/null +++ b/gr-filter/swig/filter_swig.i @@ -0,0 +1,36 @@ +/* -*- c++ -*- */ +/* + * 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. + */ + +#define FILTER_API + +%include "gnuradio.i" + +//load generated python docstrings +%include "gr_filter_swig_doc.i" + +%{ +#include "filter/fir_filter_fff.h" +%} + +%include "filter/fir_filter_fff.h" + +GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fff); -- cgit From 32f807a8c8f1bcadfd8f8ad4c5a46c1b099f8c8f Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Wed, 2 May 2012 16:14:09 -0400 Subject: filter: Reworking filter to have a set of basic implementation classes for filters of different kinds. The GR blocks are templated now and call from fir_filters for the volk-specific implemenation. Note the modification to build_utils.py to accomodate these changes. --- gr-filter/swig/CMakeLists.txt | 2 +- gr-filter/swig/filter_swig.i | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/CMakeLists.txt b/gr-filter/swig/CMakeLists.txt index 5dff9f631..3eee3a1ee 100644 --- a/gr-filter/swig/CMakeLists.txt +++ b/gr-filter/swig/CMakeLists.txt @@ -24,7 +24,7 @@ include(GrPython) include(GrSwig) set(GR_SWIG_INCLUDE_DIRS - ${FILTER_INCLUDE_DIRS} + ${GR_FILTER_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ${FFT_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 55ee3c56c..28268528a 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -29,8 +29,14 @@ %{ #include "filter/fir_filter_fff.h" +#include "filter/fir_filter_ccf.h" +#include "filter/fir_filter_ccc.h" %} %include "filter/fir_filter_fff.h" +%include "filter/fir_filter_ccf.h" +%include "filter/fir_filter_ccc.h" GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fff); +GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccf); +GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccc); -- cgit From 26531c2da601a1c21c50e3644350c604c27f8658 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Wed, 2 May 2012 18:59:23 -0400 Subject: filter: fixed FIR filter taps and added complex FFT filter. --- gr-filter/swig/filter_swig.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 28268528a..94ad9cd64 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -31,12 +31,15 @@ #include "filter/fir_filter_fff.h" #include "filter/fir_filter_ccf.h" #include "filter/fir_filter_ccc.h" +#include "filter/fft_filter_ccc.h" %} %include "filter/fir_filter_fff.h" %include "filter/fir_filter_ccf.h" %include "filter/fir_filter_ccc.h" +%include "filter/fft_filter_ccc.h" GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccf); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccc); +GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_ccc); -- cgit From b63e3b8a6923cf358d42064dca16d262a33c2918 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Wed, 2 May 2012 19:59:43 -0400 Subject: filter: adding fff version of FFT filter. --- gr-filter/swig/filter_swig.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 94ad9cd64..6010455b7 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -32,14 +32,17 @@ #include "filter/fir_filter_ccf.h" #include "filter/fir_filter_ccc.h" #include "filter/fft_filter_ccc.h" +#include "filter/fft_filter_fff.h" %} %include "filter/fir_filter_fff.h" %include "filter/fir_filter_ccf.h" %include "filter/fir_filter_ccc.h" %include "filter/fft_filter_ccc.h" +%include "filter/fft_filter_fff.h" GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccf); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_ccc); +GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_fff); -- cgit From 906fe742d1c6a6ca93b47261b0ee615d4779081b Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 5 May 2012 13:34:56 -0400 Subject: filter: added firdes for generating FIR filters to gr-filter. Addes QA code in both Python and C++. --- gr-filter/swig/filter_swig.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 6010455b7..a44131931 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -28,6 +28,7 @@ %include "gr_filter_swig_doc.i" %{ +#include "filter/firdes.h" #include "filter/fir_filter_fff.h" #include "filter/fir_filter_ccf.h" #include "filter/fir_filter_ccc.h" @@ -35,6 +36,7 @@ #include "filter/fft_filter_fff.h" %} +%include "filter/firdes.h" %include "filter/fir_filter_fff.h" %include "filter/fir_filter_ccf.h" %include "filter/fir_filter_ccc.h" -- cgit From e832b09166547e380972f48b2317d96a25d3d0e5 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 5 May 2012 14:41:03 -0400 Subject: filter: added Parks-McClellen algorithm. Renamed gr_remez to pm_remez here. Added QA code and fixed coding style. --- gr-filter/swig/filter_swig.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index a44131931..fd9aaff68 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -29,6 +29,7 @@ %{ #include "filter/firdes.h" +#include "filter/pm_remez.h" #include "filter/fir_filter_fff.h" #include "filter/fir_filter_ccf.h" #include "filter/fir_filter_ccc.h" @@ -37,6 +38,7 @@ %} %include "filter/firdes.h" +%include "filter/pm_remez.h" %include "filter/fir_filter_fff.h" %include "filter/fir_filter_ccf.h" %include "filter/fir_filter_ccc.h" -- 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/swig/filter_swig.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index fd9aaff68..558565fc4 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -35,6 +35,7 @@ #include "filter/fir_filter_ccc.h" #include "filter/fft_filter_ccc.h" #include "filter/fft_filter_fff.h" +#include "filter/hilbert_fc.h" %} %include "filter/firdes.h" @@ -44,9 +45,11 @@ %include "filter/fir_filter_ccc.h" %include "filter/fft_filter_ccc.h" %include "filter/fft_filter_fff.h" +%include "filter/hilbert_fc.h" GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccf); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_fff); +GR_SWIG_BLOCK_MAGIC2(filter, hilbert_fc); -- 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/swig/filter_swig.i | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 558565fc4..3eba5f4c8 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -30,6 +30,8 @@ %{ #include "filter/firdes.h" #include "filter/pm_remez.h" +#include "filter/dc_blocker_cc.h" +#include "filter/dc_blocker_ff.h" #include "filter/fir_filter_fff.h" #include "filter/fir_filter_ccf.h" #include "filter/fir_filter_ccc.h" @@ -40,6 +42,8 @@ %include "filter/firdes.h" %include "filter/pm_remez.h" +%include "filter/dc_blocker_cc.h" +%include "filter/dc_blocker_ff.h" %include "filter/fir_filter_fff.h" %include "filter/fir_filter_ccf.h" %include "filter/fir_filter_ccc.h" @@ -47,6 +51,8 @@ %include "filter/fft_filter_fff.h" %include "filter/hilbert_fc.h" +GR_SWIG_BLOCK_MAGIC2(filter, dc_blocker_cc); +GR_SWIG_BLOCK_MAGIC2(filter, dc_blocker_ff); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccf); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccc); -- 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/swig/filter_swig.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 3eba5f4c8..4f0caa59c 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -32,6 +32,7 @@ #include "filter/pm_remez.h" #include "filter/dc_blocker_cc.h" #include "filter/dc_blocker_ff.h" +#include "filter/filter_delay_fc.h" #include "filter/fir_filter_fff.h" #include "filter/fir_filter_ccf.h" #include "filter/fir_filter_ccc.h" @@ -44,6 +45,7 @@ %include "filter/pm_remez.h" %include "filter/dc_blocker_cc.h" %include "filter/dc_blocker_ff.h" +%include "filter/filter_delay_fc.h" %include "filter/fir_filter_fff.h" %include "filter/fir_filter_ccf.h" %include "filter/fir_filter_ccc.h" @@ -53,6 +55,7 @@ GR_SWIG_BLOCK_MAGIC2(filter, dc_blocker_cc); GR_SWIG_BLOCK_MAGIC2(filter, dc_blocker_ff); +GR_SWIG_BLOCK_MAGIC2(filter, filter_delay_fc); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccf); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccc); -- 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/swig/filter_swig.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 4f0caa59c..cc15b5722 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -39,6 +39,7 @@ #include "filter/fft_filter_ccc.h" #include "filter/fft_filter_fff.h" #include "filter/hilbert_fc.h" +#include "filter/pfb_channelizer_ccf.h" %} %include "filter/firdes.h" @@ -52,6 +53,7 @@ %include "filter/fft_filter_ccc.h" %include "filter/fft_filter_fff.h" %include "filter/hilbert_fc.h" +%include "filter/pfb_channelizer_ccf.h" GR_SWIG_BLOCK_MAGIC2(filter, dc_blocker_cc); GR_SWIG_BLOCK_MAGIC2(filter, dc_blocker_ff); @@ -62,3 +64,4 @@ GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, hilbert_fc); +GR_SWIG_BLOCK_MAGIC2(filter, pfb_channelizer_ccf); -- cgit From 5585c71229cfa7886e0bd090828cd1f5104f6b27 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 15 Jun 2012 08:43:20 -0400 Subject: filter: adding ssc and fsf versions of filter with associated new Volk kernels. These routines work and pass QA. They could use some performance work. the FSF is just slightly slower than before; the SCC version is more noticably slower. Both could benefit, probably, by using SSE2 intrinsics to handle the shorts. --- gr-filter/swig/filter_swig.i | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index cc15b5722..c9de3fb9a 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -36,6 +36,8 @@ #include "filter/fir_filter_fff.h" #include "filter/fir_filter_ccf.h" #include "filter/fir_filter_ccc.h" +#include "filter/fir_filter_scc.h" +#include "filter/fir_filter_fsf.h" #include "filter/fft_filter_ccc.h" #include "filter/fft_filter_fff.h" #include "filter/hilbert_fc.h" @@ -50,6 +52,8 @@ %include "filter/fir_filter_fff.h" %include "filter/fir_filter_ccf.h" %include "filter/fir_filter_ccc.h" +%include "filter/fir_filter_scc.h" +%include "filter/fir_filter_fsf.h" %include "filter/fft_filter_ccc.h" %include "filter/fft_filter_fff.h" %include "filter/hilbert_fc.h" @@ -61,6 +65,8 @@ GR_SWIG_BLOCK_MAGIC2(filter, filter_delay_fc); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccf); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccc); +GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_scc); +GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fsf); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, hilbert_fc); -- cgit From 05c117f359b831513bbf6c4f43dca9cb181e5920 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 15 Jun 2012 11:53:58 -0400 Subject: filter: updating adaptive FIR filters. No need for our own adaptive_fir class; can do everything with fir_filter. With QA code. --- gr-filter/swig/filter_swig.i | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index c9de3fb9a..1bcafeb8c 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -30,6 +30,8 @@ %{ #include "filter/firdes.h" #include "filter/pm_remez.h" +#include "filter/adaptive_fir_ccc.h" +#include "filter/adaptive_fir_ccf.h" #include "filter/dc_blocker_cc.h" #include "filter/dc_blocker_ff.h" #include "filter/filter_delay_fc.h" @@ -46,6 +48,8 @@ %include "filter/firdes.h" %include "filter/pm_remez.h" +%include "filter/adaptive_fir_ccc.h" +%include "filter/adaptive_fir_ccf.h" %include "filter/dc_blocker_cc.h" %include "filter/dc_blocker_ff.h" %include "filter/filter_delay_fc.h" @@ -59,6 +63,8 @@ %include "filter/hilbert_fc.h" %include "filter/pfb_channelizer_ccf.h" +GR_SWIG_BLOCK_MAGIC2(filter, adaptive_fir_ccc); +GR_SWIG_BLOCK_MAGIC2(filter, adaptive_fir_ccf); GR_SWIG_BLOCK_MAGIC2(filter, dc_blocker_cc); GR_SWIG_BLOCK_MAGIC2(filter, dc_blocker_ff); GR_SWIG_BLOCK_MAGIC2(filter, filter_delay_fc); -- 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/swig/filter_swig.i | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 1bcafeb8c..8585bda32 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -44,6 +44,8 @@ #include "filter/fft_filter_fff.h" #include "filter/hilbert_fc.h" #include "filter/pfb_channelizer_ccf.h" +#include "filter/single_pole_iir_filter_cc.h" +#include "filter/single_pole_iir_filter_ff.h" %} %include "filter/firdes.h" @@ -62,6 +64,8 @@ %include "filter/fft_filter_fff.h" %include "filter/hilbert_fc.h" %include "filter/pfb_channelizer_ccf.h" +%include "filter/single_pole_iir_filter_cc.h" +%include "filter/single_pole_iir_filter_ff.h" GR_SWIG_BLOCK_MAGIC2(filter, adaptive_fir_ccc); GR_SWIG_BLOCK_MAGIC2(filter, adaptive_fir_ccf); @@ -77,3 +81,5 @@ GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, hilbert_fc); GR_SWIG_BLOCK_MAGIC2(filter, pfb_channelizer_ccf); +GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_cc); +GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_ff); -- 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/swig/filter_swig.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 8585bda32..be5338f4b 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -43,6 +43,7 @@ #include "filter/fft_filter_ccc.h" #include "filter/fft_filter_fff.h" #include "filter/hilbert_fc.h" +#include "filter/iir_filter_ffd.h" #include "filter/pfb_channelizer_ccf.h" #include "filter/single_pole_iir_filter_cc.h" #include "filter/single_pole_iir_filter_ff.h" @@ -63,6 +64,7 @@ %include "filter/fft_filter_ccc.h" %include "filter/fft_filter_fff.h" %include "filter/hilbert_fc.h" +%include "filter/iir_filter_ffd.h" %include "filter/pfb_channelizer_ccf.h" %include "filter/single_pole_iir_filter_cc.h" %include "filter/single_pole_iir_filter_ff.h" @@ -80,6 +82,7 @@ GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fsf); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, hilbert_fc); +GR_SWIG_BLOCK_MAGIC2(filter, iir_filter_ffd); GR_SWIG_BLOCK_MAGIC2(filter, pfb_channelizer_ccf); GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_cc); GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_ff); -- 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/swig/filter_swig.i | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index be5338f4b..161fd4fe3 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -42,6 +42,12 @@ #include "filter/fir_filter_fsf.h" #include "filter/fft_filter_ccc.h" #include "filter/fft_filter_fff.h" +#include "filter/freq_xlating_fir_filter_ccc.h" +#include "filter/freq_xlating_fir_filter_ccf.h" +#include "filter/freq_xlating_fir_filter_fcc.h" +#include "filter/freq_xlating_fir_filter_fcf.h" +#include "filter/freq_xlating_fir_filter_scc.h" +#include "filter/freq_xlating_fir_filter_scf.h" #include "filter/hilbert_fc.h" #include "filter/iir_filter_ffd.h" #include "filter/pfb_channelizer_ccf.h" @@ -63,6 +69,12 @@ %include "filter/fir_filter_fsf.h" %include "filter/fft_filter_ccc.h" %include "filter/fft_filter_fff.h" +%include "filter/freq_xlating_fir_filter_ccc.h" +%include "filter/freq_xlating_fir_filter_ccf.h" +%include "filter/freq_xlating_fir_filter_fcc.h" +%include "filter/freq_xlating_fir_filter_fcf.h" +%include "filter/freq_xlating_fir_filter_scc.h" +%include "filter/freq_xlating_fir_filter_scf.h" %include "filter/hilbert_fc.h" %include "filter/iir_filter_ffd.h" %include "filter/pfb_channelizer_ccf.h" @@ -81,6 +93,12 @@ GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_scc); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fsf); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_fff); +GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_ccc); +GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_ccf); +GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_fcc); +GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_fcf); +GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_scc); +GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_scf); GR_SWIG_BLOCK_MAGIC2(filter, hilbert_fc); GR_SWIG_BLOCK_MAGIC2(filter, iir_filter_ffd); GR_SWIG_BLOCK_MAGIC2(filter, pfb_channelizer_ccf); -- 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/swig/filter_swig.i | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 161fd4fe3..33c52b7a4 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -42,6 +42,8 @@ #include "filter/fir_filter_fsf.h" #include "filter/fft_filter_ccc.h" #include "filter/fft_filter_fff.h" +#include "filter/fractional_interpolator_cc.h" +#include "filter/fractional_interpolator_ff.h" #include "filter/freq_xlating_fir_filter_ccc.h" #include "filter/freq_xlating_fir_filter_ccf.h" #include "filter/freq_xlating_fir_filter_fcc.h" @@ -69,6 +71,8 @@ %include "filter/fir_filter_fsf.h" %include "filter/fft_filter_ccc.h" %include "filter/fft_filter_fff.h" +%include "filter/fractional_interpolator_cc.h" +%include "filter/fractional_interpolator_ff.h" %include "filter/freq_xlating_fir_filter_ccc.h" %include "filter/freq_xlating_fir_filter_ccf.h" %include "filter/freq_xlating_fir_filter_fcc.h" @@ -93,6 +97,8 @@ GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_scc); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fsf); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_fff); +GR_SWIG_BLOCK_MAGIC2(filter, fractional_interpolator_cc); +GR_SWIG_BLOCK_MAGIC2(filter, fractional_interpolator_ff); GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_ccf); GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_fcc); -- 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/swig/filter_swig.i | 45 ++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 33c52b7a4..7a7f548a9 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -35,11 +35,12 @@ #include "filter/dc_blocker_cc.h" #include "filter/dc_blocker_ff.h" #include "filter/filter_delay_fc.h" -#include "filter/fir_filter_fff.h" -#include "filter/fir_filter_ccf.h" #include "filter/fir_filter_ccc.h" -#include "filter/fir_filter_scc.h" +#include "filter/fir_filter_ccf.h" +#include "filter/fir_filter_fcc.h" +#include "filter/fir_filter_fff.h" #include "filter/fir_filter_fsf.h" +#include "filter/fir_filter_scc.h" #include "filter/fft_filter_ccc.h" #include "filter/fft_filter_fff.h" #include "filter/fractional_interpolator_cc.h" @@ -48,10 +49,16 @@ #include "filter/freq_xlating_fir_filter_ccf.h" #include "filter/freq_xlating_fir_filter_fcc.h" #include "filter/freq_xlating_fir_filter_fcf.h" -#include "filter/freq_xlating_fir_filter_scc.h" #include "filter/freq_xlating_fir_filter_scf.h" +#include "filter/freq_xlating_fir_filter_scc.h" #include "filter/hilbert_fc.h" #include "filter/iir_filter_ffd.h" +#include "filter/interp_fir_filter_ccc.h" +#include "filter/interp_fir_filter_ccf.h" +#include "filter/interp_fir_filter_fcc.h" +#include "filter/interp_fir_filter_fff.h" +#include "filter/interp_fir_filter_fsf.h" +#include "filter/interp_fir_filter_scc.h" #include "filter/pfb_channelizer_ccf.h" #include "filter/single_pole_iir_filter_cc.h" #include "filter/single_pole_iir_filter_ff.h" @@ -64,11 +71,12 @@ %include "filter/dc_blocker_cc.h" %include "filter/dc_blocker_ff.h" %include "filter/filter_delay_fc.h" -%include "filter/fir_filter_fff.h" -%include "filter/fir_filter_ccf.h" %include "filter/fir_filter_ccc.h" -%include "filter/fir_filter_scc.h" +%include "filter/fir_filter_ccf.h" +%include "filter/fir_filter_fcc.h" +%include "filter/fir_filter_fff.h" %include "filter/fir_filter_fsf.h" +%include "filter/fir_filter_scc.h" %include "filter/fft_filter_ccc.h" %include "filter/fft_filter_fff.h" %include "filter/fractional_interpolator_cc.h" @@ -77,10 +85,16 @@ %include "filter/freq_xlating_fir_filter_ccf.h" %include "filter/freq_xlating_fir_filter_fcc.h" %include "filter/freq_xlating_fir_filter_fcf.h" -%include "filter/freq_xlating_fir_filter_scc.h" %include "filter/freq_xlating_fir_filter_scf.h" +%include "filter/freq_xlating_fir_filter_scc.h" %include "filter/hilbert_fc.h" %include "filter/iir_filter_ffd.h" +%include "filter/interp_fir_filter_ccc.h" +%include "filter/interp_fir_filter_ccf.h" +%include "filter/interp_fir_filter_fcc.h" +%include "filter/interp_fir_filter_fff.h" +%include "filter/interp_fir_filter_fsf.h" +%include "filter/interp_fir_filter_scc.h" %include "filter/pfb_channelizer_ccf.h" %include "filter/single_pole_iir_filter_cc.h" %include "filter/single_pole_iir_filter_ff.h" @@ -90,11 +104,12 @@ GR_SWIG_BLOCK_MAGIC2(filter, adaptive_fir_ccf); GR_SWIG_BLOCK_MAGIC2(filter, dc_blocker_cc); GR_SWIG_BLOCK_MAGIC2(filter, dc_blocker_ff); GR_SWIG_BLOCK_MAGIC2(filter, filter_delay_fc); -GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fff); -GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccf); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccc); -GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_scc); +GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccf); +GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fcc); +GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fsf); +GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_scc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, fractional_interpolator_cc); @@ -103,10 +118,16 @@ GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_ccf); GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_fcc); GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_fcf); -GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_scc); GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_scf); +GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_scc); GR_SWIG_BLOCK_MAGIC2(filter, hilbert_fc); GR_SWIG_BLOCK_MAGIC2(filter, iir_filter_ffd); +GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_ccc); +GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_ccf); +GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_fcc); +GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_fff); +GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_fsf); +GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_scc); GR_SWIG_BLOCK_MAGIC2(filter, pfb_channelizer_ccf); GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_cc); GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_ff); -- 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/swig/filter_swig.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 7a7f548a9..0f814f955 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -60,6 +60,7 @@ #include "filter/interp_fir_filter_fsf.h" #include "filter/interp_fir_filter_scc.h" #include "filter/pfb_channelizer_ccf.h" +#include "filter/pfb_decimator_ccf.h" #include "filter/single_pole_iir_filter_cc.h" #include "filter/single_pole_iir_filter_ff.h" %} @@ -96,6 +97,7 @@ %include "filter/interp_fir_filter_fsf.h" %include "filter/interp_fir_filter_scc.h" %include "filter/pfb_channelizer_ccf.h" +%include "filter/pfb_decimator_ccf.h" %include "filter/single_pole_iir_filter_cc.h" %include "filter/single_pole_iir_filter_ff.h" @@ -129,5 +131,6 @@ GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_fsf); GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_scc); GR_SWIG_BLOCK_MAGIC2(filter, pfb_channelizer_ccf); +GR_SWIG_BLOCK_MAGIC2(filter, pfb_decimator_ccf); GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_cc); GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_ff); -- 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/swig/filter_swig.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 0f814f955..cc2e51d96 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -61,6 +61,7 @@ #include "filter/interp_fir_filter_scc.h" #include "filter/pfb_channelizer_ccf.h" #include "filter/pfb_decimator_ccf.h" +#include "filter/pfb_interpolator_ccf.h" #include "filter/single_pole_iir_filter_cc.h" #include "filter/single_pole_iir_filter_ff.h" %} @@ -98,6 +99,7 @@ %include "filter/interp_fir_filter_scc.h" %include "filter/pfb_channelizer_ccf.h" %include "filter/pfb_decimator_ccf.h" +%include "filter/pfb_interpolator_ccf.h" %include "filter/single_pole_iir_filter_cc.h" %include "filter/single_pole_iir_filter_ff.h" @@ -132,5 +134,6 @@ GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_fsf); GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_scc); GR_SWIG_BLOCK_MAGIC2(filter, pfb_channelizer_ccf); GR_SWIG_BLOCK_MAGIC2(filter, pfb_decimator_ccf); +GR_SWIG_BLOCK_MAGIC2(filter, pfb_interpolator_ccf); GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_cc); GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_ff); -- 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/swig/filter_swig.i | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index cc2e51d96..b72a67f15 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -59,6 +59,8 @@ #include "filter/interp_fir_filter_fff.h" #include "filter/interp_fir_filter_fsf.h" #include "filter/interp_fir_filter_scc.h" +#include "filter/pfb_arb_resampler_ccf.h" +#include "filter/pfb_arb_resampler_fff.h" #include "filter/pfb_channelizer_ccf.h" #include "filter/pfb_decimator_ccf.h" #include "filter/pfb_interpolator_ccf.h" @@ -97,6 +99,8 @@ %include "filter/interp_fir_filter_fff.h" %include "filter/interp_fir_filter_fsf.h" %include "filter/interp_fir_filter_scc.h" +%include "filter/pfb_arb_resampler_ccf.h" +%include "filter/pfb_arb_resampler_fff.h" %include "filter/pfb_channelizer_ccf.h" %include "filter/pfb_decimator_ccf.h" %include "filter/pfb_interpolator_ccf.h" @@ -132,6 +136,8 @@ GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_fcc); GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_fff); GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_fsf); GR_SWIG_BLOCK_MAGIC2(filter, interp_fir_filter_scc); +GR_SWIG_BLOCK_MAGIC2(filter, pfb_arb_resampler_ccf); +GR_SWIG_BLOCK_MAGIC2(filter, pfb_arb_resampler_fff); GR_SWIG_BLOCK_MAGIC2(filter, pfb_channelizer_ccf); GR_SWIG_BLOCK_MAGIC2(filter, pfb_decimator_ccf); GR_SWIG_BLOCK_MAGIC2(filter, pfb_interpolator_ccf); -- 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/swig/filter_swig.i | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index b72a67f15..5a8ebf975 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -64,6 +64,12 @@ #include "filter/pfb_channelizer_ccf.h" #include "filter/pfb_decimator_ccf.h" #include "filter/pfb_interpolator_ccf.h" +#include "filter/rational_resampler_base_ccc.h" +#include "filter/rational_resampler_base_ccf.h" +#include "filter/rational_resampler_base_fcc.h" +#include "filter/rational_resampler_base_fff.h" +#include "filter/rational_resampler_base_fsf.h" +#include "filter/rational_resampler_base_scc.h" #include "filter/single_pole_iir_filter_cc.h" #include "filter/single_pole_iir_filter_ff.h" %} @@ -104,6 +110,12 @@ %include "filter/pfb_channelizer_ccf.h" %include "filter/pfb_decimator_ccf.h" %include "filter/pfb_interpolator_ccf.h" +%include "filter/rational_resampler_base_ccc.h" +%include "filter/rational_resampler_base_ccf.h" +%include "filter/rational_resampler_base_fcc.h" +%include "filter/rational_resampler_base_fff.h" +%include "filter/rational_resampler_base_fsf.h" +%include "filter/rational_resampler_base_scc.h" %include "filter/single_pole_iir_filter_cc.h" %include "filter/single_pole_iir_filter_ff.h" @@ -141,5 +153,11 @@ GR_SWIG_BLOCK_MAGIC2(filter, pfb_arb_resampler_fff); GR_SWIG_BLOCK_MAGIC2(filter, pfb_channelizer_ccf); GR_SWIG_BLOCK_MAGIC2(filter, pfb_decimator_ccf); GR_SWIG_BLOCK_MAGIC2(filter, pfb_interpolator_ccf); +GR_SWIG_BLOCK_MAGIC2(filter, rational_resampler_base_ccc); +GR_SWIG_BLOCK_MAGIC2(filter, rational_resampler_base_ccf); +GR_SWIG_BLOCK_MAGIC2(filter, rational_resampler_base_fcc); +GR_SWIG_BLOCK_MAGIC2(filter, rational_resampler_base_fff); +GR_SWIG_BLOCK_MAGIC2(filter, rational_resampler_base_fsf); +GR_SWIG_BLOCK_MAGIC2(filter, rational_resampler_base_scc); GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_cc); GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_ff); -- 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/swig/filter_swig.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 5a8ebf975..bb4eab381 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -64,6 +64,7 @@ #include "filter/pfb_channelizer_ccf.h" #include "filter/pfb_decimator_ccf.h" #include "filter/pfb_interpolator_ccf.h" +#include "filter/pfb_synthesizer_ccf.h" #include "filter/rational_resampler_base_ccc.h" #include "filter/rational_resampler_base_ccf.h" #include "filter/rational_resampler_base_fcc.h" @@ -110,6 +111,7 @@ %include "filter/pfb_channelizer_ccf.h" %include "filter/pfb_decimator_ccf.h" %include "filter/pfb_interpolator_ccf.h" +%include "filter/pfb_synthesizer_ccf.h" %include "filter/rational_resampler_base_ccc.h" %include "filter/rational_resampler_base_ccf.h" %include "filter/rational_resampler_base_fcc.h" @@ -153,6 +155,7 @@ GR_SWIG_BLOCK_MAGIC2(filter, pfb_arb_resampler_fff); GR_SWIG_BLOCK_MAGIC2(filter, pfb_channelizer_ccf); GR_SWIG_BLOCK_MAGIC2(filter, pfb_decimator_ccf); GR_SWIG_BLOCK_MAGIC2(filter, pfb_interpolator_ccf); +GR_SWIG_BLOCK_MAGIC2(filter, pfb_synthesizer_ccf); GR_SWIG_BLOCK_MAGIC2(filter, rational_resampler_base_ccc); GR_SWIG_BLOCK_MAGIC2(filter, rational_resampler_base_ccf); GR_SWIG_BLOCK_MAGIC2(filter, rational_resampler_base_fcc); -- 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/swig/filter_swig.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-filter/swig') diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index bb4eab381..05b84d4d6 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -73,6 +73,7 @@ #include "filter/rational_resampler_base_scc.h" #include "filter/single_pole_iir_filter_cc.h" #include "filter/single_pole_iir_filter_ff.h" +#include "filter/channel_model.h" %} %include "filter/firdes.h" @@ -120,6 +121,7 @@ %include "filter/rational_resampler_base_scc.h" %include "filter/single_pole_iir_filter_cc.h" %include "filter/single_pole_iir_filter_ff.h" +%include "filter/channel_model.h" GR_SWIG_BLOCK_MAGIC2(filter, adaptive_fir_ccc); GR_SWIG_BLOCK_MAGIC2(filter, adaptive_fir_ccf); @@ -164,3 +166,4 @@ GR_SWIG_BLOCK_MAGIC2(filter, rational_resampler_base_fsf); GR_SWIG_BLOCK_MAGIC2(filter, rational_resampler_base_scc); GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_cc); GR_SWIG_BLOCK_MAGIC2(filter, single_pole_iir_filter_ff); +GR_SWIG_BLOCK_MAGIC2(filter, channel_model); -- cgit