Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / grc / blocks / usrp_simple_source_x.xml

diff --git a/grc/blocks/usrp_simple_source_x.xml b/grc/blocks/usrp_simple_source_x.xml
index 1a777bd6302c7cf017703ce06556150a4e19e461..7fcc7a22cf37eeff7d924a95694c109718ba971b 100644 (file)
--- a/grc/blocks/usrp_simple_source_x.xml
+++ b/grc/blocks/usrp_simple_source_x.xml
@@ -13,14 +13,18 @@
 self.$(id).set_format(width=$format.width, shift=$format.shift)
 #end if
 self.$(id).set_decim_rate($decimation)
-self.$(id).set_frequency($frequency, verbose=True)
-self.$(id).set_gain($gain)
+self.$(id).set_frequency($frequency, verbose=True#slurp
 #if $lo_offset() != float('inf')
-self.$(id).set_lo_offset($lo_offset)
-#end if</make>
-       <callback>set_lo_offset($lo_offset)</callback>
+, lo_offset=$lo_offset#slurp
+#end if
+)
+self.$(id).set_gain($gain)</make>
        <callback>set_decim_rate($decimation)</callback>
-       <callback>set_frequency($frequency)</callback>
+       <callback>set_frequency($frequency#slurp
+#if $lo_offset() != float('inf')
+, lo_offset=$lo_offset#slurp
+#end if
+)</callback>
        <callback>set_gain($gain)</callback>
        <param>
                <name>Output Type</name>