diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-07-12 23:02:47 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-07-12 23:06:08 -0400 |
| commit | 0b3d5b1a3238d9f72bcdef6aa3131776fb572175 (patch) | |
| tree | c7bc86c8097ebf8371a17d83002844feffd866bd /gr-digital/python/psk2.py | |
| parent | 54a1ae3aeea9709e436bb2fc69ae47aeffd1cb29 (diff) | |
fixing build for constellation code. Had to make some changes to the qa code to import the right stuff after being changed from sitting in gnuradio-core.
Diffstat (limited to 'gr-digital/python/psk2.py')
| -rw-r--r-- | gr-digital/python/psk2.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gr-digital/python/psk2.py b/gr-digital/python/psk2.py index 089af11dd0..6ab398e42c 100644 --- a/gr-digital/python/psk2.py +++ b/gr-digital/python/psk2.py @@ -27,8 +27,10 @@ from math import pi, log from cmath import exp from gnuradio import gr, modulation_utils2 -from gnuradio.digital.generic_mod_demod import generic_mod, generic_demod -from gnuradio.digital.utils import mod_codes, gray_code +import digital_swig +#from gnuradio.digital.generic_mod_demod import generic_mod, generic_demod +from utils import mod_codes, gray_code +from generic_mod_demod import generic_mod, generic_demod # Default number of points in constellation. _def_constellation_points = 4 @@ -65,7 +67,7 @@ def psk_constellation(m=_def_constellation_points, mod_code=_def_mod_code): if post_diff_code is not None: inverse_post_diff_code = mod_codes.invert_code(post_diff_code) points = [points[x] for x in inverse_post_diff_code] - constellation = gr.constellation_psk(points, pre_diff_code, m) + constellation = digital_swig.constellation_psk(points, pre_diff_code, m) return constellation # ///////////////////////////////////////////////////////////////////////////// |