[Commit-gnuradio] r3585 - in gnuradio/branches/developers/trondeau/digital-wip: gnuradio-core/src/lib/general gnuradio-core/src/python/gnuradio/blksimpl gnuradio-examples/python/gmsk2

[trondeau]

Author: trondeau
Date: 2006-09-19 11:02:56 -0600 (Tue, 19 Sep 2006)
New Revision: 3585

Modified:
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/psk.py
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-examples/python/gmsk2/transmit_path.py
Log:
dqpsk now working again (small bug); does not lock to first packet in --discon 
mode but gets rest; either in costas or M&M loop

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
      2006-09-19 06:39:37 UTC (rev 3584)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
      2006-09-19 17:02:56 UTC (rev 3585)
@@ -115,6 +115,10 @@
     }
 #endif
 
+#if 0
+    printf("%llx  ==>  %llx  :  d_flip=%u\n", d_access_code, d_data_reg, 
d_flip);
+#endif
+
     // shift in new data and new flag
     d_data_reg = (d_data_reg << 1) | (in[i] & 0x1);
     d_flag_reg = (d_flag_reg << 1);

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
       2006-09-19 06:39:37 UTC (rev 3584)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
       2006-09-19 17:02:56 UTC (rev 3585)
@@ -230,15 +230,15 @@
                                                     self._mu, self._gain_mu,
                                                     self._omega_relative_limit)
 
+        self.diffdec = gr.diff_phasor_cc()
+        #self.diffdec = gr.diff_decoder_bb(arity)
+
         # find closest constellation point
-        #rot = 1
-        rot = .707 + .707j
+        rot = 1
+        #rot = .707 + .707j
         rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
         print "rotated_const = %s" % rotated_const
 
-        self.diffdec = gr.diff_phasor_cc()
-        #self.diffdec = gr.diff_decoder_bb(arity)
-
         self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
         self.gray_decoder = gr.map_bb(psk.gray_to_binary[arity])
         
@@ -283,6 +283,8 @@
                          gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat"))
         self._fg.connect(self.clock_recovery,
                          gr.file_sink(gr.sizeof_gr_complex, 
"clock_recovery.dat"))
+        self._fg.connect((self.clock_recovery,1),
+                        gr.file_sink(gr.sizeof_gr_complex, 
"clock_recovery_error.dat"))
         self._fg.connect(self.diffdec,
                          gr.file_sink(gr.sizeof_gr_complex, "diffdec.dat"))    
    
         self._fg.connect(self.slicer,

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/psk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/psk.py
 2006-09-19 06:39:37 UTC (rev 3584)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/psk.py
 2006-09-19 17:02:56 UTC (rev 3585)
@@ -53,7 +53,7 @@
 # Don't Gray code
 # -----------------------
 # identity mapping
-binary_to_gray = {
+binary_to_ungray = {
     2 : (0, 1),
     4 : (0, 1, 2, 3),
     8 : (0, 1, 2, 3, 4, 5, 6, 7)

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-examples/python/gmsk2/transmit_path.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-examples/python/gmsk2/transmit_path.py
   2006-09-19 06:39:37 UTC (rev 3584)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-examples/python/gmsk2/transmit_path.py
   2006-09-19 17:02:56 UTC (rev 3585)
@@ -201,6 +201,7 @@
         Prints information about the transmit path
         """
         print "Using TX d'board %s"    % (self.subdev.side_and_name(),)
+        print "Tx amplitude     %s"    % (self._tx_amplitude)
         print "modulation:      %s"    % (self._modulator_class.__name__)
         print "bitrate:         %sb/s" % 
(eng_notation.num_to_str(self._bitrate))
         print "samples/symbol:  %3d"   % (self._samples_per_symbol)