summaryrefslogtreecommitdiff
path: root/gr-uhd/grc/gen_uhd_usrp_blocks.py
diff options
context:
space:
mode:
authorTom Rondeau2011-04-08 15:37:29 -0400
committerTom Rondeau2011-04-08 15:37:29 -0400
commit21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb (patch)
tree4e72909a051b0a4ac428252d15f34b53bcc986b6 /gr-uhd/grc/gen_uhd_usrp_blocks.py
parentd7093fd06d0ec37f6ba2841d202fe90f4fa3661e (diff)
parent5c358afd00347f5da7a59dd73ea79cd3df26659d (diff)
downloadgnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.tar.gz
gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.tar.bz2
gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.zip
Merge branch 'master' into constell_obj
Conflicts: gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h gr-audio-oss/src/Makefile.swig.gen gr-audio/swig/Makefile.swig.gen
Diffstat (limited to 'gr-uhd/grc/gen_uhd_usrp_blocks.py')
-rw-r--r--gr-uhd/grc/gen_uhd_usrp_blocks.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py
index 831d69fc4..8596e14a6 100644
--- a/gr-uhd/grc/gen_uhd_usrp_blocks.py
+++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py
@@ -65,7 +65,7 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
<callback>set_bandwidth(\$bw$(n), $n)</callback>
#end for
<param>
- <name>Input Type</name>
+ <name>$(direction.title())put Type</name>
<key>type</key>
<type>enum</type>
<option>
@@ -140,6 +140,7 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
<key>num_mboards</key>
<value>1</value>
<type>int</type>
+ <hide>part</hide>
#for $m in range(1, $max_mboards+1)
<option>
<name>$(m)</name>