[Commit-gnuradio] gnuradio-core ChangeLog src/python/gnuradio/pac...

[Thomas W. Rondeau]

CVSROOT:        /sources/gnuradio
Module name:    gnuradio-core
Changes by:     Thomas W. Rondeau <trondeau1122>        06/07/07 15:33:06

Modified files:
        .              : ChangeLog 
        src/python/gnuradio: packet_utils.py 
        src/python/gnuradio/blksimpl: gmsk2.py 

Log message:
        removed assert on bits per baud for qpsk in packet_utils.py

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/ChangeLog?cvsroot=gnuradio&r1=1.243&r2=1.244
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/python/gnuradio/packet_utils.py?cvsroot=gnuradio&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/python/gnuradio/blksimpl/gmsk2.py?cvsroot=gnuradio&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/ChangeLog,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -b -r1.243 -r1.244
--- ChangeLog   7 Jul 2006 00:51:42 -0000       1.243
+++ ChangeLog   7 Jul 2006 15:33:06 -0000       1.244
@@ -1,5 +1,11 @@
 2006-07-06  Tom Rondeau  <address@hidden>
 
+       * src/python/gnuradio/blksimpl/gmsk2.py:
+       Added AGC to GMSK code.
+       
+
+2006-07-06  Tom Rondeau  <address@hidden>
+
        * src/python/gnuradio/blksimpl/Makefile.am: 
        Call to gmsk.py was causing error after removal of gmsk.py file.
        Removed call in Makefile.am to this.

Index: src/python/gnuradio/packet_utils.py
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/python/gnuradio/packet_utils.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/python/gnuradio/packet_utils.py 28 Jun 2006 21:38:01 -0000      1.10
+++ src/python/gnuradio/packet_utils.py 7 Jul 2006 15:33:06 -0000       1.11
@@ -114,9 +114,6 @@
     if not is_1_0_string(access_code):
         raise ValueError, "access_code must be a string containing only 0's 
and 1's (%r)" % (access_code,)
 
-    if bits_per_baud != 1:
-        raise NotImplemented, "bits_per_baud currently must == 1.  Please fix 
this."
-
     (packed_access_code, padded) = 
conv_1_0_string_to_packed_binary_string(access_code)
     
     payload_with_crc = gru.gen_and_append_crc32(payload)

Index: src/python/gnuradio/blksimpl/gmsk2.py
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/python/gnuradio/blksimpl/gmsk2.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/python/gnuradio/blksimpl/gmsk2.py       20 Jun 2006 22:24:32 -0000      
1.7
+++ src/python/gnuradio/blksimpl/gmsk2.py       7 Jul 2006 15:33:06 -0000       
1.8
@@ -128,6 +128,10 @@
 
        gain_omega = .25*gain_mu*gain_mu        # critically damped
 
+        # Automatic gain control
+        self.preamp = gr.multiply_const_cc(10e-5)
+        self.agc = gr.agc_cc(1e-3, 1, 1, 1000)
+
        # Demodulate FM
        sensitivity = (pi / 2) / spb
        self.fmdemod = gr.quadrature_demod_cf(1.0 / sensitivity)
@@ -142,10 +146,10 @@
         # slice the floats at 0, outputting 1 bit (the LSB of the output byte) 
per sample
         self.slicer = gr.binary_slicer_fb()
 
-       fg.connect(self.fmdemod, self.clock_recovery, self.slicer)
+       fg.connect(self.preamp, self.agc, self.fmdemod, self.clock_recovery, 
self.slicer)
         
        # Initialize base class
-       gr.hier_block.__init__(self, fg, self.fmdemod, self.slicer)
+       gr.hier_block.__init__(self, fg, self.preamp, self.slicer)
 
     def samples_per_baud(self):
         return self.spb