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

[jcorgan]

Author: jcorgan
Date: 2007-07-23 13:08:06 -0600 (Mon, 23 Jul 2007)
New Revision: 6053

Modified:
   
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
   
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/usrp_radar_mono.py
Log:
Work in progress, adding receiver

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 18:10:12 UTC (rev 6052)
+++ 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
   2007-07-23 19:08:06 UTC (rev 6053)
@@ -140,43 +140,44 @@
     def subdev_spec(self):
         return self._subdev_spec
     
+    def echo_length(self):
+        return self._tlook_ticks+1
+
     def __del__(self):
        del self._subdev # Avoid weak reference error
        
 #-----------------------------------------------------------------------
 # Receiver object.  Uses usrp_source_c to receive echo records.
-# NOT IMPLEMENTED YET
 #-----------------------------------------------------------------------
-"""
-class radar_rx:
-    def 
__init__(self,gain=None,msgq=None,loopback=False,verbose=False,debug=False):
+class radar_rx():
+    def __init__(self, gain=None, subdev_spec=None, msgq=None, length=None,
+                 verbose=False, debug=False):
         self._gain = gain
+        self._subdev_spec = subdev_spec
         self._msgq = msgq
-       self._loopback = loopback
+        self._length = length
        self._verbose = verbose
-       self._debug = debug
+        self._debug = debug
                
         self._fg = gr.flow_graph()
-        self._u = usrp.source_c(fpga_filename='usrp_radar.rbf')
-       if not self._loopback:
-           # FIXME for using options.rx_subdev_spec
-            self._subdev_spec = (0,0) # FPGA only implements side A
-            self._u.set_mux(usrp.determine_rx_mux_value(self._u, 
self._subdev_spec))
-            self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
-            if self._verbose:
-               print "Using", self._subdev.name(), "for radar receiver."
-
-        self.set_gain(self._gain)
-
-        # need to compute length here
-        
+        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))
+        self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
+        self.set_gain(gain)
         self._vblen = gr.sizeof_gr_complex*self._length
-        if self._debug:
-            print "Generating echo vectors of length", self._length, "byte 
length", self._vblen
-            
         self._s2v = gr.stream_to_vector(gr.sizeof_gr_complex, self._length)
+
+        print self._msgq
         self._sink = gr.message_sink(self._vblen, self._msgq, True)
         self._fg.connect(self._u, self._s2v, self._sink)
+
+        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, \
+                  "(samples)", self._vblen, "(bytes)"
         
     def tune(self, frequency):
         if self._verbose:
@@ -187,15 +188,10 @@
 
     def set_gain(self, gain):
         self._gain = gain
-       if self._loopback:
-           return
-           
-        if self._gain is None:
+        if self._gain == None:
             # if no gain was specified, use the mid-point in dB
             g = self._subdev.gain_range()
             self._gain = float(g[0]+g[1])/2
-        if self._verbose:
-            print "Setting receiver gain to", gain
         self._subdev.set_gain(self._gain)
 
     def start(self):
@@ -215,16 +211,19 @@
         self.wait()
         if self._debug:
             print "Receiver flow graph stopped."
-"""
 
 class radar:
-    def __init__(self, msgq=None, tx_subdev_spec=None, verbose=False, 
debug=False):
+    def __init__(self, msgq=None, tx_subdev_spec=None, rx_subdev_spec=None,
+                 gain=None, verbose=False, debug=False):
         self._msgq = msgq
         self._verbose = verbose
         self._debug = debug
 
        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)
        self.set_reset(True)
        self.set_tx_board(self._trans.subdev_spec())
                        

Modified: 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/usrp_radar_mono.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/usrp_radar_mono.py
      2007-07-23 18:10:12 UTC (rev 6052)
+++ 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/usrp_radar_mono.py
      2007-07-23 19:08:06 UTC (rev 6053)
@@ -33,6 +33,10 @@
     parser = OptionParser(option_class=eng_option)
     parser.add_option("-T", "--tx-subdev-spec", type="subdev", default=None,
                      help="use transmitter board side A or B (default is first 
found)")
+    parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
+                     help="use receiver board side A or B (default is first 
found)")
+    parser.add_option("-g", "--gain", type="eng_float", default=None,
+                      help="set gain in dB (default is midpoint)")
     parser.add_option("-f", "--frequency", type="eng_float", default=0.0,
                       help="set transmitter center frequency to FREQ in Hz, 
default is %default", metavar="FREQ")
     parser.add_option("-w", "--chirp-width", type="eng_float", default=32e6,
@@ -53,8 +57,6 @@
                       help="enable debugging output, default is disabled")
 
     # NOT IMPLEMENTED
-    #parser.add_option("-g", "--gain", type="eng_float", default=None,
-    #                  help="set gain in dB (default is midpoint)")
     #parser.add_option("-l", "--loopback", action="store_true", default=False,
     #                  help="enable digital loopback, default is disabled")
     #parser.add_option("-F", "--filename", default=None,
@@ -77,6 +79,7 @@
         
     msgq = gr.msg_queue()
     s = radar(msgq=msgq, tx_subdev_spec=options.tx_subdev_spec,
+              rx_subdev_spec=options.rx_subdev_spec,gain=options.gain,
              verbose=options.verbose, debug=options.debug)
 
     s.set_ton(options.ton)
@@ -88,24 +91,22 @@
 
     s.start()
 
-    """
-    f = open(options.filename, "wb")
+    #f = open(options.filename, "wb")
     print "Enter CTRL-C to stop."
     try:
-        while (1):
-            msg = msgq.delete_head()
-            if msg.type() == 1:
-                break
-            rec = msg.to_string()
-            if options.debug:
-                print "Received echo vector of length", len(rec)
-               f.write(rec)
+       while 1:
+           if not msgq.empty_p():
+                msg = msgq.delete_head()
+                if msg.type() == 1:
+                    break
+                echo = msg.to_string()
+                if options.debug:
+                    print "Received echo vector of length", len(echo)
+               #f.write(rec)
                
     except KeyboardInterrupt:
         pass
-    """
 
-    raw_input("Press enter to stop transmitting.")
     s.stop()
         
 if __name__ == "__main__":