From 2e7d6f638181231bad0a8fd2fa6fb72cf6ad1f7c Mon Sep 17 00:00:00 2001
From: Ben Reynwar <ben@reynwar.net>
Date: Mon, 31 Jan 2011 23:25:36 -0700
Subject: Added QPSK constellation object.
---
gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am | 1 +
gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'gnuradio-core/src/python')
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am b/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
index 2a7f591766..6a2e7d5f74 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
@@ -60,6 +60,7 @@ grblkspython_PYTHON = \
psk.py \
psk2.py \
qam.py \
+ qpsk.py \
rational_resampler.py \
standard_squelch.py \
stream_to_vector_decimator.py \
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py b/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
index 997df0bdf2..3b1cd12ac3 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
@@ -32,7 +32,7 @@ def _add_common_options(normal, expert):
Adds OFDM-specific options to the Options Parser that are common
both to the modulator and demodulator.
"""
- mods_list = ", ".join(modulation_utils2.type_1_mods().keys())
+ mods_list = ", ".join(modulation_utils2.type_1_constellations().keys())
normal.add_option("-m", "--modulation", type="string", default="psk",
help="set modulation type (" + mods_list + ") [default=%default]")
expert.add_option("", "--fft-length", type="intx", default=512,
@@ -248,8 +248,8 @@ class ofdm_demod(gr.hier_block2):
Adds OFDM-specific options to the Options Parser
"""
_add_common_options(normal, expert)
- for demod in modulation_utils2.type_1_demods().values():
- demod.add_options(expert)
+ for mod in modulation_utils2.type_1_mods().values():
+ mod.add_options(expert)
# Make a static method to call before instantiation
add_options = staticmethod(add_options)
--
cgit v1.2.3