Merge branch '8psk' into next

Conflicts: gr-msdd6000/src/Makefile.swig.gen
author: Tom Rondeau <trondeau@vt.edu> 2011-07-17 17:25:57 -0400
committer: Tom Rondeau <trondeau@vt.edu> 2011-07-17 17:25:57 -0400
commit: f7b9a0c6922c86cd54c1300ab45209d8e2db13df (patch)
tree: 5ede528cd302e85bc40edcad876525659f4e1ed2 /gnuradio-core/src/python
parent: caa4af889f54a696d3a533c77c5016df82f2987c (diff)
parent: 04409d2ba42ac5b372a7b6bb7e9c8de5722d76d7 (diff)
4 files changed, 87 insertions, 56 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py b/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
index 2663f7cf87..3b1cd12ac3 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
@@ -21,12 +21,26 @@
 # 
 
 import math
-from gnuradio import gr, ofdm_packet_utils
+from gnuradio import gr, ofdm_packet_utils, modulation_utils2
 import gnuradio.gr.gr_threading as _threading
 import psk, qam
 
 from gnuradio.blks2impl.ofdm_receiver import ofdm_receiver
 
+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_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,
+                      help="set the number of FFT bins [default=%default]")
+    expert.add_option("", "--occupied-tones", type="intx", default=200,
+                      help="set the number of occupied FFT bins [default=%default]")
+    expert.add_option("", "--cp-length", type="intx", default=128,
+                      help="set the number of bits in the cyclic prefix [default=%default]")
 
 # /////////////////////////////////////////////////////////////////////////////
 #                   mod/demod with packets as i/o
@@ -61,6 +75,8 @@ class ofdm_mod(gr.hier_block2):
         self._fft_length = options.fft_length
         self._occupied_tones = options.occupied_tones
         self._cp_length = options.cp_length
+        
+        arity = options.constellation_points
 
         win = [] #[1 for i in range(self._fft_length)]
 
@@ -82,19 +98,9 @@ class ofdm_mod(gr.hier_block2):
             
         symbol_length = options.fft_length + options.cp_length
         
-        mods = {"bpsk": 2, "qpsk": 4, "8psk": 8, "qam8": 8, "qam16": 16, "qam64": 64, "qam256": 256}
-        arity = mods[self._modulation]
-        
-        rot = 1
-        if self._modulation == "qpsk":
-            rot = (0.707+0.707j)
-            
-        if(self._modulation.find("psk") >= 0):
-            rotated_const = map(lambda pt: pt * rot, psk.gray_constellation[arity])
-        elif(self._modulation.find("qam") >= 0):
-            rotated_const = map(lambda pt: pt * rot, qam.constellation[arity])
-        #print rotated_const
-        self._pkt_input = gr.ofdm_mapper_bcv(rotated_const, msgq_limit,
+        const = modulation_utils2.type_1_constellations()[self._modulation](arity).points()
+
+        self._pkt_input = gr.ofdm_mapper_bcv(const, msgq_limit,
                                              options.occupied_tones, options.fft_length)
         
         self.preambles = gr.ofdm_insert_preamble(self._fft_length, padded_preambles)
@@ -140,14 +146,10 @@ class ofdm_mod(gr.hier_block2):
         """
         Adds OFDM-specific options to the Options Parser
         """
-        normal.add_option("-m", "--modulation", type="string", default="bpsk",
-                          help="set modulation type (bpsk, qpsk, 8psk, qam{16,64}) [default=%default]")
-        expert.add_option("", "--fft-length", type="intx", default=512,
-                          help="set the number of FFT bins [default=%default]")
-        expert.add_option("", "--occupied-tones", type="intx", default=200,
-                          help="set the number of occupied FFT bins [default=%default]")
-        expert.add_option("", "--cp-length", type="intx", default=128,
-                          help="set the number of bits in the cyclic prefix [default=%default]")
+        _add_common_options(normal, 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)
 
@@ -196,6 +198,9 @@ class ofdm_demod(gr.hier_block2):
         self._cp_length = options.cp_length
         self._snr = options.snr
 
+        arity = options.constellation_points
+        print("con points is %s" % options.constellation_points)
+        
         # Use freq domain to get doubled-up known symbol for correlation in time domain
         zeros_on_left = int(math.ceil((self._fft_length - self._occupied_tones)/2.0))
         ksfreq = known_symbols_4512_3[0:self._occupied_tones]
@@ -211,22 +216,11 @@ class ofdm_demod(gr.hier_block2):
                                        self._occupied_tones, self._snr, preambles,
                                        options.log)
 
-        mods = {"bpsk": 2, "qpsk": 4, "8psk": 8, "qam8": 8, "qam16": 16, "qam64": 64, "qam256": 256}
-        arity = mods[self._modulation]
-        
-        rot = 1
-        if self._modulation == "qpsk":
-            rot = (0.707+0.707j)
-
-        if(self._modulation.find("psk") >= 0):
-            rotated_const = map(lambda pt: pt * rot, psk.gray_constellation[arity])
-        elif(self._modulation.find("qam") >= 0):
-            rotated_const = map(lambda pt: pt * rot, qam.constellation[arity])
-        #print rotated_const
+        constell = modulation_utils2.type_1_constellations()[self._modulation](arity)
 
         phgain = 0.25
         frgain = phgain*phgain / 4.0
-        self.ofdm_demod = gr.ofdm_frame_sink(rotated_const, range(arity),
+        self.ofdm_demod = gr.ofdm_frame_sink2(constell.base(),
                                              self._rcvd_pktq,
                                              self._occupied_tones,
                                              phgain, frgain)
@@ -253,14 +247,9 @@ class ofdm_demod(gr.hier_block2):
         """
         Adds OFDM-specific options to the Options Parser
         """
-        normal.add_option("-m", "--modulation", type="string", default="bpsk",
-                          help="set modulation type (bpsk or qpsk) [default=%default]")
-        expert.add_option("", "--fft-length", type="intx", default=512,
-                          help="set the number of FFT bins [default=%default]")
-        expert.add_option("", "--occupied-tones", type="intx", default=200,
-                          help="set the number of occupied FFT bins [default=%default]")
-        expert.add_option("", "--cp-length", type="intx", default=128,
-                          help="set the number of bits in the cyclic prefix [default=%default]")
+        _add_common_options(normal, 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)
 
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/pkt.py b/gnuradio-core/src/python/gnuradio/blks2impl/pkt.py
index 908437ef2b..aa720d1a52 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/pkt.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/pkt.py
@@ -34,7 +34,8 @@ class mod_pkts(gr.hier_block2):
 
     Send packets by calling send_pkt
     """
-    def __init__(self, modulator, access_code=None, msgq_limit=2, pad_for_usrp=True, use_whitener_offset=False):
+    def __init__(self, modulator, access_code=None, msgq_limit=2, pad_for_usrp=True, use_whitener_offset=False,
+                 modulate=True):
         """
 	Hierarchical block for sending packets
 
@@ -49,13 +50,18 @@ class mod_pkts(gr.hier_block2):
         @type msgq_limit: int
         @param pad_for_usrp: If true, packets are padded such that they end up a multiple of 128 samples
         @param use_whitener_offset: If true, start of whitener XOR string is incremented each packet
+        @param modulate: If false, no modulation will be performed.
         
         See gmsk_mod for remaining parameters
         """
+        if modulate:
+            output_size = gr.sizeof_gr_complex
+        else:
+            output_size = gr.sizeof_char
 
 	gr.hier_block2.__init__(self, "mod_pkts",
 				gr.io_signature(0, 0, 0),                    # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
+				gr.io_signature(1, 1, output_size))          # Output signature
 
         self._modulator = modulator
         self._pad_for_usrp = pad_for_usrp
@@ -70,7 +76,10 @@ class mod_pkts(gr.hier_block2):
 
         # accepts messages from the outside world
         self._pkt_input = gr.message_source(gr.sizeof_char, msgq_limit)
-        self.connect(self._pkt_input, self._modulator, self)
+        if modulate:
+            self.connect(self._pkt_input, self._modulator, self)
+        else:
+            self.connect(self._pkt_input, self)
 
     def send_pkt(self, payload='', eof=False):
         """
@@ -106,13 +115,15 @@ class demod_pkts(gr.hier_block2):
     app via the callback.
     """
 
-    def __init__(self, demodulator, access_code=None, callback=None, threshold=-1):
+    def __init__(self, demodulator, access_code=None, callback=None, threshold=-1, demodulate=True):
         """
 	Hierarchical block for demodulating and deframing packets.
 
 	The input is the complex modulated signal at baseband.
         Demodulated packets are sent to the handler.
 
+        If demodulator is None it is assumed the input is already demodulated.
+
         @param demodulator: instance of demodulator class (gr_block or hier_block2)
         @type demodulator: complex baseband in
         @param access_code: AKA sync vector
@@ -123,9 +134,14 @@ class demod_pkts(gr.hier_block2):
         @type threshold: int
 	"""
 
+        if demodulator is not None:
+            input_size = gr.sizeof_gr_complex
+        else:
+            input_size = gr.sizeof_char
+
 	gr.hier_block2.__init__(self, "demod_pkts",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-				gr.io_signature(0, 0, 0))                    # Output signature
+				gr.io_signature(1, 1, input_size), # Input signature
+				gr.io_signature(0, 0, 0))          # Output signature
 
         self._demodulator = demodulator
         if access_code is None:
@@ -141,9 +157,13 @@ class demod_pkts(gr.hier_block2):
         self.correlator = gr.correlate_access_code_bb(access_code, threshold)
 
         self.framer_sink = gr.framer_sink_1(self._rcvd_pktq)
-        self.connect(self, self._demodulator, self.correlator, self.framer_sink)
+        if self._demodulator is not None:
+            self.connect(self, self._demodulator, self.correlator, self.framer_sink)
+        else:
+            self.connect(self, self.correlator, self.framer_sink)
         
-        self._watcher = _queue_watcher_thread(self._rcvd_pktq, callback)
+        if callback is not None:
+            self._watcher = _queue_watcher_thread(self._rcvd_pktq, callback)
 
 
 class _queue_watcher_thread(_threading.Thread):
diff --git a/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py b/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py
index ded77f5f31..c3dc5cf136 100644
--- a/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py
+++ b/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py
@@ -6,8 +6,6 @@ XML Test Runner for PyUnit
 # the Public Domain. With contributions by Paolo Borelli and others.
 # Added to GNU Radio Oct. 3, 2010
 
-from __future__ import with_statement
-
 __version__ = "0.1"
 
 import os.path
@@ -185,7 +183,9 @@ class XMLTestRunner(object):
         result = _XMLTestResult(classname)
         start_time = time.time()
 
-        with _fake_std_streams():
+        fss = _fake_std_streams()
+        fss.__enter__()
+        try:
             test(result)
             try:
                 out_s = sys.stdout.getvalue()
@@ -195,6 +195,8 @@ class XMLTestRunner(object):
                 err_s = sys.stderr.getvalue()
             except AttributeError:
                 err_s = ""
+        finally:
+            fss.__exit__(None, None, None)
 
         time_taken = time.time() - start_time
         result.print_report(stream, time_taken, out_s, err_s)
@@ -218,8 +220,8 @@ class _fake_std_streams(object):
     def __enter__(self):
         self._orig_stdout = sys.stdout
         self._orig_stderr = sys.stderr
-        sys.stdout = StringIO()
-        sys.stderr = StringIO()
+        #sys.stdout = StringIO()
+        #sys.stderr = StringIO()
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         sys.stdout = self._orig_stdout
diff --git a/gnuradio-core/src/python/gnuradio/modulation_utils2.py b/gnuradio-core/src/python/gnuradio/modulation_utils2.py
index c5dba3e791..f30055f4ac 100644
--- a/gnuradio-core/src/python/gnuradio/modulation_utils2.py
+++ b/gnuradio-core/src/python/gnuradio/modulation_utils2.py
@@ -47,6 +47,15 @@ def type_1_demods():
 def add_type_1_demod(name, demod_class):
     _type_1_demodulators[name] = demod_class
 
+# Also record the constellation making functions of the modulations
+_type_1_constellations = {}
+
+def type_1_constellations():
+    return _type_1_constellations
+
+def add_type_1_constellation(name, constellation):
+    _type_1_constellations[name] = constellation
+
 
 def extract_kwargs_from_options(function, excluded_args, options):
     """
@@ -79,3 +88,14 @@ def extract_kwargs_from_options(function, excluded_args, options):
             if getattr(options, kw) is not None:
                 d[kw] = getattr(options, kw)
     return d
+
+def extract_kwargs_from_options_for_class(cls, options):
+    """
+    Given command line options, create dictionary suitable for passing to __init__
+    """
+    d = extract_kwargs_from_options(
+        cls.__init__, ('self',), options)
+    for base in cls.__bases__:
+        if hasattr(base, 'extract_kwargs_from_options'):
+            d.update(base.extract_kwargs_from_options(options))
+    return d
author	Tom Rondeau <trondeau@vt.edu>	2011-07-17 17:25:57 -0400
committer	Tom Rondeau <trondeau@vt.edu>	2011-07-17 17:25:57 -0400
commit	f7b9a0c6922c86cd54c1300ab45209d8e2db13df (patch)
tree	5ede528cd302e85bc40edcad876525659f4e1ed2 /gnuradio-core/src/python
parent	caa4af889f54a696d3a533c77c5016df82f2987c (diff)
parent	04409d2ba42ac5b372a7b6bb7e9c8de5722d76d7 (diff)