summaryrefslogtreecommitdiff
path: root/grc/blocks/usrp2_sink_xxxx.xml
diff options
context:
space:
mode:
authorMatt Ettus2009-09-04 10:29:00 -0700
committerMatt Ettus2009-09-04 10:29:00 -0700
commite103e18f8b8111cd07edc2bb0294aa58a426e371 (patch)
tree429d96819fc8b04c965eda3a0c2b93f2e94f9080 /grc/blocks/usrp2_sink_xxxx.xml
parent5965a434d0923738d49334eb5f3d74a259e7b431 (diff)
parent20006003431d7260b04964eb684b1746ffb0a85f (diff)
downloadgnuradio-e103e18f8b8111cd07edc2bb0294aa58a426e371.tar.gz
gnuradio-e103e18f8b8111cd07edc2bb0294aa58a426e371.tar.bz2
gnuradio-e103e18f8b8111cd07edc2bb0294aa58a426e371.zip
Merge branch 'master' into new_eth
Diffstat (limited to 'grc/blocks/usrp2_sink_xxxx.xml')
-rw-r--r--grc/blocks/usrp2_sink_xxxx.xml13
1 files changed, 8 insertions, 5 deletions
diff --git a/grc/blocks/usrp2_sink_xxxx.xml b/grc/blocks/usrp2_sink_xxxx.xml
index 639f96cf4..f2ee4d151 100644
--- a/grc/blocks/usrp2_sink_xxxx.xml
+++ b/grc/blocks/usrp2_sink_xxxx.xml
@@ -2,6 +2,7 @@
<!--
###################################################
##USRP2 Sink
+## Note: the center freq must be set after the lo offset
###################################################
-->
<block>
@@ -16,14 +17,16 @@ usrp2.sink_$(type.fcn)($interface)
usrp2.sink_$(type.fcn)($interface, $mac_addr)
#end if
self.$(id).set_interp($interpolation)
-self.$(id).set_center_freq($frequency)
-self.$(id).set_gain($gain)
#if $lo_offset() != float('inf')
self.$(id).set_lo_offset($lo_offset)
-#end if</make>
- <callback>set_lo_offset($lo_offset)</callback>
+#end if
+self.$(id).set_center_freq($frequency)
+self.$(id).set_gain($gain)</make>
<callback>set_interp($interpolation)</callback>
- <callback>set_center_freq($frequency)</callback>
+ <callback>#if $lo_offset() != float('inf')
+self.$(id).set_lo_offset($lo_offset)
+#end if
+self.$(id).set_center_freq($frequency)</callback>
<callback>set_gain($gain)</callback>
<param>
<name>Output Type</name>