diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-06 15:37:15 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-06 15:46:00 -0500 |
| commit | 9ac143a654bc581d9a74363fc02e1ad30be93138 (patch) | |
| tree | 537c7d57f2dd2f676011099429383b000af752ab /gr-atsc | |
| parent | cf2c954ba4fc54909515f8550fd55741c9603a11 (diff) | |
core: cleaning up remez and firdes in gnuradio-core; now in gr-filter.
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/src/lib/atsci_root_raised_cosine.cc | 4 | ||||
| -rwxr-xr-x | gr-atsc/src/python/interp.py | 23 |
2 files changed, 14 insertions, 13 deletions
diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine.cc b/gr-atsc/src/lib/atsci_root_raised_cosine.cc index f555d90ac6..3323ca89ea 100644 --- a/gr-atsc/src/lib/atsci_root_raised_cosine.cc +++ b/gr-atsc/src/lib/atsci_root_raised_cosine.cc @@ -22,7 +22,7 @@ #include <atsc_consts.h> #include <atsci_root_raised_cosine.h> -#include <gr_firdes.h> +#include <filter/firdes.h> vector<float> atsc_root_raised_cosine::taps (double sampling_rate) @@ -32,5 +32,5 @@ atsc_root_raised_cosine::taps (double sampling_rate) // static const int NTAPS = 745; // better number static const int NTAPS = 279; // better number - return gr_firdes::root_raised_cosine (1.0, sampling_rate, symbol_rate, .115, NTAPS); + return gr::filter::firdes::root_raised_cosine(1.0, sampling_rate, symbol_rate, .115, NTAPS); } diff --git a/gr-atsc/src/python/interp.py b/gr-atsc/src/python/interp.py index 8a3cc8d4c5..39e1caea0d 100755 --- a/gr-atsc/src/python/interp.py +++ b/gr-atsc/src/python/interp.py @@ -34,31 +34,32 @@ from gnuradio import gr import sys -def graph (args): +def graph(args): - nargs = len (args) + nargs = len(args) if nargs == 1: infile = args[0] else: sys.stderr.write('usage: interp.py input_file\n') - sys.exit (1) + sys.exit(1) - tb = gr.top_block () + tb = gr.top_block() - src0 = gr.file_source (gr.sizeof_gr_complex,infile) + src0 = gr.file_source(gr.sizeof_gr_complex, infile) - lp_coeffs = gr.firdes.low_pass ( 3, 19.2e6, 3.2e6, .5e6, gr.firdes.WIN_HAMMING ) - lp = gr.interp_fir_filter_ccf ( 1, lp_coeffs ) + lp_coeffs = filter.firdes.low_pass(3, 19.2e6, 3.2e6, .5e6, + filter.firdes.WIN_HAMMING ) + lp = filter.interp_fir_filter_ccf(1, lp_coeffs) - file = gr.file_sink(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1") + file = gr.file_sink(gr.sizeof_gr_complex, "/tmp/atsc_pipe_1") - tb.connect( src0, lp, file ) + tb.connect(src0, lp, file) tb.start() - raw_input ('Head End: Press Enter to stop') + raw_input('Head End: Press Enter to stop') tb.stop() if __name__ == '__main__': - graph (sys.argv[1:]) + graph(sys.argv[1:]) |