diff options
| author | Johnathan Corgan | 2010-03-21 09:09:13 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-03-21 09:09:13 -0700 |
| commit | 769b8bbe0aed088b6d1582d2d81d0966cee4c604 (patch) | |
| tree | f6604de237f195c2c94f2976eb270ecc7765e1a1 /grc/grc_gnuradio/usrp | |
| parent | f322a2af4e9ac58a10e263cd6d8299e0c6547470 (diff) | |
| parent | 645768d1b067fe83ccc65f4a834ee384ea4560d9 (diff) | |
| download | gnuradio-769b8bbe0aed088b6d1582d2d81d0966cee4c604.tar.gz gnuradio-769b8bbe0aed088b6d1582d2d81d0966cee4c604.tar.bz2 gnuradio-769b8bbe0aed088b6d1582d2d81d0966cee4c604.zip | |
Merge branch 'grc/dualusrp' of git://gnuradio.org/jblum
Diffstat (limited to 'grc/grc_gnuradio/usrp')
| -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) |