[Commit-gnuradio] r4390 - in gnuradio/branches/developers/jcorgan/digital: gnuradio-core/src/python/gnuradio gnuradio-examples/python/digital

[jcorgan]

Author: jcorgan
Date: 2007-02-05 16:47:05 -0700 (Mon, 05 Feb 2007)
New Revision: 4390

Modified:
   
gnuradio/branches/developers/jcorgan/digital/gnuradio-core/src/python/gnuradio/packet_utils.py
   
gnuradio/branches/developers/jcorgan/digital/gnuradio-examples/python/digital/Makefile.am
Log:
Final tweak before merge.

Modified: 
gnuradio/branches/developers/jcorgan/digital/gnuradio-core/src/python/gnuradio/packet_utils.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/digital/gnuradio-core/src/python/gnuradio/packet_utils.py
      2007-02-05 23:39:39 UTC (rev 4389)
+++ 
gnuradio/branches/developers/jcorgan/digital/gnuradio-core/src/python/gnuradio/packet_utils.py
      2007-02-05 23:47:05 UTC (rev 4390)
@@ -96,7 +96,8 @@
 
 
 def make_header(payload_len, whitener_offset=0):
-    val = 4096 * (whitener_offset & 0xf) + payload_len  # Upper nibble is 
offset, lower 12 bits is len
+    # Upper nibble is offset, lower 12 bits is len
+    val = ((whitener_offset & 0xf) << 12) | (payload_len & 0x0fff)
     #print "offset =", whitener_offset, " len =", payload_len, " val=", val
     return struct.pack('!HH', val, val)
 

Modified: 
gnuradio/branches/developers/jcorgan/digital/gnuradio-examples/python/digital/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/digital/gnuradio-examples/python/digital/Makefile.am
   2007-02-05 23:39:39 UTC (rev 4389)
+++ 
gnuradio/branches/developers/jcorgan/digital/gnuradio-examples/python/digital/Makefile.am
   2007-02-05 23:47:05 UTC (rev 4390)
@@ -28,6 +28,7 @@
        pick_bitrate.py         \
        receive_path.py         \
        rx_voice.py             \
+       run_length.py           \
        transmit_path.py        \
        tunnel.py               \
        tx_voice.py