diff options
Diffstat (limited to 'gr-digital/python/ofdm.py')
| -rw-r--r-- | gr-digital/python/ofdm.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gr-digital/python/ofdm.py b/gr-digital/python/ofdm.py index c7654f0de1..9f57920efc 100644 --- a/gr-digital/python/ofdm.py +++ b/gr-digital/python/ofdm.py @@ -89,10 +89,13 @@ class ofdm_mod(gr.hier_block2): if self._modulation == "qpsk": rot = (0.707+0.707j) + # FIXME: pass the constellation objects instead of just the points if(self._modulation.find("psk") >= 0): - rotated_const = map(lambda pt: pt * rot, psk.gray_constellation[arity]) + constel = psk.psk_constellation(arity) + rotated_const = map(lambda pt: pt * rot, constel.points()) elif(self._modulation.find("qam") >= 0): - rotated_const = map(lambda pt: pt * rot, qam.constellation[arity]) + constel = qam.qam_constellation(arity) + rotated_const = map(lambda pt: pt * rot, constel.points()) #print rotated_const self._pkt_input = digital_swig.ofdm_mapper_bcv(rotated_const, msgq_limit, @@ -226,10 +229,13 @@ class ofdm_demod(gr.hier_block2): if self._modulation == "qpsk": rot = (0.707+0.707j) + # FIXME: pass the constellation objects instead of just the points if(self._modulation.find("psk") >= 0): - rotated_const = map(lambda pt: pt * rot, psk.gray_constellation[arity]) + constel = psk.psk_constellation(arity) + rotated_const = map(lambda pt: pt * rot, constel.points()) elif(self._modulation.find("qam") >= 0): - rotated_const = map(lambda pt: pt * rot, qam.constellation[arity]) + constel = qam.qam_constellation(arity) + rotated_const = map(lambda pt: pt * rot, constel.points()) #print rotated_const phgain = 0.25 |