[Commit-gnuradio] r6376 - in gnuradio/branches/developers/jcorgan/t162: config gnuradio-examples/python gnuradio-examples/python/dect

[jcorgan]

Author: jcorgan
Date: 2007-09-09 20:43:06 -0600 (Sun, 09 Sep 2007)
New Revision: 6376

Removed:
   
gnuradio/branches/developers/jcorgan/t162/gnuradio-examples/python/dect/gmsk2.py
Modified:
   gnuradio/branches/developers/jcorgan/t162/config/grc_gnuradio_examples.m4
   
gnuradio/branches/developers/jcorgan/t162/gnuradio-examples/python/Makefile.am
   
gnuradio/branches/developers/jcorgan/t162/gnuradio-examples/python/dect/dect_receiver.py
Log:
Work in progress.

Modified: 
gnuradio/branches/developers/jcorgan/t162/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/t162/config/grc_gnuradio_examples.m4   
2007-09-09 07:14:51 UTC (rev 6375)
+++ gnuradio/branches/developers/jcorgan/t162/config/grc_gnuradio_examples.m4   
2007-09-10 02:43:06 UTC (rev 6376)
@@ -33,7 +33,7 @@
         gnuradio-examples/python/digital_voice/Makefile \
         gnuradio-examples/python/multi-antenna/Makefile \
         gnuradio-examples/python/multi_usrp/Makefile \
-        gnuradio-examples/python/networking/Makefile \
+        gnuradio-examples/python/network/Makefile \
        gnuradio-examples/python/ofdm/Makefile \
        gnuradio-examples/python/sounder/Makefile \
         gnuradio-examples/python/usrp/Makefile \

Modified: 
gnuradio/branches/developers/jcorgan/t162/gnuradio-examples/python/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t162/gnuradio-examples/python/Makefile.am  
    2007-09-09 07:14:51 UTC (rev 6375)
+++ 
gnuradio/branches/developers/jcorgan/t162/gnuradio-examples/python/Makefile.am  
    2007-09-10 02:43:06 UTC (rev 6376)
@@ -22,17 +22,17 @@
 include $(top_srcdir)/Makefile.common
 
 SUBDIRS = \
-    apps \
-    audio \
-    dect \
-    digital_voice \
-    digital \
-    multi-antenna \
-    multi_usrp \
-    network \
-    sounder \
-    usrp \
-    ofdm
+       apps \
+       audio \
+       dect \
+       digital \
+       digital_voice \
+       multi-antenna \
+       multi_usrp \
+       network \
+       ofdm \
+       sounder \
+       usrp
 
 # Make example scripts with #! executable
 install-data-local:

Modified: 
gnuradio/branches/developers/jcorgan/t162/gnuradio-examples/python/dect/dect_receiver.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t162/gnuradio-examples/python/dect/dect_receiver.py
    2007-09-09 07:14:51 UTC (rev 6375)
+++ 
gnuradio/branches/developers/jcorgan/t162/gnuradio-examples/python/dect/dect_receiver.py
    2007-09-10 02:43:06 UTC (rev 6376)
@@ -20,9 +20,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, optfir
+from gnuradio import gr, optfir, blks2
 from usrp_source import usrp_source_c
-from gmsk2 import gmsk2_demod
 
 _dect_symbol_rate = 1.152e6
 _dect_occupied_bandwidth = _dect_symbol_rate * 1.03 # BT=0.5
@@ -60,8 +59,8 @@
                                                               0.0,       # 
Offset frequency
                                                               if_rate)   # 
Sample rate
 
-        self._demod = gmsk2_demod(samples_per_symbol=if_rate/_dect_symbol_rate,
-                                  verbose=options.verbose)
+        self._demod = 
blks2.gmsk_demod(samples_per_symbol=if_rate/_dect_symbol_rate,
+                                      verbose=options.verbose)
 
         self._sink = gr.null_sink(gr.sizeof_char)
         self.connect(self._usrp, self._channel_filter, self._demod, self._sink)

Deleted: 
gnuradio/branches/developers/jcorgan/t162/gnuradio-examples/python/dect/gmsk2.py