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-vocoder/python | |
| parent | fa781237f341a74a243a9fb930daee7e62c3a682 (diff) | |
blocks: removes blocks moved to gr-blocks from gnuradio-core.
Also fixes up some other missing moves.
Diffstat (limited to 'gr-vocoder/python')
| -rw-r--r-- | gr-vocoder/python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-vocoder/python/cvsd.py | 13 | ||||
| -rwxr-xr-x | gr-vocoder/python/qa_cvsd_vocoder.py | 14 |
3 files changed, 19 insertions, 10 deletions
diff --git a/gr-vocoder/python/CMakeLists.txt b/gr-vocoder/python/CMakeLists.txt index 372dcec051..9fdc625280 100644 --- a/gr-vocoder/python/CMakeLists.txt +++ b/gr-vocoder/python/CMakeLists.txt @@ -36,6 +36,8 @@ GR_PYTHON_INSTALL( if(ENABLE_TESTING) list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-blocks/python + ${CMAKE_BINARY_DIR}/gr-blocks/swig ${CMAKE_BINARY_DIR}/gr-filter/python ${CMAKE_BINARY_DIR}/gr-filter/swig ${CMAKE_BINARY_DIR}/gr-analog/python diff --git a/gr-vocoder/python/cvsd.py b/gr-vocoder/python/cvsd.py index 0b38615f41..1c58c33076 100644 --- a/gr-vocoder/python/cvsd.py +++ b/gr-vocoder/python/cvsd.py @@ -28,6 +28,11 @@ try: except ImportError: import filter_swig as filter +try: + from gnuradio import blocks +except ImportError: + import blocks_swig as blocks + class cvsd_encode_fb(gr.hier_block2): ''' This is a wrapper for the CVSD encoder that performs interpolation and filtering @@ -51,10 +56,10 @@ class cvsd_encode_fb(gr.hier_block2): scale_factor = 32000.0 self.interp = resample - src_scale = gr.multiply_const_ff(scale_factor) + src_scale = blocks.multiply_const_ff(scale_factor) taps = filter.firdes.low_pass(self.interp, self.interp, bw, 2*bw) interp = filter.interp_fir_filter_fff(self.interp, taps) - f2s = gr.float_to_short() + f2s = blocks.float_to_short() enc = vocoder_swig.cvsd_encode_sb() self.connect(self, src_scale, interp, f2s, enc, self) @@ -83,9 +88,9 @@ class cvsd_decode_bf(gr.hier_block2): self.decim = resample dec = vocoder_swig.cvsd_decode_bs() - s2f = gr.short_to_float() + s2f = blocks.short_to_float() taps = filter.firdes.low_pass(1, 1, bw, 2*bw) decim = filter.fir_filter_fff(self.decim, taps) - sink_scale = gr.multiply_const_ff(1.0/scale_factor) + sink_scale = blocks.multiply_const_ff(1.0/scale_factor) self.connect(self, dec, s2f, decim, sink_scale, self) diff --git a/gr-vocoder/python/qa_cvsd_vocoder.py b/gr-vocoder/python/qa_cvsd_vocoder.py index fc7ba35249..579b019cc9 100755 --- a/gr-vocoder/python/qa_cvsd_vocoder.py +++ b/gr-vocoder/python/qa_cvsd_vocoder.py @@ -23,6 +23,8 @@ from gnuradio import gr, gr_unittest from vocoder_swig import * from cvsd import * +import blocks_swig as blocks +import filter_swig as filter class test_cvsd_vocoder (gr_unittest.TestCase): @@ -99,18 +101,18 @@ class test_cvsd_vocoder (gr_unittest.TestCase): # If we enable this, we can probably just create a sin with numpy. src = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 200, 1, 0) head = gr.head(gr.sizeof_float, 100) - src_scale = gr.multiply_const_ff(scale_factor) + src_scale = blocks.multiply_const_ff(scale_factor) - interp = blks2.rational_resampler_fff(8, 1) - f2s = gr.float_to_short () + interp = filter.rational_resampler_fff(8, 1) + f2s = blocks.float_to_short() enc = cvsd_vocoder.encode_sb() dec = cvsd_vocoder.decode_bs() - s2f = gr.short_to_float () - decim = blks2.rational_resampler_fff(1, 8) + s2f = blocks.short_to_float() + decim = filter.rational_resampler_fff(1, 8) - sink_scale = gr.multiply_const_ff(1.0/scale_factor) + sink_scale = blocks.multiply_const_ff(1.0/scale_factor) sink = gr.vector_sink_f() self.tb.connect(src, src_scale, interp, f2s, enc) |