[Commit-gnuradio] r5163 - gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect

[jcorgan]

Author: jcorgan
Date: 2007-04-27 16:12:22 -0600 (Fri, 27 Apr 2007)
New Revision: 5163

Modified:
   
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/README
   
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/dect_receiver.py
   
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/gmsk2.py
Log:
Finished converting in-progress DECT example to new hier_block2 API

Modified: 
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/README
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/README
   2007-04-27 22:11:50 UTC (rev 5162)
+++ 
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/README
   2007-04-27 22:12:22 UTC (rev 5163)
@@ -5,6 +5,7 @@
 Status
 ------
 
+2007 Apr 27 - Converted to new hier_block2 format
 2007 Apr 03 - Development on hold.
 2007 Feb 11 - Added GMSK demodulation and option to log to file
 2007 Feb 10 - Able to tune and log filtered baseband to file

Modified: 
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/dect_receiver.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/dect_receiver.py
 2007-04-27 22:11:50 UTC (rev 5162)
+++ 
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/dect_receiver.py
 2007-04-27 22:12:22 UTC (rev 5163)
@@ -64,18 +64,18 @@
                                   verbose=options.verbose)
 
         self._sink = gr.null_sink(gr.sizeof_char)
-        self.connect(usrp, channel, demod, sink)
+        self.connect(self._usrp, self._channel_filter, self._demod, self._sink)
 
         # Log baseband to file if requested
         if options.log_baseband is not None:
             if options.verbose:
                 print "Logging baseband to file", options.log_baseband
             self.baseband_log = gr.file_sink(gr.sizeof_gr_complex, 
options.log_baseband)
-            self.connect(channel, baseband_log)
+            self.connect(self._channel_filter, self.baseband_log)
 
         # Log demodulator output to file if requested
         if options.log_demod is not None:
             if options.verbose:
                 print "Logging demodulator to file", options.log_demod
             self.demod_log = gr.file_sink(gr.sizeof_char, options.log_demod)
-            self.connect(demod, demod_log)
+            self.connect(self._demod, self.demod_log)

Modified: 
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/gmsk2.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/gmsk2.py
 2007-04-27 22:11:50 UTC (rev 5162)
+++ 
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/gmsk2.py
 2007-04-27 22:12:22 UTC (rev 5163)
@@ -221,7 +221,7 @@
         if verbose:
             self._print_verbage()
 
-        self.connect(self, fmdemod, clock_recovery, slicer, self)
+        self.connect(self, self.fmdemod, self.clock_recovery, self.slicer, 
self)
 
         if log:
             self._setup_logging()