diff options
| author | Josh Blum <josh@joshknows.com> | 2010-09-22 17:40:02 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-09-22 17:40:02 -0700 |
| commit | 2831c9313d09685090cea531a177469b57792c9a (patch) | |
| tree | 6d770f8d9013b611ca6d34171ccecef9061f2772 | |
| parent | 385eafd8559b90a027604dd5c0ab734bea54f6d8 (diff) | |
uhd: tweaks and fixes, single wrapper working
| -rwxr-xr-x | gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py | 11 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_single_usrp_source.h | 2 |
2 files changed, 10 insertions, 3 deletions
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 0d13a8391e..1ad3c09273 100755 --- a/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py +++ b/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py @@ -22,11 +22,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA MAIN_TMPL = """\ <?xml version="1.0"?> <block> - <name>UHD Single USRP $sourk.title()</name> + <name>UHD: Single USRP $sourk.title()</name> <key>uhd_single_usrp_$(sourk)</key> <category>UHD</category> <import>from gnuradio import uhd</import> - <make>uhd.single_usrp_$(sourk)(\$nchan, \$dev_addr, uhd.io_type_t.\$type.type) + <make>uhd.single_usrp_$(sourk)(\$dev_addr, uhd.io_type_t.\$type.type) self.\$(id).set_subdev_spec(\$sd_spec) self.\$(id).set_samp_rate(\$samp_rate) #for $n in range($max_nchan) @@ -86,6 +86,13 @@ self.\$(id).set_antenna(\$ant$(n), $n) <key>dev_addr</key> <value>addr=192.168.10.2</value> <type>string</type> + <hide> + \#if \$dev_addr() + none + \#else + part + \#end if + </hide> </param> <param> <name>Subdev Spec</name> diff --git a/gr-uhd/lib/uhd_single_usrp_source.h b/gr-uhd/lib/uhd_single_usrp_source.h index 6634a9c2ab..5da7e2b9ab 100644 --- a/gr-uhd/lib/uhd_single_usrp_source.h +++ b/gr-uhd/lib/uhd_single_usrp_source.h @@ -27,7 +27,7 @@ class uhd_single_usrp_source; -boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_source( +boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_usrp_source( const std::string &args, const uhd::io_type_t::tid_t &type ); |