diff options
| author | Matt Ettus | 2009-09-04 10:29:00 -0700 |
|---|---|---|
| committer | Matt Ettus | 2009-09-04 10:29:00 -0700 |
| commit | e103e18f8b8111cd07edc2bb0294aa58a426e371 (patch) | |
| tree | 429d96819fc8b04c965eda3a0c2b93f2e94f9080 /grc/blocks/usrp_dual_sink_x.xml | |
| parent | 5965a434d0923738d49334eb5f3d74a259e7b431 (diff) | |
| parent | 20006003431d7260b04964eb684b1746ffb0a85f (diff) | |
| download | gnuradio-e103e18f8b8111cd07edc2bb0294aa58a426e371.tar.gz gnuradio-e103e18f8b8111cd07edc2bb0294aa58a426e371.tar.bz2 gnuradio-e103e18f8b8111cd07edc2bb0294aa58a426e371.zip | |
Merge branch 'master' into new_eth
Diffstat (limited to 'grc/blocks/usrp_dual_sink_x.xml')
| -rw-r--r-- | grc/blocks/usrp_dual_sink_x.xml | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/grc/blocks/usrp_dual_sink_x.xml b/grc/blocks/usrp_dual_sink_x.xml index 8f418becd..4539b62f9 100644 --- a/grc/blocks/usrp_dual_sink_x.xml +++ b/grc/blocks/usrp_dual_sink_x.xml @@ -10,16 +10,18 @@ <import>from grc_gnuradio import usrp as grc_usrp</import> <make>grc_usrp.dual_sink_$(type.fcn)(which=$which) self.$(id).set_interp_rate($interpolation) -self.$(id).set_frequency_a($frequency_a, verbose=True) -self.$(id).set_frequency_b($frequency_b, verbose=True) -self.$(id).set_gain_a($gain_a) -self.$(id).set_gain_b($gain_b) +self.$(id).set_frequency_a($frequency_a, verbose=True#slurp #if $lo_offset_a() != float('inf') -self.$(id).set_lo_offset_a($lo_offset_a) +, lo_offset=$lo_offset_a#slurp #end if +) +self.$(id).set_frequency_b($frequency_b, verbose=True#slurp #if $lo_offset_b() != float('inf') -self.$(id).set_lo_offset_b($lo_offset_b) +, lo_offset=$lo_offset_b#slurp #end if +) +self.$(id).set_gain_a($gain_a) +self.$(id).set_gain_b($gain_b) ################################################## ## Flex RF A ################################################## @@ -39,8 +41,16 @@ self.$(id).set_enable_b(True) self.$(id).set_auto_tr_b(True) #end if</make> <callback>set_interp_rate($interpolation)</callback> - <callback>set_frequency_a($frequency_a)</callback> - <callback>set_frequency_b($frequency_b)</callback> + <callback>set_frequency_a($frequency_a#slurp +#if $lo_offset_a() != float('inf') +, lo_offset=$lo_offset_a#slurp +#end if +)</callback> + <callback>set_frequency_b($frequency_b#slurp +#if $lo_offset_b() != float('inf') +, lo_offset=$lo_offset_b#slurp +#end if +)</callback> <callback>set_gain_a($gain_a)</callback> <callback>set_gain_b($gain_b)</callback> <param> |