diff options
| author | Josh Blum <josh@joshknows.com> | 2011-07-28 17:02:58 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-07-28 17:02:58 -0700 |
| commit | 8bc1c4dc5a8d31594e8768a10e05b4b0172e733e (patch) | |
| tree | fcb957028a108ca719a6cb879e7d62713b35ba1c /gr-digital/python/qa_costas_loop_cc.py | |
| parent | 8c824bf2e3e6758aff05ee4b5f4d3f106a13c672 (diff) | |
| parent | 8b3c4ccf922c602ae77dad7f3911b16bdd0112d3 (diff) | |
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
Conflicts:
gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.h
gnuradio-core/src/lib/general/gr_constellation_decoder_cb.h
gnuradio-core/src/lib/general/gr_costas_loop_cc.h
gnuradio-core/src/lib/general/gr_lms_dfe_cc.h
gnuradio-core/src/lib/general/gr_lms_dfe_ff.h
gr-digital/lib/Makefile.am
gr-digital/lib/digital_binary_slicer_fb.h
gr-digital/lib/digital_clock_recovery_mm_cc.h
gr-digital/lib/digital_clock_recovery_mm_ff.h
gr-digital/lib/digital_correlate_access_code_bb.h
gr-digital/lib/digital_crc32.h
gr-digital/lib/digital_mpsk_receiver_cc.h
gr-digital/python/Makefile.am
gr-digital/python/__init__.py
gr-digital/python/generic_mod_demod.py
gr-digital/python/pkt.py
gr-digital/python/psk2.py
gr-digital/python/qam.py
Diffstat (limited to 'gr-digital/python/qa_costas_loop_cc.py')
| -rwxr-xr-x | gr-digital/python/qa_costas_loop_cc.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gr-digital/python/qa_costas_loop_cc.py b/gr-digital/python/qa_costas_loop_cc.py index 368704093b..3f5eaa141b 100755 --- a/gr-digital/python/qa_costas_loop_cc.py +++ b/gr-digital/python/qa_costas_loop_cc.py @@ -20,11 +20,11 @@ # 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): +class test_costas_loop_cc(gr_unittest.TestCase): def setUp (self): self.tb = gr.top_block () @@ -34,8 +34,8 @@ class test_digital(gr_unittest.TestCase): def test01 (self): # test basic functionality by setting all gains to 0 - damp = 0.4 - natfreq = 0.25 + damp = 0.0 + natfreq = 0.0 order = 2 self.test = digital_swig.costas_loop_cc(damp, natfreq, order) @@ -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:] @@ -153,4 +153,4 @@ class test_digital(gr_unittest.TestCase): self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 2) if __name__ == '__main__': - gr_unittest.run(test_digital, "test_digital.xml") + gr_unittest.run(test_costas_loop_cc, "test_costas_loop_cc.xml") |