From 9b388ac1184c71449c49fb44551c5c38f8098d8e Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Wed, 4 Feb 2009 23:06:02 +0000
Subject: Merged r10383:10390 from jcorgan/u2-wip into trunk.
* Implements daughterboard independent LO offset tuning
* Removes RFX specific LO offset code
* Adds 'set_lo_offset' to libusrp2 and Python API
* Adds --lo-offset to usrp2_fft.py and usrp2_rx_cfile.py
* Ensures daughterboards are reset to default values at
startup.
Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10392 221aa14e-8319-0410-a670-987f0aec2ac5
---
gr-utils/src/python/usrp2_rx_cfile.py | 8 +++++++-
gr-utils/src/python/usrp2_siggen.py | 6 ++++++
2 files changed, 13 insertions(+), 1 deletion(-)
(limited to 'gr-utils/src')
diff --git a/gr-utils/src/python/usrp2_rx_cfile.py b/gr-utils/src/python/usrp2_rx_cfile.py
index f8f1de69b5..1f23eee4e2 100755
--- a/gr-utils/src/python/usrp2_rx_cfile.py
+++ b/gr-utils/src/python/usrp2_rx_cfile.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2004,2005,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -58,6 +58,9 @@ class rx_cfile_block(gr.top_block):
self._u.set_gain(options.gain)
# Set receive frequency
+ if options.lo_offset is not None:
+ self._u.set_lo_offset(options.lo_offset)
+
tr = self._u.set_center_freq(options.freq)
if tr == None:
sys.stderr.write('Failed to set center frequency\n')
@@ -115,6 +118,9 @@ def get_options():
help="number of samples to collect [default=+inf]")
parser.add_option("-v", "--verbose", action="store_true", default=False,
help="verbose output")
+ parser.add_option("", "--lo-offset", type="eng_float", default=None,
+ help="set daughterboard LO offset to OFFSET [default=hw default]")
+
(options, args) = parser.parse_args ()
if len(args) != 1:
parser.print_help()
diff --git a/gr-utils/src/python/usrp2_siggen.py b/gr-utils/src/python/usrp2_siggen.py
index 9929112ef5..9cea2eff1e 100755
--- a/gr-utils/src/python/usrp2_siggen.py
+++ b/gr-utils/src/python/usrp2_siggen.py
@@ -44,6 +44,10 @@ class siggen_top_block(gr.top_block):
self._u.set_gain(options.gain)
# Tune the USRP2 FPGA and daughterboard to the requested center frequency
+ # and LO offset
+ if options.lo_offset is not None:
+ self._u.set_lo_offset(options.lo_offset)
+
tr = self._u.set_center_freq(options.tx_freq)
if tr == None:
sys.stderr.write('Failed to set center frequency\n')
@@ -143,6 +147,8 @@ def get_options():
help="set waveform amplitude to AMPLITUDE (0-1.0) [default=%default]", metavar="AMPL")
parser.add_option("--offset", type="eng_float", default=0,
help="set waveform offset to OFFSET [default=%default]")
+ parser.add_option("--lo-offset", type="eng_float", default=None,
+ help="set daughterboard LO offset to OFFSET [default=hw default]")
parser.add_option("--sine", dest="type", action="store_const", const=gr.GR_SIN_WAVE,
help="generate a complex sinusoid [default]", default=gr.GR_SIN_WAVE)
parser.add_option("--const", dest="type", action="store_const", const=gr.GR_CONST_WAVE,
--
cgit v1.2.3