[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r6027 - in gnuradio/trunk: gr-radar-mono gr-radar-mono
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r6027 - in gnuradio/trunk: gr-radar-mono gr-radar-mono/src/python gr-usrp/src |
Date: |
Wed, 18 Jul 2007 22:39:39 -0600 (MDT) |
Author: jcorgan
Date: 2007-07-18 22:39:37 -0600 (Wed, 18 Jul 2007)
New Revision: 6027
Modified:
gnuradio/trunk/gr-radar-mono/README
gnuradio/trunk/gr-radar-mono/src/python/radar_mono.py
gnuradio/trunk/gr-radar-mono/src/python/usrp_radar_mono.py
gnuradio/trunk/gr-usrp/src/db_flexrf.py
Log:
Merged r6015:6026 from jcorgan/radar.
Modified: gnuradio/trunk/gr-radar-mono/README
===================================================================
--- gnuradio/trunk/gr-radar-mono/README 2007-07-19 04:37:28 UTC (rev 6026)
+++ gnuradio/trunk/gr-radar-mono/README 2007-07-19 04:39:37 UTC (rev 6027)
@@ -9,7 +9,7 @@
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 @@
-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.
Modified: gnuradio/trunk/gr-radar-mono/src/python/radar_mono.py
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/python/radar_mono.py 2007-07-19
04:37:28 UTC (rev 6026)
+++ gnuradio/trunk/gr-radar-mono/src/python/radar_mono.py 2007-07-19
04:39:37 UTC (rev 6027)
@@ -69,6 +69,8 @@
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 @@
def start(self):
self._u.start()
-
+ self._subdev.set_enable(True)
+
def stop(self):
+ self._subdev.set_enable(False)
self._u.stop()
#-----------------------------------------------------------------------
Modified: gnuradio/trunk/gr-radar-mono/src/python/usrp_radar_mono.py
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/python/usrp_radar_mono.py 2007-07-19
04:37:28 UTC (rev 6026)
+++ gnuradio/trunk/gr-radar-mono/src/python/usrp_radar_mono.py 2007-07-19
04:39:37 UTC (rev 6027)
@@ -35,7 +35,7 @@
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,")
Modified: gnuradio/trunk/gr-usrp/src/db_flexrf.py
===================================================================
--- gnuradio/trunk/gr-usrp/src/db_flexrf.py 2007-07-19 04:37:28 UTC (rev
6026)
+++ gnuradio/trunk/gr-usrp/src/db_flexrf.py 2007-07-19 04:39:37 UTC (rev
6027)
@@ -225,7 +225,7 @@
# 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 @@
"""
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 @@
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,7 +361,23 @@
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
+
+
# ----------------------------------------------------------------
class _AD4360_common(object):
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r6027 - in gnuradio/trunk: gr-radar-mono gr-radar-mono/src/python gr-usrp/src,
jcorgan <=