[Commit-gnuradio] [gnuradio] 08/12: uhd: Nicer labels for device args and addres in GRC

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit adc43ad162abee2c6a0ff7e79730d5916043f913
Author: Martin Braun <address@hidden>
Date:   Sun May 18 21:37:11 2014 +0200

    uhd: Nicer labels for device args and addres in GRC
---
 gr-uhd/grc/gen_uhd_usrp_blocks.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py 
b/gr-uhd/grc/gen_uhd_usrp_blocks.py
index 5981bb4..6490723 100644
--- a/gr-uhd/grc/gen_uhd_usrp_blocks.py
+++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py
@@ -1,5 +1,5 @@
 """
-Copyright 2010-2011 Free Software Foundation, Inc.
+Copyright 2010-2011,2014 Free Software Foundation, Inc.
 
 This file is part of GNU Radio
 
@@ -27,7 +27,7 @@ MAIN_TMPL = """\
        <import>from gnuradio import uhd</import>
        <import>import time</import>
        <make>uhd.usrp_$(sourk)(
-       \$dev_addr,
+       ",".join((\$dev_addr, \$dev_args)),
        uhd.stream_args(
                cpu_format="\$type",
                \#if \$otw()
@@ -163,7 +163,7 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
                </hide>
        </param>
        <param>
-               <name>Device Addr</name>
+               <name>Device Address</name>
                <key>dev_addr</key>
                <value>""</value>
                <type>string</type>
@@ -176,6 +176,19 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
                </hide>
        </param>
        <param>
+               <name>Device Arguments</name>
+               <key>dev_args</key>
+               <value>""</value>
+               <type>string</type>
+               <hide>
+                       \#if \$dev_args()
+                               none
+                       \#else
+                               part
+                       \#end if
+               </hide>
+       </param>
+       <param>
                <name>Sync</name>
                <key>sync</key>
                <value></value>