[Commit-gnuradio] r6054 - in gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src: fpga/tb python

[jcorgan]

Author: jcorgan
Date: 2007-07-23 14:26:38 -0600 (Mon, 23 Jul 2007)
New Revision: 6054

Modified:
   
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/fpga/tb/radar_tb.sav
   
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
Log:
Work in progress.

Modified: 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/fpga/tb/radar_tb.sav
===================================================================
--- 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/fpga/tb/radar_tb.sav
   2007-07-23 19:08:06 UTC (rev 6053)
+++ 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/fpga/tb/radar_tb.sav
   2007-07-23 20:26:38 UTC (rev 6054)
@@ -24,3 +24,10 @@
 @28
 radar_tb.uut.controller.tx_ctrl_o
 radar_tb.uut.controller.rx_ctrl_o
address@hidden
+-
address@hidden
+radar_tb.fifo_strobe
address@hidden
+radar_tb.fifo_i[15:0]
+radar_tb.fifo_q[15:0]

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-07-23 19:08:06 UTC (rev 6053)
+++ 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
   2007-07-23 20:26:38 UTC (rev 6054)
@@ -81,7 +81,7 @@
        
         if self._verbose:
             print "Using", self._subdev.name(), "for radar transmitter."       
     
-
+           
     def set_ton(self, ton):
        self._ton_ticks = 2*(int(ton*64e6)/2)-1  # Even number, then subtract 1
        if self._verbose:
@@ -158,27 +158,39 @@
         self._length = length
        self._verbose = verbose
         self._debug = debug
-               
+       self._length_set = False
+                       
         self._fg = gr.flow_graph()
         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:
+           self._usrp_sink = gr.file_sink(gr.sizeof_gr_complex, "usrp.dat")
+           self._fg.connect(self._u, self._usrp_sink)
+       
         self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
         self.set_gain(gain)
+
+        if self._verbose:
+            print "Using", self._subdev.name(), "for radar receiver."
+            print "Setting receiver gain to", self._gain
+        
+    def set_echo_length(self, length):
+        # Only call once
+       if self._length_set is True:
+           raise RuntimeError("Can only set echo length once.")
+       self._length = length
         self._vblen = gr.sizeof_gr_complex*self._length
-        self._s2v = gr.stream_to_vector(gr.sizeof_gr_complex, self._length)
-
-        print self._msgq
+       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._length_set = True
         if self._verbose:
-            print "Using", self._subdev.name(), "for radar receiver."
-            print "Setting receiver gain to", self._gain
-            print "Generating echo vectors of length", self._length, \
+            print "Receiving echo vectors of length", self._length, \
                   "(samples)", self._vblen, "(bytes)"
-        
+
     def tune(self, frequency):
         if self._verbose:
             print "Setting receiver frequency to", n2s(frequency)
@@ -222,8 +234,7 @@
        self._mode = 0
         self._trans = radar_tx(subdev_spec=tx_subdev_spec, 
verbose=self._verbose, debug=self._debug)
         self._rcvr = radar_rx(gain=gain, msgq=self._msgq, 
subdev_spec=rx_subdev_spec, 
-                             length=self._trans.echo_length(),
-                              verbose=self._verbose, debug=self._debug)
+                             verbose=self._verbose, debug=self._debug)
        self.set_reset(True)
        self.set_tx_board(self._trans.subdev_spec())
                        
@@ -271,6 +282,7 @@
        
     def set_tlook(self, tlook):
        self._trans.set_tlook(tlook)
+       self._rcvr.set_echo_length(self._trans.echo_length())
        
     def set_prf(self, prf):
        self._trans.set_prf(prf)
@@ -283,12 +295,12 @@
         # set receiver center frequency
         
     def start(self):
+       self.set_reset(False)
        self._trans.start()
-       self.set_reset(False)
+       self._rcvr.start()
        
     def stop(self):
+       self._trans.stop()
+       self._rcvr.stop()
        self.set_reset(True)
-       self._trans.stop()
 
-    def __del__(self):
-        self.stop()