[Commit-gnuradio] r6381 - gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python

[jcorgan]

Author: jcorgan
Date: 2007-09-10 10:55:55 -0600 (Mon, 10 Sep 2007)
New Revision: 6381

Modified:
   
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
Log:
Converted to new top block code.

Modified: 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
   2007-09-10 16:16:05 UTC (rev 6380)
+++ 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
   2007-09-10 16:55:55 UTC (rev 6381)
@@ -63,7 +63,7 @@
 # Transmitter object.  Uses usrp_sink, but only for a handle to the
 # FPGA registers.
 #-----------------------------------------------------------------------
-class radar_tx:
+class radar_tx(object):
     def __init__(self, subdev_spec=None, verbose=False, debug=False):
         self._subdev_spec = subdev_spec
        self._verbose = verbose
@@ -148,7 +148,7 @@
 #-----------------------------------------------------------------------
 # Receiver object.  Uses usrp_source_c to receive echo records.
 #-----------------------------------------------------------------------
-class radar_rx:
+class radar_rx(object):
     def __init__(self, gain=None, subdev_spec=None, msgq=None, length=None,
                  verbose=False, debug=False):
         self._gain = gain
@@ -159,15 +159,15 @@
         self._debug = debug
        self._length_set = False
                        
-        self._fg = gr.flow_graph()
+        self._tb = gr.top_block()
         self._u = usrp.source_c(fpga_filename='usrp_radar_mono.rbf')
         if self._subdev_spec == None:
             self._subdev_spec = usrp.pick_rx_subdevice(self._u)
         self._u.set_mux(usrp.determine_rx_mux_value(self._u, 
self._subdev_spec))
 
-       if self._debug:
+       if True: #self._debug:
            self._usrp_sink = gr.file_sink(gr.sizeof_gr_complex, "usrp.dat")
-           self._fg.connect(self._u, self._usrp_sink)
+           self._tb.connect(self._u, self._usrp_sink)
        
         self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
         self.set_gain(gain)
@@ -184,7 +184,7 @@
         self._vblen = gr.sizeof_gr_complex*self._length
        self._s2v = gr.stream_to_vector(gr.sizeof_gr_complex, self._length)
         self._sink = gr.message_sink(self._vblen, self._msgq, True)
-        self._fg.connect(self._u, self._s2v, self._sink)
+        self._tb.connect(self._u, self._s2v, self._sink)
        self._length_set = True
         if self._verbose:
             print "Receiving echo vectors of length", self._length, \
@@ -208,17 +208,17 @@
     def start(self):
         if self._verbose:
             print "Starting receiver flow graph."
-        self._fg.start()
+        self._tb.start()
 
     def wait(self):
         if self._verbose:
             print "Waiting for threads..."
-        self._fg.wait()
+        self._tb.wait()
 
     def stop(self):
         if self._verbose:
             print "Stopping receiver flow graph."
-        self._fg.stop()
+        self._tb.stop()
         self.wait()
         if self._verbose:
             print "Receiver flow graph stopped."