diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-05-23 10:29:53 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-05-23 10:29:53 -0700 |
| commit | 5cb67ced9b0735a6a7d0782c801ea0604153bef2 (patch) | |
| tree | c9b7f17399ba1faa8feb9fa4193608c01ecfc4e3 | |
| parent | 740abc0b59dbc2d28b37357fdc5ac621b2ecfbb2 (diff) | |
| parent | adc43ad162abee2c6a0ff7e79730d5916043f913 (diff) | |
Merge remote-tracking branch 'martin/uhd/clearer_grc_args'
| -rw-r--r-- | gr-uhd/grc/gen_uhd_usrp_blocks.py | 19 |
1 files 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 5981bb4c89..6490723589 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> |