diff options
| author | Josh Blum | 2010-04-05 17:25:39 -0700 |
|---|---|---|
| committer | Josh Blum | 2010-04-05 17:25:39 -0700 |
| commit | 5d7b2c44396ef6991b049d2d15ebf5b822690961 (patch) | |
| tree | 35f6c0454af877d2051e440f99161b496e9bcc98 /grc/grc_gnuradio/usrp/dual_usrp.py | |
| parent | 8dfa110cf286db709a503adafc296a8b23225645 (diff) | |
| parent | 1ae689ff9238dcffbf65881b8ca03aa8df3844aa (diff) | |
| download | gnuradio-5d7b2c44396ef6991b049d2d15ebf5b822690961.tar.gz gnuradio-5d7b2c44396ef6991b049d2d15ebf5b822690961.tar.bz2 gnuradio-5d7b2c44396ef6991b049d2d15ebf5b822690961.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into uhd
Diffstat (limited to 'grc/grc_gnuradio/usrp/dual_usrp.py')
| -rw-r--r-- | grc/grc_gnuradio/usrp/dual_usrp.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/grc/grc_gnuradio/usrp/dual_usrp.py b/grc/grc_gnuradio/usrp/dual_usrp.py index b26dbddd4..66b76b2df 100644 --- a/grc/grc_gnuradio/usrp/dual_usrp.py +++ b/grc/grc_gnuradio/usrp/dual_usrp.py @@ -1,4 +1,4 @@ -# Copyright 2009 Free Software Foundation, Inc. +# Copyright 2009, 2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -27,7 +27,7 @@ from gnuradio import gr class _dual_source(gr.hier_block2): """A dual usrp source of IO type short or complex.""" - def __init__(self, which, rx_ant_a='RXA', rx_ant_b='RXA'): + def __init__(self, which, rx_ant_a='RXA', rx_ant_b='RXA', rx_source_a='A', rx_source_b='B'): """ USRP dual source contructor. @param which the unit number @@ -42,8 +42,8 @@ class _dual_source(gr.hier_block2): ) #create usrp object self._make_usrp(which=which, nchan=2) - subdev_spec_a = common.to_spec('A', rx_ant_a) - subdev_spec_b = common.to_spec('B', rx_ant_b) + subdev_spec_a = common.to_spec(rx_source_a, rx_ant_a) + subdev_spec_b = common.to_spec(rx_source_b, rx_ant_b) self._get_u().set_mux(self._get_u().determine_rx_mux_value(subdev_spec_a, subdev_spec_b)) self._subdev_a = self._get_u().selected_subdev(subdev_spec_a) self._subdev_b = self._get_u().selected_subdev(subdev_spec_b) |