From 83b45543ee5a5533b3a384a3eed2e5ca0047a70c Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Wed, 20 Feb 2013 12:21:29 -0500
Subject: digital: cleaning up conversion to 3.7 for simple_correlator.
blocks: same for count_bits.
---
gr-digital/python/qa_simple_correlator.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
(limited to 'gr-digital/python/qa_simple_correlator.py')
diff --git a/gr-digital/python/qa_simple_correlator.py b/gr-digital/python/qa_simple_correlator.py
index 124201a556..292dfd69fc 100755
--- a/gr-digital/python/qa_simple_correlator.py
+++ b/gr-digital/python/qa_simple_correlator.py
@@ -21,6 +21,8 @@
#
from gnuradio import gr, gr_unittest
+import blocks_swig as blocks
+import filter_swig as filter
import digital_swig as digital
class test_simple_correlator(gr_unittest.TestCase):
@@ -40,15 +42,15 @@ class test_simple_correlator(gr_unittest.TestCase):
# Filter taps to expand the data to oversample by 8
# Just using a RRC for some basic filter shape
- taps = gr.firdes.root_raised_cosine(8, 8, 1.0, 0.5, 21)
+ taps = filter.firdes.root_raised_cosine(8, 8, 1.0, 0.5, 21)
src = gr.vector_source_b(expected_result)
frame = digital.simple_framer(4)
unpack = gr.packed_to_unpacked_bb(1, gr.GR_MSB_FIRST)
- expand = gr.interp_fir_filter_fff(8, taps)
- b2f = gr.char_to_float()
- mult2 = gr.multiply_const_ff(2)
- sub1 = gr.add_const_ff(-1)
+ expand = filter.interp_fir_filter_fff(8, taps)
+ b2f = blocks.char_to_float()
+ mult2 = blocks.multiply_const_ff(2)
+ sub1 = blocks.add_const_ff(-1)
op = digital.simple_correlator(4)
dst = gr.vector_sink_b()
self.tb.connect(src, frame, unpack, b2f, mult2, sub1, expand)
--
cgit v1.2.3