diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-02 17:10:30 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-02 17:10:30 -0400 |
| commit | a6c837e184f4bbf6a0d5c15b8c9ca75294a64f0f (patch) | |
| tree | 00832d99906cd2559308e616790a6e689e99c0e1 /gr-digital/python/digital/psk_constellations.py | |
| parent | 0ae33fc67a7655b63a6384a1898319b7cc2c5bf6 (diff) | |
digital: fixed psk and qam constellation table generators. Not sure how these got out of sync.
Diffstat (limited to 'gr-digital/python/digital/psk_constellations.py')
| -rwxr-xr-x | gr-digital/python/digital/psk_constellations.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/gr-digital/python/digital/psk_constellations.py b/gr-digital/python/digital/psk_constellations.py index ee62c33a0c..3f28ca5843 100755 --- a/gr-digital/python/digital/psk_constellations.py +++ b/gr-digital/python/digital/psk_constellations.py @@ -1,24 +1,24 @@ #!/usr/bin/env python # # Copyright 2013 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -# +# import numpy from constellation_map_generator import * @@ -133,7 +133,7 @@ def psk_4_0x1_0_1(): ''' k = 0x1 pi = [0, 1] - return constellation_map_generator(psk_4, k, pi) + return constellation_map_generator(psk_4()[0], psk_4()[1], k, pi) psk_4_1 = psk_4_0x1_0_1 def psk_4_0x2_0_1(): @@ -144,7 +144,7 @@ def psk_4_0x2_0_1(): ''' k = 0x2 pi = [0, 1] - return constellation_map_generator(psk_4, k, pi) + return constellation_map_generator(psk_4()[0], psk_4()[1], k, pi) psk_4_2 = psk_4_0x2_0_1 def psk_4_0x3_0_1(): @@ -155,7 +155,7 @@ def psk_4_0x3_0_1(): ''' k = 0x3 pi = [0, 1] - return constellation_map_generator(psk_4, k, pi) + return constellation_map_generator(psk_4()[0], psk_4()[1], k, pi) psk_4_3 = psk_4_0x3_0_1 def psk_4_0x0_1_0(): @@ -166,7 +166,7 @@ def psk_4_0x0_1_0(): ''' k = 0x0 pi = [1, 0] - return constellation_map_generator(psk_4, k, pi) + return constellation_map_generator(psk_4()[0], psk_4()[1], k, pi) psk_4_4 = psk_4_0x0_1_0 def psk_4_0x1_1_0(): @@ -177,7 +177,7 @@ def psk_4_0x1_1_0(): ''' k = 0x1 pi = [1, 0] - return constellation_map_generator(psk_4, k, pi) + return constellation_map_generator(psk_4()[0], psk_4()[1], k, pi) psk_4_5 = psk_4_0x1_1_0 def psk_4_0x2_1_0(): @@ -188,7 +188,7 @@ def psk_4_0x2_1_0(): ''' k = 0x2 pi = [1, 0] - return constellation_map_generator(psk_4, k, pi) + return constellation_map_generator(psk_4()[0], psk_4()[1], k, pi) psk_4_6 = psk_4_0x2_1_0 def psk_4_0x3_1_0(): @@ -199,7 +199,7 @@ def psk_4_0x3_1_0(): ''' k = 0x3 pi = [1, 0] - return constellation_map_generator(psk_4, k, pi) + return constellation_map_generator(psk_4()[0], psk_4()[1], k, pi) psk_4_7 = psk_4_0x3_1_0 @@ -305,4 +305,3 @@ def sd_psk_4_0x3_1_0(x, Es=1): dist = Es*numpy.sqrt(2) return [-dist*x_re, -dist*x_im] sd_psk_4_7 = sd_psk_4_0x3_1_0 - |