diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-07-19 04:39:37 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-07-19 04:39:37 +0000 |
| commit | 27669cfcdca0d56642cf5279d372fe149e7b1d26 (patch) | |
| tree | c40ffe7fc626687567004a7b779b82a0d1ac926a | |
| parent | 0c30f34bf0afa14e8f2ee128dd4168c7c372b862 (diff) | |
Merged r6015:6026 from jcorgan/radar.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6027 221aa14e-8319-0410-a670-987f0aec2ac5
| -rw-r--r-- | gr-radar-mono/README | 4 | ||||
| -rw-r--r-- | gr-radar-mono/src/python/radar_mono.py | 6 | ||||
| -rwxr-xr-x | gr-radar-mono/src/python/usrp_radar_mono.py | 2 | ||||
| -rw-r--r-- | gr-usrp/src/db_flexrf.py | 37 |
4 files changed, 42 insertions, 7 deletions
diff --git a/gr-radar-mono/README b/gr-radar-mono/README index f449af8eb5..0ecf4e381e 100644 --- a/gr-radar-mono/README +++ b/gr-radar-mono/README @@ -9,7 +9,7 @@ a range resolution of approximately 5 meters. Only boards in slot A are supported. -The script to run is place in $prefix/bin: +The script to run is placed in $prefix/bin: Usage: usrp_radar_mono.py [options] @@ -32,7 +32,7 @@ Options: -v, --verbose enable verbose output, default is disabled -D, --debug enable debugging output, default is disabled -The transmitter creates a LFM chirp, evenly centered on the supplied frequency. +The transmitter creates an LFM chirp, evenly centered on the supplied frequency. The four timing parameters are: ton Chirp on time in seconds. diff --git a/gr-radar-mono/src/python/radar_mono.py b/gr-radar-mono/src/python/radar_mono.py index 5a5be9c8db..0f2c2b252a 100644 --- a/gr-radar-mono/src/python/radar_mono.py +++ b/gr-radar-mono/src/python/radar_mono.py @@ -69,6 +69,8 @@ class radar_tx: self._u = usrp.sink_s(fpga_filename='usrp_radar_mono.rbf') self._subdev_spec = (0,0); # FPGA code only implements side A self._subdev = usrp.selected_subdev(self._u, self._subdev_spec) + if hasattr(self._subdev, 'set_lo_offset'): + self._subdev.set_lo_offset(0) self._ton_ticks = 0 self._tsw_ticks = 0 self._tlook_ticks = 0 @@ -126,8 +128,10 @@ class radar_tx: def start(self): self._u.start() - + self._subdev.set_enable(True) + def stop(self): + self._subdev.set_enable(False) self._u.stop() #----------------------------------------------------------------------- diff --git a/gr-radar-mono/src/python/usrp_radar_mono.py b/gr-radar-mono/src/python/usrp_radar_mono.py index 47db53c26f..a16a18a8eb 100755 --- a/gr-radar-mono/src/python/usrp_radar_mono.py +++ b/gr-radar-mono/src/python/usrp_radar_mono.py @@ -35,7 +35,7 @@ def main(): 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, help="set LFM chirp bandwidth in Hz, default is %default", metavar="FREQ") - parser.add_option("-a", "--amplitude", type="eng_float", default=100, + parser.add_option("-a", "--amplitude", type="eng_float", default=15, 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,") diff --git a/gr-usrp/src/db_flexrf.py b/gr-usrp/src/db_flexrf.py index 271b14728b..045bc39bd8 100644 --- a/gr-usrp/src/db_flexrf.py +++ b/gr-usrp/src/db_flexrf.py @@ -225,7 +225,7 @@ class flexrf_base_tx(flexrf_base): # power up the transmit side, but don't enable the mixer self._u._write_oe(self._which,(POWER_UP|RX_TXN|ENABLE), 0xffff) self._u.write_io(self._which, (self.power_on|RX_TXN), (POWER_UP|RX_TXN|ENABLE)) - self.lo_offset = 4e6 # FIXME may want to be a function of d'board + self.lo_offset = 4e6 def __del__(self): #print "flexrf_base_tx.__del__" @@ -275,7 +275,22 @@ class flexrf_base_tx(flexrf_base): """ return self._set_pga(self._u.pga_max()) - + def set_lo_offset(self, offset): + """ + Set amount by which LO is offset from requested tuning frequency. + + @param offset: offset in Hz + """ + self.lo_offset = offset + + def get_lo_offset(self): + """ + Get amount by which LO is offset from requested tuning frequency. + + @returns Offset in Hz + """ + return self.lo_offset + class flexrf_base_rx(flexrf_base): def __init__(self, usrp, which): """ @@ -293,7 +308,7 @@ class flexrf_base_rx(flexrf_base): self.bypass_adc_buffers(True) - self.lo_offset = -4e6 # FIXME may want to be a function of d'board + self.lo_offset = -4e6 def __del__(self): # print "flexrf_base_rx.__del__" @@ -346,6 +361,22 @@ class flexrf_base_rx(flexrf_base): return self._u.write_aux_dac(self._which, 0, int(dac_value)) and \ self._set_pga(int(pga_gain)) + def set_lo_offset(self, offset): + """ + Set amount by which LO is offset from requested tuning frequency. + + @param offset: offset in Hz + """ + self.lo_offset = offset + + def get_lo_offset(self): + """ + Get amount by which LO is offset from requested tuning frequency. + + @returns Offset in Hz + """ + return self.lo_offset + # ---------------------------------------------------------------- |