diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-21 15:11:39 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-21 21:19:13 -0500 |
| commit | 55d3e4a47958be287648a2021f7e92d81086b2d9 (patch) | |
| tree | ae0195c457f2cf2734376679cc88c2d728040680 /gr-atsc | |
| parent | fa781237f341a74a243a9fb930daee7e62c3a682 (diff) | |
blocks: removes blocks moved to gr-blocks from gnuradio-core.
Also fixes up some other missing moves.
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-atsc/src/python/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | gr-atsc/src/python/fpll.py | 16 | ||||
| -rwxr-xr-x | gr-atsc/src/python/interp_short.py | 19 | ||||
| -rwxr-xr-x | gr-atsc/src/python/qa_atsc.py | 6 |
5 files changed, 26 insertions, 18 deletions
diff --git a/gr-atsc/CMakeLists.txt b/gr-atsc/CMakeLists.txt index c9a033fc1a..10a7904b20 100644 --- a/gr-atsc/CMakeLists.txt +++ b/gr-atsc/CMakeLists.txt @@ -30,6 +30,7 @@ GR_REGISTER_COMPONENT("gr-atsc" ENABLE_GR_ATSC Boost_FOUND ENABLE_GR_CORE ENABLE_GR_FFT + ENABLE_GR_BLOCKS ENABLE_GR_FILTER ENABLE_GR_ANALOG ) diff --git a/gr-atsc/src/python/CMakeLists.txt b/gr-atsc/src/python/CMakeLists.txt index b80ab2b181..aaa5bd93c4 100644 --- a/gr-atsc/src/python/CMakeLists.txt +++ b/gr-atsc/src/python/CMakeLists.txt @@ -46,6 +46,8 @@ if(ENABLE_TESTING) list(APPEND GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/gr-atsc/src/lib + ${CMAKE_BINARY_DIR}/gr-blocks/python + ${CMAKE_BINARY_DIR}/gr-blocks/swig ) list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-fec gnuradio-filter gnuradio-analog gnuradio-fft) diff --git a/gr-atsc/src/python/fpll.py b/gr-atsc/src/python/fpll.py index aed975557a..69749420b4 100755 --- a/gr-atsc/src/python/fpll.py +++ b/gr-atsc/src/python/fpll.py @@ -21,6 +21,8 @@ # from gnuradio import gr, atsc +from gnuradio import blocks +from gnuradio import filter import math, os def main(): @@ -38,7 +40,7 @@ def main(): # 1/2 as wide because we're designing lp filter symbol_rate = atsc.ATSC_SYMBOL_RATE/2. NTAPS = 279 - tt = gr.firdes.root_raised_cosine (1.0, input_rate, symbol_rate, .115, NTAPS) + tt = filter.firdes.root_raised_cosine (1.0, input_rate, symbol_rate, .115, NTAPS) # heterodyne the low pass coefficients up to the specified bandpass # center frequency. Note that when we do this, the filter bandwidth # is effectively twice the low pass (2.69 * 2 = 5.38) and hence @@ -47,7 +49,7 @@ def main(): t=[] for i in range(len(tt)): t += [tt[i] * 2. * math.cos(arg * i)] - rrc = gr.fir_filter_fff(1, t) + rrc = filter.fir_filter_fff(1, t) fpll = atsc.fpll() @@ -55,17 +57,17 @@ def main(): lower_edge = 6e6 - 0.31e6 upper_edge = IF_freq - 3e6 + pilot_freq transition_width = upper_edge - lower_edge - lp_coeffs = gr.firdes.low_pass (1.0, + lp_coeffs = filter.firdes.low_pass (1.0, input_rate, (lower_edge + upper_edge) * 0.5, transition_width, - gr.firdes.WIN_HAMMING); + filter.firdes.WIN_HAMMING); - lp_filter = gr.fir_filter_fff (1,lp_coeffs) + lp_filter = filter.fir_filter_fff (1,lp_coeffs) alpha = 1e-5 - iir = gr.single_pole_iir_filter_ff(alpha) - remove_dc = gr.sub_ff() + iir = filter.single_pole_iir_filter_ff(alpha) + remove_dc = blocks.sub_ff() out = gr.file_sink(gr.sizeof_float,"/tmp/atsc_pipe_3") # out = gr.file_sink(gr.sizeof_float,"/mnt/sata/atsc_data_float") diff --git a/gr-atsc/src/python/interp_short.py b/gr-atsc/src/python/interp_short.py index c5ea337f9a..749d15d0a7 100755 --- a/gr-atsc/src/python/interp_short.py +++ b/gr-atsc/src/python/interp_short.py @@ -33,6 +33,8 @@ # then at 0 with edges at -3.2MHz and 3.2MHz. from gnuradio import gr +from gnuradio import blocks +from gnuradio import filter import sys, os def graph (args): @@ -46,17 +48,18 @@ def graph (args): sys.stderr.write('usage: interp.py input_file\n') sys.exit (1) - tb = gr.top_block () + tb = gr.top_block() - srcf = gr.file_source (gr.sizeof_short,infile) - s2ss = gr.stream_to_streams(gr.sizeof_short,2) - s2f1 = gr.short_to_float() - s2f2 = gr.short_to_float() - src0 = gr.float_to_complex() + srcf = gr.file_source(gr.sizeof_short,infile) + s2ss = blocks.stream_to_streams(gr.sizeof_short,2) + s2f1 = blocks.short_to_float() + s2f2 = blocks.short_to_float() + src0 = blocks.float_to_complex() - lp_coeffs = gr.firdes.low_pass ( 3, 19.2e6, 3.2e6, .5e6, gr.firdes.WIN_HAMMING ) - lp = gr.interp_fir_filter_ccf ( 3, lp_coeffs ) + lp_coeffs = filter.firdes.low_pass(3, 19.2e6, 3.2e6, .5e6, + filter.firdes.WIN_HAMMING) + lp = filter.interp_fir_filter_ccf(3, lp_coeffs) file = gr.file_sink(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1") diff --git a/gr-atsc/src/python/qa_atsc.py b/gr-atsc/src/python/qa_atsc.py index ab3eb96d40..507bc8aa47 100755 --- a/gr-atsc/src/python/qa_atsc.py +++ b/gr-atsc/src/python/qa_atsc.py @@ -25,7 +25,7 @@ import atsc # qa code needs to run without being installed #from gnuradio import atsc from atsc_utils import * import sys - +import blocks_swig as blocks class memoize(object): def __init__(self, thunk): @@ -81,7 +81,7 @@ class vector_source_ts(gr.hier_block2): """ src = gr.vector_source_b(pad_transport_stream(ts)) - s2v = gr.stream_to_vector(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet) + s2v = blocks.stream_to_vector(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet) gr.hier_block2.__init__(self, "vector_source_ts", gr.io_signature(0, 0, 0), @@ -97,7 +97,7 @@ class vector_sink_ts(gr.hier_block2): """ """ - v2s = gr.vector_to_stream(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet) + v2s = blocks.vector_to_stream(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet) self.sink = gr.vector_sink_b() gr.hier_block2.__init__(self, "vector_sink_ts", v2s.input_signature(), |