diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-05-05 13:35:40 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-05-05 13:35:40 -0400 |
| commit | 77d5097c7df9494ee7e215d9dbf29d185ffbe5ed (patch) | |
| tree | 67032b42e66a40f1d2e5ebb1e83cd0d5ab30412a /gr-filter | |
| parent | 906fe742d1c6a6ca93b47261b0ee615d4779081b (diff) | |
filter: cleanup and moving calls from gr.firdes to filter.firdes.
Diffstat (limited to 'gr-filter')
| -rwxr-xr-x | gr-filter/examples/fft_filter_ccc.py | 6 | ||||
| -rwxr-xr-x | gr-filter/examples/fir_filter_ccc.py | 2 | ||||
| -rwxr-xr-x | gr-filter/examples/fir_filter_fff.py | 2 | ||||
| -rw-r--r-- | gr-filter/lib/fft_filter_ccc_impl.cc | 1 | ||||
| -rw-r--r-- | gr-filter/lib/fft_filter_fff_impl.cc | 1 |
5 files changed, 5 insertions, 7 deletions
diff --git a/gr-filter/examples/fft_filter_ccc.py b/gr-filter/examples/fft_filter_ccc.py index 0844c88efc..cc70e2b151 100755 --- a/gr-filter/examples/fft_filter_ccc.py +++ b/gr-filter/examples/fft_filter_ccc.py @@ -28,9 +28,9 @@ class example_fft_filter_ccc(gr.top_block): self._tw = tw self._at = atten self._decim = D - taps = gr.firdes.complex_band_pass_2(1, self._fs, - self._bw0, self._bw1, - self._tw, self._at) + taps = filter.firdes.complex_band_pass_2(1, self._fs, + self._bw0, self._bw1, + self._tw, self._at) print "Num. Taps: ", len(taps) self.src = gr.noise_source_c(gr.GR_GAUSSIAN, 1) diff --git a/gr-filter/examples/fir_filter_ccc.py b/gr-filter/examples/fir_filter_ccc.py index 57df868f7a..b5a461d2cf 100755 --- a/gr-filter/examples/fir_filter_ccc.py +++ b/gr-filter/examples/fir_filter_ccc.py @@ -27,7 +27,7 @@ class example_fir_filter_ccc(gr.top_block): self._tw = tw self._at = atten self._decim = D - taps = gr.firdes.low_pass_2(1, self._fs, self._bw, self._tw, self._at) + taps = filter.firdes.low_pass_2(1, self._fs, self._bw, self._tw, self._at) print "Num. Taps: ", len(taps) self.src = gr.noise_source_c(gr.GR_GAUSSIAN, 1) diff --git a/gr-filter/examples/fir_filter_fff.py b/gr-filter/examples/fir_filter_fff.py index 1ed889fcfc..983088622e 100755 --- a/gr-filter/examples/fir_filter_fff.py +++ b/gr-filter/examples/fir_filter_fff.py @@ -27,7 +27,7 @@ class example_fir_filter_fff(gr.top_block): self._tw = tw self._at = atten self._decim = D - taps = gr.firdes.low_pass_2(1, self._fs, self._bw, self._tw, self._at) + taps = filter.firdes.low_pass_2(1, self._fs, self._bw, self._tw, self._at) print "Num. Taps: ", len(taps) self.src = gr.noise_source_f(gr.GR_GAUSSIAN, 1) diff --git a/gr-filter/lib/fft_filter_ccc_impl.cc b/gr-filter/lib/fft_filter_ccc_impl.cc index 2721f128e7..0a20029917 100644 --- a/gr-filter/lib/fft_filter_ccc_impl.cc +++ b/gr-filter/lib/fft_filter_ccc_impl.cc @@ -30,7 +30,6 @@ #include <math.h> #include <assert.h> #include <stdexcept> -#include <gr_firdes.h> namespace gr { namespace filter { diff --git a/gr-filter/lib/fft_filter_fff_impl.cc b/gr-filter/lib/fft_filter_fff_impl.cc index 95b82aae57..1d6eb02db1 100644 --- a/gr-filter/lib/fft_filter_fff_impl.cc +++ b/gr-filter/lib/fft_filter_fff_impl.cc @@ -30,7 +30,6 @@ #include <math.h> #include <assert.h> #include <stdexcept> -#include <gr_firdes.h> namespace gr { namespace filter { |