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

[jcorgan]

Author: jcorgan
Date: 2007-09-27 09:10:50 -0600 (Thu, 27 Sep 2007)
New Revision: 6553

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:
Clean up on switching time handling

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-27 14:29:14 UTC (rev 6552)
+++ 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
   2007-09-27 15:10:50 UTC (rev 6553)
@@ -26,6 +26,9 @@
 
 n2s = eng_notation.num_to_str
 
+txp_delay = 60 # Pipeline delay to turn on transmit mixer
+rxp_delay = 76 # Pipeline delay to turn off transmit mixer
+
 #-----------------------------------------------------------------------
 # FPGA Register Definitions
 #-----------------------------------------------------------------------
@@ -92,7 +95,7 @@
        self._u._write_fpga_reg(FR_RADAR_TON, self._ton_ticks)
 
     def set_tsw(self, tsw):
-       self._tsw_ticks = 2*(int(tsw*64e6)/2)-1  # Even number, then subtract 1
+       self._tsw_ticks = 2*(int(tsw*64e6)/2)-1+rxp_delay  # Even number, then 
subtract 1
        if self._verbose:
            print "Setting pulse switching time to", tsw, " sec 
("+`self._tsw_ticks+1`+" ticks)"
        self._u._write_fpga_reg(FR_RADAR_TSW, self._tsw_ticks)
@@ -246,7 +249,8 @@
        self.set_reset(True)
        self.set_tx_board(self._trans.subdev_spec())
         self.set_debug(self._debug)
-        
+       self.set_atrdel()
+               
     def _write_mode(self):
         self._trans._u._write_fpga_reg(FR_RADAR_MODE, self._mode)
 
@@ -291,7 +295,7 @@
         self._trans.set_freq(center_freq, chirp_width)
        self._rcvr.tune(center_freq)
                
-    def set_atrdel(self, tx_delay, rx_delay):
+    def set_atrdel(self, tx_delay=txp_delay, rx_delay=rxp_delay):
         if self._verbose:
            print "Setting TX delay of", tx_delay, "clocks, RX delay of", 
rx_delay
         self._trans._u._write_fpga_reg(FR_RADAR_ATRDEL, tx_delay << 16 | 
rx_delay)

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-09-27 14:29:14 UTC (rev 6552)
+++ 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/usrp_radar_mono.py
      2007-09-27 15:10:50 UTC (rev 6553)
@@ -52,11 +52,11 @@
                       help="set waveform amplitude in % full scale, default is 
%default,")
     parser.add_option("",   "--ton", type="eng_float", default=5e-6,
                      help="set pulse on period in seconds, default is 
%default,")
-    parser.add_option("",   "--tsw", type="eng_float", default=406.25e-9,
+    parser.add_option("",   "--tsw", type="eng_float", default=0.0,
                      help="set transmitter switching period in seconds, 
default is %default,")
     parser.add_option("",   "--tlook", type="eng_float", default=5e-6,
                      help="set receiver look time in seconds, default is 
%default,")
-    parser.add_option("",   "--prf", type="eng_float", default=10e3,
+    parser.add_option("",   "--prf", type="eng_float", default=100,
                      help="set pulse repetition frequency in Hz, default is 
%default,")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="enable verbose output, default is disabled")
@@ -84,7 +84,6 @@
     r.set_prf(options.prf)
     r.set_amplitude(options.amplitude)
     r.set_freq(options.frequency, options.chirp_width)
-    r.set_atrdel(64, 70) # TODO: parameterize
     
     r.start()
     raw_input("Press ENTER to stop.")