diff options
Diffstat (limited to 'gr-uhd')
| -rwxr-xr-x | gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py | 7 | ||||
| -rwxr-xr-x | gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py | 2 | ||||
| -rw-r--r-- | gr-uhd/swig/uhd_swig.i | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py b/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py index 112d88159..5902fa855 100755 --- a/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py +++ b/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py @@ -84,7 +84,7 @@ self.\$(id).set_bandwidth(\$bw$(n), $n) <param> <name>Device Addr</name> <key>dev_addr</key> - <value>addr=192.168.10.2</value> + <value>addr0=192.168.10.2, addr1=192.168.10.3</value> <type>string</type> <hide> \#if \$dev_addr() @@ -173,9 +173,8 @@ The UHD Multi USRP $sourk.title() Block: Device Address: The device address is a delimited string used to locate UHD devices on your system. \\ -If left blank, the first UHD device found will be used. \\ -Used args to specify a specfic device. -USRP2 Example: addr=192.168.10.2 192.168.10.3 +Use the device address to specify a list of devices. +USRP2 Example: addr0=192.168.10.2, addr1=192.168.10.3 Num Motherboards: Selects the number of USRP motherboards in this multi-USRP configuration. diff --git a/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py b/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py index 7337c71d7..66728fe28 100755 --- a/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py +++ b/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py @@ -160,7 +160,7 @@ The UHD Single USRP $sourk.title() Block: Device Address: The device address is a delimited string used to locate UHD devices on your system. \\ If left blank, the first UHD device found will be used. \\ -Used args to specify a specfic device. +Use the device address to specify a specific device. USRP2 Example: addr=192.168.10.2 USRP1 Example: serial=12345678 diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 80a6a588a..76f44a491 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -20,6 +20,10 @@ * Boston, MA 02110-1301, USA. */ +// Defined during configure; avoids trying to locate +// header files if UHD was not installed. +#ifdef GR_HAVE_UHD + //////////////////////////////////////////////////////////////////////// // Language independent exception handler //////////////////////////////////////////////////////////////////////// @@ -111,4 +115,6 @@ static const size_t ALL_MBOARDS; %goops %{ (use-modules (gnuradio gnuradio_core_runtime)) %} -#endif +#endif /* SWIGGUILE */ + +#endif /* GR_HAVE_UHD */ |