diff options
author | Tom Rondeau | 2011-07-21 23:34:37 -0400 |
---|---|---|
committer | Tom Rondeau | 2011-07-21 23:34:37 -0400 |
commit | be7f6400a03e0294aee51b084899b38ed0e83180 (patch) | |
tree | 5fa83a4bc41e8dac45e7bfb8415740ac1827a067 /gr-digital/python | |
parent | f7185e3468e7d24b8f726dd717157cf2fed4b19a (diff) | |
download | gnuradio-be7f6400a03e0294aee51b084899b38ed0e83180.tar.gz gnuradio-be7f6400a03e0294aee51b084899b38ed0e83180.tar.bz2 gnuradio-be7f6400a03e0294aee51b084899b38ed0e83180.zip |
digital: using new psk2 to build the constellation and no longer use blks2
Diffstat (limited to 'gr-digital/python')
-rwxr-xr-x | gr-digital/python/qa_costas_loop_cc.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-digital/python/qa_costas_loop_cc.py b/gr-digital/python/qa_costas_loop_cc.py index 368704093..ec338b49a 100755 --- a/gr-digital/python/qa_costas_loop_cc.py +++ b/gr-digital/python/qa_costas_loop_cc.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, blks2, gr_unittest -import digital_swig +from gnuradio import gr, gr_unittest +import digital_swig, psk2 import random, cmath class test_digital(gr_unittest.TestCase): @@ -130,9 +130,9 @@ class test_digital(gr_unittest.TestCase): self.test = digital_swig.costas_loop_cc(damp, natfreq, order) rot = cmath.exp(-cmath.pi/8.0j) # rotate to match Costas rotation - const = blks2.psk.make_constellation(order) + const = psk2.psk_constellation(order) data = [random.randint(0,7) for i in xrange(100)] - data = [2*rot*const[d] for d in data] + data = [2*rot*const.points()[d] for d in data] N = 40 # settling time expected_result = data[N:] |