commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r6047 - gnuradio/branches/developers/jcorgan/radar/gr-


From: jcorgan
Subject: [Commit-gnuradio] r6047 - gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python
Date: Sat, 21 Jul 2007 15:09:15 -0600 (MDT)

Author: jcorgan
Date: 2007-07-21 15:09:14 -0600 (Sat, 21 Jul 2007)
New Revision: 6047

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:
Add Python support for using either side of USRP.

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-21 20:31:09 UTC (rev 6046)
+++ 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
   2007-07-21 21:09:14 UTC (rev 6047)
@@ -30,10 +30,12 @@
 #-----------------------------------------------------------------------
 FR_RADAR_MODE           = usrp.FR_USER_0    # Operational mode
 bmFR_RADAR_MODE_RESET   = 1 << 0       # bit 0: active high reset
-#bmFR_RADAR_MODE_LP     = 1 << 1       # bit 1: enable digital loopback
-#bmFR_RADAR_MODE_DR     = 1 << 2       # bit 2: enable on-board deramping
-#bmFR_RADAR_MODE_MD     = 1 << 3       # bit 3: enable echo metadata
-#bmFR_RADAR_MODE_CHIRPS = 3 << 4       # bit 4,5: number of chirp center 
frequencies
+bmFR_RADAR_TXSIDE       = 1 << 1        # bit 1: use TX side A or B
+bmFR_RADAR_RXSIDE       = 1 << 2        # bit 2: use RX side A or B
+#bmFR_RADAR_MODE_LP      = 1 << 3      # bit 3: enable digital loopback
+#bmFR_RADAR_MODE_DR      = 1 << 4      # bit 4: enable on-board deramping
+#bmFR_RADAR_MODE_MD      = 1 << 5      # bit 5: enable echo metadata
+#bmFR_RADAR_MODE_CHIRPS  = 3 << 6      # bit 6,7: number of chirp center 
frequencies
 
 FR_RADAR_TON    = usrp.FR_USER_1       # 16-bit transmitter on time in clocks
 FR_RADAR_TSW    = usrp.FR_USER_2       # 16-bit transmitter switch time in 
clocks
@@ -62,12 +64,15 @@
 # FPGA registers.
 #-----------------------------------------------------------------------
 class radar_tx:
-    def __init__(self, verbose=False, debug=False):
+    def __init__(self, side='A', verbose=False, debug=False):
        self._verbose = verbose
        self._debug = debug
 
         self._u = usrp.sink_s(fpga_filename='usrp_radar_mono.rbf')
-        self._subdev_spec = (0,0); # FPGA code only implements side A
+       if side == 'B':
+           self._subdev_spec = (1, 0)
+       else:
+           self._subdev_spec = (0, 0)
         self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
        self._subdev.set_lo_offset(0.0)
        self._ton_ticks = 0
@@ -149,6 +154,7 @@
         self._fg = gr.flow_graph()
         self._u = usrp.source_c(fpga_filename='usrp_radar.rbf')
        if not self._loopback:
+           # FIXME for using options.rx_side
             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)
@@ -207,15 +213,16 @@
 """
 
 class radar:
-    def __init__(self,msgq=None,verbose=False,debug=False):
+    def __init__(self, msgq=None, tx_side='A', rx_side='A', verbose=False, 
debug=False):
         self._msgq = msgq
         self._verbose = verbose
         self._debug = debug
 
        self._mode = 0
-        self._trans = radar_tx(verbose=self._verbose, debug=self._debug)
+        self._trans = radar_tx(side=tx_side, verbose=self._verbose, 
debug=self._debug)
        self.set_reset(True)
-               
+       self.set_boards('A', 'A')
+                       
     def _write_mode(self):
         if self._debug:
             print "Writing mode register with:", hex(self._mode)
@@ -232,6 +239,17 @@
            self._mode &= ~bmFR_RADAR_MODE_RESET
        self._write_mode()
 
+    def set_boards(self, tx_side, rx_side):
+       if tx_side == 'B':
+           self._mode |= bmFR_RADAR_TXSIDE
+       else:
+           self._mode &= ~bmFR_RADAR_TXSIDE
+       if rx_side == 'B':
+           self._mode |= bmFR_RADAR_RXSIDE
+       else:
+           self._mode &= ~bmFR_RADAR_RXSIDE
+       self._write_mode()
+       
     """
     def set_loopback(self, value):
        if value:

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-21 20:31:09 UTC (rev 6046)
+++ 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/usrp_radar_mono.py
      2007-07-21 21:09:14 UTC (rev 6047)
@@ -31,6 +31,10 @@
 
 def main():
     parser = OptionParser(option_class=eng_option)
+    parser.add_option("-T", "--tx-side", default='A',
+                     help="use transmitter board side A or B (default is A)")
+    parser.add_option("-R", "--rx-side", default='A',
+                     help="use receiver board side A or B (default is A)")
     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,
@@ -74,8 +78,10 @@
     """
         
     msgq = gr.msg_queue()
-    s = radar(msgq=msgq,verbose=options.verbose,debug=options.debug)
+    s = radar(msgq=msgq, tx_side=options.tx_side, rx_side=options.rx_side,
+             verbose=options.verbose, debug=options.debug)
 
+    s.set_boards(options.tx_side, options.rx_side)
     s.set_ton(options.ton)
     s.set_tsw(options.tsw)
     s.set_tlook(options.tlook)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]