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

[eb]

Author: eb
Date: 2006-09-25 16:51:51 -0600 (Mon, 25 Sep 2006)
New Revision: 3646

Modified:
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
Log:
Removed unneeded s/w agc from gmsk block.


Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
      2006-09-25 21:48:18 UTC (rev 3645)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
      2006-09-25 22:51:51 UTC (rev 3646)
@@ -210,12 +210,6 @@
 
        self._gain_omega = .25 * self._gain_mu * self._gain_mu        # 
critically damped
 
-        # Automatic gain control
-        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(1e-1, 1e-3, 1, 1, 1000)
-        self.agc = gr.feedforward_agc_cc(16, 1.0)
-
        # Demodulate FM
        sensitivity = (pi / 2) / samples_per_symbol
        self.fmdemod = gr.quadrature_demod_cf(1.0 / sensitivity)
@@ -236,8 +230,8 @@
             self._setup_logging()
 
        # Connect & Initialize base class
-       self._fg.connect(self.pre_scaler, self.agc, self.fmdemod, 
self.clock_recovery, self.slicer)
-       gr.hier_block.__init__(self, self._fg, self.pre_scaler, self.slicer)
+       self._fg.connect(self.fmdemod, self.clock_recovery, self.slicer)
+       gr.hier_block.__init__(self, self._fg, self.fmdemod, self.slicer)
 
     def samples_per_symbol(self):
         return self._samples_per_symbol
@@ -258,8 +252,6 @@
 
     def _setup_logging(self):
         print "Demodulation logging turned on."
-        self._fg.connect(self.agc,
-                        gr.file_sink(gr.sizeof_gr_complex, "agc.dat"))
         self._fg.connect(self.fmdemod,
                         gr.file_sink(gr.sizeof_float, "fmdemod.dat"))
         self._fg.connect(self.clock_recovery,