From 3d27662913c78f672e3f7d7d1ebc2013ee038387 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 2 Sep 2009 12:07:14 -0700
Subject: Modifications to the usrp blocks and wrapper so that the lo offset is
 set with the lo frequency.

---
 grc/grc_gnuradio/usrp/simple_usrp.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'grc/grc_gnuradio/usrp/simple_usrp.py')

diff --git a/grc/grc_gnuradio/usrp/simple_usrp.py b/grc/grc_gnuradio/usrp/simple_usrp.py
index 9065c7fe9..fc4c75bf0 100644
--- a/grc/grc_gnuradio/usrp/simple_usrp.py
+++ b/grc/grc_gnuradio/usrp/simple_usrp.py
@@ -56,8 +56,8 @@ class _simple_source(gr.hier_block2):
 		self._get_u().set_decim_rate(int(decim))
 		if self._no_hb: #set the BW to half the sample rate
 			self._subdev.set_bw(self._get_u().converter_rate()/decim/2)
-	def set_lo_offset(self, lo_offset): self._subdev.set_lo_offset(lo_offset)
-	def set_frequency(self, frequency, verbose=False):
+	def set_frequency(self, frequency, verbose=False, lo_offset=None):
+		if lo_offset is not None: self._subdev.set_lo_offset(lo_offset)
 		self._set_frequency(
 			chan=0, #ddc0
 			subdev=self._subdev,
@@ -96,14 +96,14 @@ class _simple_sink(gr.hier_block2):
 		self.connect(self, self._get_u())
 
 	def set_interp_rate(self, interp): self._get_u().set_interp_rate(int(interp))
-	def set_frequency(self, frequency, verbose=False):
+	def set_frequency(self, frequency, verbose=False, lo_offset=None):
+		if lo_offset is not None: self._subdev.set_lo_offset(lo_offset)
 		self._set_frequency(
 			chan=self._subdev.which(),
 			subdev=self._subdev,
 			frequency=frequency,
 			verbose=verbose,
 		)
-	def set_lo_offset(self, lo_offset): self._subdev.set_lo_offset(lo_offset)
 	def set_gain(self, gain): self._subdev.set_gain(gain)
 	def set_enable(self, enable): self._subdev.set_enable(enable)
 	def set_auto_tr(self, auto_tr): self._subdev.set_auto_tr(auto_tr)
-- 
cgit