Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / 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 9065c7fe93ed2decbba24ee49484807b52b8acd1..fb7a39570f0dead666abe6a4290e688f2580117b 100644 (file)
--- a/grc/grc_gnuradio/usrp/simple_usrp.py
+++ b/grc/grc_gnuradio/usrp/simple_usrp.py
@@ -19,7 +19,7 @@
 #
 
 import common
-from gnuradio import gr, usrp
+from gnuradio import gr
 
 ####################################################################
 # Simple USRP Source
@@ -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)