[Commit-gnuradio] r3647 - gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl

[eb]

Author: eb
Date: 2006-09-25 17:03:46 -0600 (Mon, 25 Sep 2006)
New Revision: 3647

Modified:
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
Log:
added non-gray code to demodulators

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
     2006-09-25 22:51:51 UTC (rev 3646)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
     2006-09-25 23:03:46 UTC (rev 3647)
@@ -94,9 +94,9 @@
           gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
 
         if self._gray_code:
-            self.gray_coder = gr.map_bb(psk.binary_to_gray[arity])
+            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
         else:
-            self.gray_coder = gr.map_bb(psk.binary_to_ungray[arity])
+            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
 
         self.diffenc = gr.diff_encoder_bb(arity)
         
@@ -115,7 +115,7 @@
                                                    self.rrc_taps)
 
        # Connect
-        fg.connect(self.bytes2chunks, self.gray_coder, self.diffenc,
+        fg.connect(self.bytes2chunks, self.symbol_mapper, self.diffenc,
                    self.chunks2symbols, self.rrc_filter)
 
         if verbose:
@@ -163,7 +163,7 @@
         print "Modulation logging turned on."
         self._fg.connect(self.bytes2chunks,
                          gr.file_sink(gr.sizeof_char, "bytes2chunks.dat"))
-        self._fg.connect(self.gray_coder,
+        self._fg.connect(self.symbol_mapper,
                          gr.file_sink(gr.sizeof_char, "graycoder.dat"))
         self._fg.connect(self.diffenc,
                          gr.file_sink(gr.sizeof_char, "diffenc.dat"))
@@ -274,8 +274,10 @@
 
         self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
 
-        # FIXME should be conditional on self._gray 
-        self.gray_decoder = gr.map_bb(psk.gray_to_binary[arity])
+        if self._gray_code:
+            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
+        else:
+            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
         
         # unpack the k bit vector into a stream of bits
         self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
@@ -287,8 +289,10 @@
             self._setup_logging()
 
         # Connect and Initialize base class
-        self._fg.connect(self.pre_scaler, self.agc, self.costas_loop, 
self.rrc_filter, self.clock_recovery,
-                         self.diffdec, self.slicer, self.gray_decoder, 
self.unpack)
+        self._fg.connect(self.pre_scaler, self.agc, self.costas_loop,
+                         self.rrc_filter, self.clock_recovery, self.diffdec,
+                         self.slicer, self.symbol_mapper, self.unpack)
+
         gr.hier_block.__init__(self, self._fg, self.pre_scaler, self.unpack)
 
     def samples_per_symbol(self):

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
     2006-09-25 22:51:51 UTC (rev 3646)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
     2006-09-25 23:03:46 UTC (rev 3647)
@@ -94,9 +94,9 @@
           gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
 
         if self._gray_code:
-            self.gray_coder = gr.map_bb(psk.binary_to_gray[arity])
+            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
         else:
-            self.gray_coder = gr.map_bb(psk.binary_to_ungray[arity])
+            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
             
         self.diffenc = gr.diff_encoder_bb(arity)
 
@@ -121,7 +121,7 @@
             self._setup_logging()
             
        # Connect & Initialize base class
-        self._fg.connect(self.bytes2chunks, self.gray_coder, self.diffenc,
+        self._fg.connect(self.bytes2chunks, self.symbol_mapper, self.diffenc,
                          self.chunks2symbols, self.rrc_filter)
        gr.hier_block.__init__(self, self._fg, self.bytes2chunks, 
self.rrc_filter)
 
@@ -141,7 +141,7 @@
         print "Modulation logging turned on."
         self._fg.connect(self.bytes2chunks,
                          gr.file_sink(gr.sizeof_char, "bytes2chunks.dat"))
-        self._fg.connect(self.gray_coder,
+        self._fg.connect(self.symbol_mapper,
                          gr.file_sink(gr.sizeof_char, "graycoder.dat"))
         self._fg.connect(self.diffenc,
                          gr.file_sink(gr.sizeof_char, "diffenc.dat"))        
@@ -273,8 +273,11 @@
 
         self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
 
-        # FIXME  needs to be conditional on self._gray_code
-        self.gray_decoder = gr.map_bb(psk.gray_to_binary[arity])
+        if self._gray_code:
+            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
+        else:
+            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
+
         
         # unpack the k bit vector into a stream of bits
         self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
@@ -286,8 +289,10 @@
             self._setup_logging()
  
         # Connect & Initialize base class
-        self._fg.connect(self.pre_scaler, self.agc, self.costas_loop, 
self.rrc_filter, self.clock_recovery,
-                         self.diffdec, self.slicer, self.gray_decoder, 
self.unpack)
+        self._fg.connect(self.pre_scaler, self.agc, self.costas_loop,
+                         self.rrc_filter, self.clock_recovery,
+                         self.diffdec, self.slicer, self.symbol_mapper,
+                         self.unpack)
         gr.hier_block.__init__(self, self._fg, self.pre_scaler, self.unpack)
 
     def samples_per_symbol(self):
@@ -327,7 +332,7 @@
                          gr.file_sink(gr.sizeof_gr_complex, "diffdec.dat"))    
    
         self._fg.connect(self.slicer,
                          gr.file_sink(gr.sizeof_char, "slicer.dat"))
-        self._fg.connect(self.gray_decoder,
+        self._fg.connect(self.symbol_mapper,
                          gr.file_sink(gr.sizeof_char, "gray_decoder.dat"))
         self._fg.connect(self.unpack,
                          gr.file_sink(gr.sizeof_char, "unpack.dat"))