diff options
Diffstat (limited to 'gr-digital/python/qam.py')
| -rw-r--r-- | gr-digital/python/qam.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gr-digital/python/qam.py b/gr-digital/python/qam.py index a5a2e6c2c..5b1f7683b 100644 --- a/gr-digital/python/qam.py +++ b/gr-digital/python/qam.py @@ -29,7 +29,8 @@ from gnuradio import gr from generic_mod_demod import generic_mod, generic_demod from utils.gray_code import gray_code from utils import mod_codes -import modulation_utils2 +import modulation_utils +import digital_swig # Default number of points in constellation. _def_constellation_points = 16 @@ -164,7 +165,8 @@ def qam_constellation(constellation_points=_def_constellation_points, # No pre-diff code # Should add one so that we can gray-code the quadrant bits too. pre_diff_code = [] - constellation = gr.constellation_rect(points, pre_diff_code, 4, side, side, width, width) + constellation = digital_swig.constellation_rect(points, pre_diff_code, 4, + side, side, width, width) return constellation # ///////////////////////////////////////////////////////////////////////////// @@ -222,6 +224,6 @@ class qam_demod(generic_demod): # # Add these to the mod/demod registry # -modulation_utils2.add_type_1_mod('qam', qam_mod) -modulation_utils2.add_type_1_demod('qam', qam_demod) -modulation_utils2.add_type_1_constellation('qam', qam_constellation) +modulation_utils.add_type_1_mod('qam', qam_mod) +modulation_utils.add_type_1_demod('qam', qam_demod) +modulation_utils.add_type_1_constellation('qam', qam_constellation) |