[Commit-gnuradio] r3649 - gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl

[trondeau]

Author: trondeau
Date: 2006-09-25 17:47:24 -0600 (Mon, 25 Sep 2006)
New Revision: 3649

Modified:
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
Log:
updated dqpsk and dbqpsk with stable agc_log gains

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
      2006-09-25 23:46:54 UTC (rev 3648)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
      2006-09-25 23:47:24 UTC (rev 3649)
@@ -238,13 +238,13 @@
         self.pre_scaler = gr.multiply_const_cc(scale)   # scale the signal 
from full-range to +-1
         #self.agc = gr.agc2_cc(6e-1, 6e-1, 1, 1, 1000)
         #self.agc = gr.feedforward_agc_cc(500, 1)
-        self.agc = gr.agc_log_cc(0.1, 1)
+        self.agc = gr.agc_log_cc(0.08, 1.0)
 
         # Costas loop (carrier tracking)
         # FIXME: need to decide how to handle this more generally; do we pull 
it from higher layer?
         costas_order = 2
         beta = .25 * self._costas_alpha * self._costas_alpha
-        self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.005, 
-0.005, costas_order)
+        self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.002, 
-0.002, costas_order)
 
         # RRC data filter
         ntaps = 11 * self._samples_per_symbol

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
      2006-09-25 23:46:54 UTC (rev 3648)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
      2006-09-25 23:47:24 UTC (rev 3649)
@@ -235,13 +235,13 @@
         scale = (1.0/16384.0)
         self.pre_scaler = gr.multiply_const_cc(scale)   # scale the signal 
from full-range to +-1
         #self.agc = gr.agc2_cc(6e-1, 6e-1, 1, 1, 1000)
-        self.agc = gr.agc_log_cc(0.1, 1)
+        self.agc = gr.agc_log_cc(0.08, 1)
        
         # Costas loop (carrier tracking)
         # FIXME: need to decide how to handle this more generally; do we pull 
it from higher layer?
         costas_order = 4
         beta = .25 * self._costas_alpha * self._costas_alpha
-        self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.1, 
-0.1, costas_order)
+        self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.002, 
-0.002, costas_order)
 
         # RRC data filter
         ntaps = 11 * samples_per_symbol
@@ -310,8 +310,12 @@
 
     def _setup_logging(self):
         print "Modulation logging turned on."
+        self._fg.connect(self.pre_scaler,
+                         gr.file_sink(gr.sizeof_gr_complex, "pre_scaler.dat"))
         self._fg.connect(self.agc,
                          gr.file_sink(gr.sizeof_gr_complex, "agc.dat"))
+        self._fg.connect((self.agc,1),
+                         gr.file_sink(gr.sizeof_gr_complex, "agc_err.dat"))
         self._fg.connect(self.costas_loop,
                          gr.file_sink(gr.sizeof_gr_complex, "costas_loop.dat"))
         self._fg.connect((self.costas_loop,1),