summaryrefslogtreecommitdiff
path: root/gr-uhd/grc
diff options
context:
space:
mode:
Diffstat (limited to 'gr-uhd/grc')
-rw-r--r--gr-uhd/grc/.gitignore2
-rw-r--r--gr-uhd/grc/Makefile.am22
-rwxr-xr-xgr-uhd/grc/gen_uhd_mimo_blocks_xml.py190
-rwxr-xr-xgr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py293
-rwxr-xr-xgr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py75
-rw-r--r--gr-uhd/grc/uhd_block_tree.xml23
-rw-r--r--gr-uhd/grc/uhd_mimo_sink.xml549
-rw-r--r--gr-uhd/grc/uhd_mimo_source.xml549
-rw-r--r--gr-uhd/grc/uhd_simple_sink.xml1
-rw-r--r--gr-uhd/grc/uhd_simple_source.xml1
10 files changed, 1495 insertions, 210 deletions
diff --git a/gr-uhd/grc/.gitignore b/gr-uhd/grc/.gitignore
index c95275d8d..d8ab9bd0c 100644
--- a/gr-uhd/grc/.gitignore
+++ b/gr-uhd/grc/.gitignore
@@ -1,4 +1,4 @@
-/uhd_mimo*.xml
+/uhd_multi*.xml
/uhd_single*.xml
/Makefile
/Makefile.in
diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am
index a19a28f03..d424ca709 100644
--- a/gr-uhd/grc/Makefile.am
+++ b/gr-uhd/grc/Makefile.am
@@ -23,31 +23,37 @@ include $(top_srcdir)/Makefile.common
grcblocksdir = $(grc_blocksdir)
-generated_uhd_mimo_blocks = \
- uhd_mimo_source.xml \
- uhd_mimo_sink.xml
+generated_uhd_multi_usrp_blocks = \
+ uhd_multi_usrp_source.xml \
+ uhd_multi_usrp_sink.xml
generated_uhd_single_usrp_blocks = \
uhd_single_usrp_source.xml \
uhd_single_usrp_sink.xml
BUILT_SOURCES = \
- $(generated_uhd_mimo_blocks) \
+ $(generated_uhd_multi_usrp_blocks) \
$(generated_uhd_single_usrp_blocks)
dist_grcblocks_DATA = \
- $(BUILT_SOURCES) \
+ uhd_block_tree.xml \
+ $(BUILT_SOURCES)
+
+# add the deprecated files
+dist_grcblocks_DATA += \
+ uhd_mimo_source.xml \
+ uhd_mimo_sink.xml \
uhd_simple_source.xml \
uhd_simple_sink.xml
########################################################################
-# Rules for generating the mimo source and sink blocks
+# Rules for generating the source and sink xml wrappers
########################################################################
EXTRA_DIST = \
- $(srcdir)/gen_uhd_mimo_blocks_xml.py \
+ $(srcdir)/gen_uhd_multi_usrp_blocks_xml.py \
$(srcdir)/gen_uhd_single_usrp_blocks_xml.py
-$(generated_uhd_mimo_blocks): $(srcdir)/gen_uhd_mimo_blocks_xml.py
+$(generated_uhd_multi_usrp_blocks): $(srcdir)/gen_uhd_multi_usrp_blocks_xml.py
@echo "generating $@..."
$(PYTHON) $< $@
diff --git a/gr-uhd/grc/gen_uhd_mimo_blocks_xml.py b/gr-uhd/grc/gen_uhd_mimo_blocks_xml.py
deleted file mode 100755
index 7e61563cc..000000000
--- a/gr-uhd/grc/gen_uhd_mimo_blocks_xml.py
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/usr/bin/env python
-"""
-Copyright 2010 Free Software Foundation, Inc.
-
-This file is part of GNU Radio
-
-GNU Radio Companion is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-GNU Radio Companion is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-"""
-
-MAIN_TMPL = """\
-<?xml version="1.0"?>
-<block>
- <name>UHD MIMO $sourk.title()</name>
- <key>uhd_mimo_$(sourk)</key>
- <category>UHD</category>
- <import>from gnuradio import uhd</import>
- <make>uhd.mimo_$(sourk)(\$nchan, \$args, uhd.io_type_t.\$type.type)
-self.\$(id).set_samp_rate_all(\$samp_rate)
-#for $n in range($max_nchan)
-\#if \$nchan() > $n
-self.\$(id).set_subdev_spec($n, \$sd_spec$(n))
-self.\$(id).set_center_freq($n, \$center_freq$(n))
-self.\$(id).set_gain($n, \$gain$(n))
- \#if \$ant$(n)()
-self.\$(id).set_antenna($n, \$ant$(n))
- \#end if
-\#end if
-#end for
-</make>
- <callback>set_samp_rate(\$samp_rate)</callback>
- #for $n in range($max_nchan)
- <callback>set_center_freq($n, \$center_freq$(n))</callback>
- <callback>set_gain($n, \$gain$(n))</callback>
- <callback>set_antenna($n, \$ant$(n))</callback>
- #end for
- <param>
- <name>Input Type</name>
- <key>type</key>
- <type>enum</type>
- <option>
- <name>Complex</name>
- <key>complex</key>
- <opt>type:COMPLEX_FLOAT32</opt>
- <opt>vlen:1</opt>
- </option>
- <option>
- <name>Short</name>
- <key>short</key>
- <opt>type:COMPLEX_INT16</opt>
- <opt>vlen:2</opt>
- </option>
- </param>
- <param>
- <name>Num Channels</name>
- <key>nchan</key>
- <value>2</value>
- <type>int</type>
- #for $n in range(2, $max_nchan+1)
- <option>
- <name>$n Channels</name>
- <key>$n</key>
- </option>
- #end for
- </param>
- <param>
- <name>Args</name>
- <key>args</key>
- <value>addr=192.168.10.2 192.168.20.2</value>
- <type>string</type>
- </param>
- <param>
- <name>Samp Rate (Sps)</name>
- <key>samp_rate</key>
- <value>samp_rate</value>
- <type>real</type>
- </param>
- $params
- <check>$max_nchan >= \$nchan</check>
- <check>\$nchan >= 0</check>
- <$sourk>
- <name>$direction</name>
- <type>\$type</type>
- <vlen>\$type.vlen</vlen>
- <nports>\$nchan</nports>
- </$sourk>
- <doc>
-The UHD $sourk.title() Block:
-
-Args:
-Args 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
-
-Sample rate:
-The sample rate is the number of samples per second input by this block. \\
-The UHD device driver will try its best to match the requested sample rate. \\
-If the requested rate is not possible, the UHD block will print an error at runtime.
-
-Antenna:
-For subdevices/daughterboards with only one antenna, this may be left blank. \\
-Otherwise, the user should specify one of the possible antenna choices. \\
-See the daughterboard application notes for the possible antenna choices.
- </doc>
-</block>
-"""
-
-PARAMS_TMPL = """
- <param>
- <name>Ch$(n): Subdev Spec</name>
- <key>sd_spec$(n)</key>
- <value></value>
- <type>string</type>
- <hide>
- \#if not \$nchan() > $n
- all
- \#elif \$sd_spec$(n)()
- none
- \#else
- part
- \#end if
- </hide>
- </param>
- <param>
- <name>Ch$(n): Center Freq (Hz)</name>
- <key>center_freq$(n)</key>
- <value>0</value>
- <type>real</type>
- <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
- </param>
- <param>
- <name>Ch$(n): Gain (dB)</name>
- <key>gain$(n)</key>
- <value>0</value>
- <type>real</type>
- <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
- </param>
- <param>
- <name>Ch$(n): Antenna</name>
- <key>ant$(n)</key>
- <value></value>
- <type>string</type>
- <hide>
- \#if not \$nchan() > $n
- all
- \#elif \$ant$(n)()
- none
- \#else
- part
- \#end if
- </hide>
- </param>
-"""
-
-def parse_tmpl(_tmpl, **kwargs):
- from Cheetah import Template
- return str(Template.Template(_tmpl, kwargs))
-
-max_num_channels = 8
-
-if __name__ == '__main__':
- import sys
- for file in sys.argv[1:]:
- if 'source' in file:
- sourk = 'source'
- direction = 'out'
- elif 'sink' in file:
- sourk = 'sink'
- direction = 'in'
- else: raise Exception, 'is %s a source or sink?'%file
-
- params = ''.join([parse_tmpl(PARAMS_TMPL, n=n) for n in range(max_num_channels)])
- open(file, 'w').write(parse_tmpl(MAIN_TMPL,
- max_nchan=max_num_channels,
- params=params,
- sourk=sourk,
- direction=direction,
- ))
diff --git a/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py b/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py
new file mode 100755
index 000000000..112d88159
--- /dev/null
+++ b/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py
@@ -0,0 +1,293 @@
+#!/usr/bin/env python
+"""
+Copyright 2010 Free Software Foundation, Inc.
+
+This file is part of GNU Radio
+
+GNU Radio Companion is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+GNU Radio Companion is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+"""
+
+MAIN_TMPL = """\
+<?xml version="1.0"?>
+<block>
+ <name>UHD: Multi USRP $sourk.title()</name>
+ <key>uhd_multi_usrp_$(sourk)</key>
+ <import>from gnuradio import uhd</import>
+ <make>uhd.multi_usrp_$(sourk)(
+ device_addr=\$dev_addr,
+ io_type=uhd.io_type_t.\$type.type,
+ num_channels=\$nchan,
+)
+\#if \$sync()
+_clk_cfg = uhd.clock_config_t()
+_clk_cfg.ref_source = uhd.clock_config_t.REF_SMA
+_clk_cfg.pps_source = uhd.clock_config_t.PPS_SMA
+_clk_cfg.pps_polarity = uhd.clock_config_t.PPS_POS
+self.\$(id).set_clock_config(_clk_cfg, uhd.ALL_MBOARDS);
+self.\$(id).set_time_unknown_pps(uhd.time_spec_t())
+\#end if
+#for $m in range($max_mboards)
+\#if \$num_mboards() > $m and \$sd_spec$(m)()
+self.\$(id).set_subdev_spec(\$sd_spec$(m), $m)
+\#end if
+#end for
+self.\$(id).set_samp_rate(\$samp_rate)
+#for $n in range($max_nchan)
+\#if \$nchan() > $n
+self.\$(id).set_center_freq(\$center_freq$(n), $n)
+self.\$(id).set_gain(\$gain$(n), $n)
+ \#if \$ant$(n)()
+self.\$(id).set_antenna(\$ant$(n), $n)
+ \#end if
+ \#if \$bw$(n)()
+self.\$(id).set_bandwidth(\$bw$(n), $n)
+ \#end if
+\#end if
+#end for
+</make>
+ <callback>set_samp_rate(\$samp_rate)</callback>
+ #for $n in range($max_nchan)
+ <callback>set_center_freq(\$center_freq$(n), $n)</callback>
+ <callback>set_gain(\$gain$(n), $n)</callback>
+ <callback>set_antenna(\$ant$(n), $n)</callback>
+ <callback>set_bandwidth(\$bw$(n), $n)</callback>
+ #end for
+ <param>
+ <name>Input Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>type:COMPLEX_FLOAT32</opt>
+ <opt>vlen:1</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>type:COMPLEX_INT16</opt>
+ <opt>vlen:2</opt>
+ </option>
+ </param>
+ <param>
+ <name>Device Addr</name>
+ <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>Sync</name>
+ <key>sync</key>
+ <value>sync</value>
+ <type>enum</type>
+ <hide>\#if \$sync() then 'none' else 'part'#</hide>
+ <option>
+ <name>unknown PPS</name>
+ <key>sync</key>
+ </option>
+ <option>
+ <name>don't sync</name>
+ <key></key>
+ </option>
+ </param>
+ <param>
+ <name>Num Mboards</name>
+ <key>num_mboards</key>
+ <value>2</value>
+ <type>int</type>
+ #for $m in range(1, $max_mboards+1)
+ <option>
+ <name>$(m)</name>
+ <key>$m</key>
+ </option>
+ #end for
+ </param>
+ #for $m in range($max_mboards)
+ <param>
+ <name>Mb$(m): Subdev Spec</name>
+ <key>sd_spec$(m)</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ \#if not \$num_mboards() > $m
+ all
+ \#elif \$sd_spec$(m)()
+ none
+ \#else
+ part
+ \#end if
+ </hide>
+ </param>
+ #end for
+ <param>
+ <name>Num Channels</name>
+ <key>nchan</key>
+ <value>2</value>
+ <type>int</type>
+ #for $n in range(1, $max_nchan+1)
+ <option>
+ <name>$(n)</name>
+ <key>$n</key>
+ </option>
+ #end for
+ </param>
+ <param>
+ <name>Samp Rate (Sps)</name>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ <type>real</type>
+ </param>
+ $params
+ <check>$max_nchan >= \$nchan</check>
+ <check>\$nchan > 0</check>
+ <check>$max_mboards >= \$num_mboards</check>
+ <check>\$num_mboards > 0</check>
+ <check>\$nchan >= \$num_mboards</check>
+ <$sourk>
+ <name>$direction</name>
+ <type>\$type</type>
+ <vlen>\$type.vlen</vlen>
+ <nports>\$nchan</nports>
+ </$sourk>
+ <doc>
+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
+
+Num Motherboards:
+Selects the number of USRP motherboards in this multi-USRP configuration.
+
+Subdevice specification:
+Each motherboard should have its own subdevice specification \\
+and all subdevice specifications should be the same length. \\
+Select the subdevice or subdevices for each channel using a markup string. \\
+The markup string consists of a list of dboard_slot:subdev_name pairs (one pair per channel). \\
+If left blank, the UHD will try to select the first subdevice on your system. \\
+See the application notes for further details.
+Single channel example: :AB
+Dual channel example: :A :B
+
+Num Channels:
+Selects the total number of channels in this multi-USRP configuration.
+Ex: 4 motherboards with 2 channels per board = 8 channels total
+
+Sample rate:
+The sample rate is the number of samples per second input by this block. \\
+The UHD device driver will try its best to match the requested sample rate. \\
+If the requested rate is not possible, the UHD block will print an error at runtime.
+
+Center frequency:
+The center frequency is the overall frequency of the RF chain. \\
+For greater control of how the UHD tunes elements in the RF chain, \\
+pass a tune_request_t object rather than a simple target frequency.
+Tuning with an LO offset example: uhd.tune_request_t(freq, lo_off)
+
+Antenna:
+For subdevices with only one antenna, this may be left blank. \\
+Otherwise, the user should specify one of the possible antenna choices. \\
+See the daughterboard application notes for the possible antenna choices.
+
+Bandwidth:
+To use the default bandwidth filter setting, this should be zero. \\
+Only certain subdevices have configurable bandwidth filters. \\
+See the daughterboard application notes for possible configurations.
+ </doc>
+</block>
+"""
+
+PARAMS_TMPL = """
+ <param>
+ <name>Ch$(n): Center Freq (Hz)</name>
+ <key>center_freq$(n)</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch$(n): Gain (dB)</name>
+ <key>gain$(n)</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch$(n): Antenna</name>
+ <key>ant$(n)</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ \#if not \$nchan() > $n
+ all
+ \#elif \$ant$(n)()
+ none
+ \#else
+ part
+ \#end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch$(n): Bandwidth (Hz)</name>
+ <key>bw$(n)</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>
+ \#if not \$nchan() > $n
+ all
+ \#elif \$bw$(n)()
+ none
+ \#else
+ part
+ \#end if
+ </hide>
+ </param>
+"""
+
+def parse_tmpl(_tmpl, **kwargs):
+ from Cheetah import Template
+ return str(Template.Template(_tmpl, kwargs))
+
+max_num_mboards = 4
+max_num_channels = max_num_mboards*4
+
+if __name__ == '__main__':
+ import sys
+ for file in sys.argv[1:]:
+ if 'source' in file:
+ sourk = 'source'
+ direction = 'out'
+ elif 'sink' in file:
+ sourk = 'sink'
+ direction = 'in'
+ else: raise Exception, 'is %s a source or sink?'%file
+
+ params = ''.join([parse_tmpl(PARAMS_TMPL, n=n) for n in range(max_num_channels)])
+ open(file, 'w').write(parse_tmpl(MAIN_TMPL,
+ max_nchan=max_num_channels,
+ max_mboards=max_num_mboards,
+ params=params,
+ sourk=sourk,
+ direction=direction,
+ ))
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 5b3cb5b5a..7337c71d7 100755
--- a/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py
+++ b/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py
@@ -24,10 +24,22 @@ MAIN_TMPL = """\
<block>
<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)(\$dev_addr, uhd.io_type_t.\$type.type, \$nchan)
+ <make>uhd.single_usrp_$(sourk)(
+ device_addr=\$dev_addr,
+ io_type=uhd.io_type_t.\$type.type,
+ num_channels=\$nchan,
+)
+\#if \$ref_clk()
+_clk_cfg = uhd.clock_config_t()
+_clk_cfg.ref_source = uhd.clock_config_t.REF_SMA
+_clk_cfg.pps_source = uhd.clock_config_t.PPS_SMA
+_clk_cfg.pps_polarity = uhd.clock_config_t.PPS_POS
+self.\$(id).set_clock_config(_clk_cfg);
+\#end if
+\#if \$sd_spec()
self.\$(id).set_subdev_spec(\$sd_spec)
+\#end if
self.\$(id).set_samp_rate(\$samp_rate)
#for $n in range($max_nchan)
\#if \$nchan() > $n
@@ -36,6 +48,9 @@ self.\$(id).set_gain(\$gain$(n), $n)
\#if \$ant$(n)()
self.\$(id).set_antenna(\$ant$(n), $n)
\#end if
+ \#if \$bw$(n)()
+self.\$(id).set_bandwidth(\$bw$(n), $n)
+ \#end if
\#end if
#end for
</make>
@@ -44,6 +59,7 @@ self.\$(id).set_antenna(\$ant$(n), $n)
<callback>set_center_freq(\$center_freq$(n), $n)</callback>
<callback>set_gain(\$gain$(n), $n)</callback>
<callback>set_antenna(\$ant$(n), $n)</callback>
+ <callback>set_bandwidth(\$bw$(n), $n)</callback>
#end for
<param>
<name>Input Type</name>
@@ -95,6 +111,21 @@ self.\$(id).set_antenna(\$ant$(n), $n)
</hide>
</param>
<param>
+ <name>Ref Clock</name>
+ <key>ref_clk</key>
+ <value></value>
+ <type>enum</type>
+ <hide>\#if \$ref_clk() then 'none' else 'part'#</hide>
+ <option>
+ <name>External</name>
+ <key>ext</key>
+ </option>
+ <option>
+ <name>Internal</name>
+ <key></key>
+ </option>
+ </param>
+ <param>
<name>Subdev Spec</name>
<key>sd_spec</key>
<value></value>
@@ -115,7 +146,7 @@ self.\$(id).set_antenna(\$ant$(n), $n)
</param>
$params
<check>$max_nchan >= \$nchan</check>
- <check>\$nchan >= 0</check>
+ <check>\$nchan > 0</check>
<check>(len((\$sd_spec).split()) or 1) == \$nchan</check>
<$sourk>
<name>$direction</name>
@@ -133,11 +164,6 @@ Used args to specify a specfic device.
USRP2 Example: addr=192.168.10.2
USRP1 Example: serial=12345678
-Sample rate:
-The sample rate is the number of samples per second input by this block. \\
-The UHD device driver will try its best to match the requested sample rate. \\
-If the requested rate is not possible, the UHD block will print an error at runtime.
-
Subdevice specification:
Select the subdevice or subdevices for each channel using a markup string. \\
The markup string consists of a list of dboard_slot:subdev_name pairs (one pair per channel). \\
@@ -146,10 +172,26 @@ See the application notes for further details.
Single channel example: A:AB
Dual channel example: A:AB B:0
+Sample rate:
+The sample rate is the number of samples per second input by this block. \\
+The UHD device driver will try its best to match the requested sample rate. \\
+If the requested rate is not possible, the UHD block will print an error at runtime.
+
+Center frequency:
+The center frequency is the overall frequency of the RF chain. \\
+For greater control of how the UHD tunes elements in the RF chain, \\
+pass a tune_request_t object rather than a simple target frequency.
+Tuning with an LO offset example: uhd.tune_request_t(freq, lo_off)
+
Antenna:
-For subdevices/daughterboards with only one antenna, this may be left blank. \\
+For subdevices with only one antenna, this may be left blank. \\
Otherwise, the user should specify one of the possible antenna choices. \\
See the daughterboard application notes for the possible antenna choices.
+
+Bandwidth:
+To use the default bandwidth filter setting, this should be zero. \\
+Only certain subdevices have configurable bandwidth filters. \\
+See the daughterboard application notes for possible configurations.
</doc>
</block>
"""
@@ -184,6 +226,21 @@ PARAMS_TMPL = """
\#end if
</hide>
</param>
+ <param>
+ <name>Ch$(n): Bandwidth (Hz)</name>
+ <key>bw$(n)</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>
+ \#if not \$nchan() > $n
+ all
+ \#elif \$bw$(n)()
+ none
+ \#else
+ part
+ \#end if
+ </hide>
+ </param>
"""
def parse_tmpl(_tmpl, **kwargs):
diff --git a/gr-uhd/grc/uhd_block_tree.xml b/gr-uhd/grc/uhd_block_tree.xml
new file mode 100644
index 000000000..e8c4f069d
--- /dev/null
+++ b/gr-uhd/grc/uhd_block_tree.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Block Tree for uhd blocks.
+###################################################
+ -->
+<cat>
+ <name></name> <!-- Blank for Root Name -->
+ <cat>
+ <name>UHD</name>
+ <block>uhd_single_usrp_source</block>
+ <block>uhd_single_usrp_sink</block>
+ <block>uhd_multi_usrp_source</block>
+ <block>uhd_multi_usrp_sink</block>
+ </cat>
+ <cat>
+ <name>UHD (DEPRECATED)</name>
+ <block>uhd_simple_source</block>
+ <block>uhd_simple_sink</block>
+ <block>uhd_mimo_source</block>
+ <block>uhd_mimo_sink</block>
+ </cat>
+</cat>
diff --git a/gr-uhd/grc/uhd_mimo_sink.xml b/gr-uhd/grc/uhd_mimo_sink.xml
new file mode 100644
index 000000000..13865c913
--- /dev/null
+++ b/gr-uhd/grc/uhd_mimo_sink.xml
@@ -0,0 +1,549 @@
+<?xml version="1.0"?>
+<block>
+ <name>UHD MIMO Sink (DEPRECATED)</name>
+ <key>uhd_mimo_sink</key>
+ <import>from gnuradio import uhd</import>
+ <make>uhd.mimo_sink($nchan, $args, uhd.io_type_t.$type.type)
+self.$(id).set_samp_rate_all($samp_rate)
+#if $nchan() > 0
+self.$(id).set_subdev_spec(0, $sd_spec0)
+self.$(id).set_center_freq(0, $center_freq0)
+self.$(id).set_gain(0, $gain0)
+ #if $ant0()
+self.$(id).set_antenna(0, $ant0)
+ #end if
+#end if
+#if $nchan() > 1
+self.$(id).set_subdev_spec(1, $sd_spec1)
+self.$(id).set_center_freq(1, $center_freq1)
+self.$(id).set_gain(1, $gain1)
+ #if $ant1()
+self.$(id).set_antenna(1, $ant1)
+ #end if
+#end if
+#if $nchan() > 2
+self.$(id).set_subdev_spec(2, $sd_spec2)
+self.$(id).set_center_freq(2, $center_freq2)
+self.$(id).set_gain(2, $gain2)
+ #if $ant2()
+self.$(id).set_antenna(2, $ant2)
+ #end if
+#end if
+#if $nchan() > 3
+self.$(id).set_subdev_spec(3, $sd_spec3)
+self.$(id).set_center_freq(3, $center_freq3)
+self.$(id).set_gain(3, $gain3)
+ #if $ant3()
+self.$(id).set_antenna(3, $ant3)
+ #end if
+#end if
+#if $nchan() > 4
+self.$(id).set_subdev_spec(4, $sd_spec4)
+self.$(id).set_center_freq(4, $center_freq4)
+self.$(id).set_gain(4, $gain4)
+ #if $ant4()
+self.$(id).set_antenna(4, $ant4)
+ #end if
+#end if
+#if $nchan() > 5
+self.$(id).set_subdev_spec(5, $sd_spec5)
+self.$(id).set_center_freq(5, $center_freq5)
+self.$(id).set_gain(5, $gain5)
+ #if $ant5()
+self.$(id).set_antenna(5, $ant5)
+ #end if
+#end if
+#if $nchan() > 6
+self.$(id).set_subdev_spec(6, $sd_spec6)
+self.$(id).set_center_freq(6, $center_freq6)
+self.$(id).set_gain(6, $gain6)
+ #if $ant6()
+self.$(id).set_antenna(6, $ant6)
+ #end if
+#end if
+#if $nchan() > 7
+self.$(id).set_subdev_spec(7, $sd_spec7)
+self.$(id).set_center_freq(7, $center_freq7)
+self.$(id).set_gain(7, $gain7)
+ #if $ant7()
+self.$(id).set_antenna(7, $ant7)
+ #end if
+#end if
+</make>
+ <callback>set_samp_rate($samp_rate)</callback>
+ <callback>set_center_freq(0, $center_freq0)</callback>
+ <callback>set_gain(0, $gain0)</callback>
+ <callback>set_antenna(0, $ant0)</callback>
+ <callback>set_center_freq(1, $center_freq1)</callback>
+ <callback>set_gain(1, $gain1)</callback>
+ <callback>set_antenna(1, $ant1)</callback>
+ <callback>set_center_freq(2, $center_freq2)</callback>
+ <callback>set_gain(2, $gain2)</callback>
+ <callback>set_antenna(2, $ant2)</callback>
+ <callback>set_center_freq(3, $center_freq3)</callback>
+ <callback>set_gain(3, $gain3)</callback>
+ <callback>set_antenna(3, $ant3)</callback>
+ <callback>set_center_freq(4, $center_freq4)</callback>
+ <callback>set_gain(4, $gain4)</callback>
+ <callback>set_antenna(4, $ant4)</callback>
+ <callback>set_center_freq(5, $center_freq5)</callback>
+ <callback>set_gain(5, $gain5)</callback>
+ <callback>set_antenna(5, $ant5)</callback>
+ <callback>set_center_freq(6, $center_freq6)</callback>
+ <callback>set_gain(6, $gain6)</callback>
+ <callback>set_antenna(6, $ant6)</callback>
+ <callback>set_center_freq(7, $center_freq7)</callback>
+ <callback>set_gain(7, $gain7)</callback>
+ <callback>set_antenna(7, $ant7)</callback>
+ <param>
+ <name>Input Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>type:COMPLEX_FLOAT32</opt>
+ <opt>vlen:1</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>type:COMPLEX_INT16</opt>
+ <opt>vlen:2</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Channels</name>
+ <key>nchan</key>
+ <value>2</value>
+ <type>int</type>
+ <option>
+ <name>2 Channels</name>
+ <key>2</key>
+ </option>
+ <option>
+ <name>3 Channels</name>
+ <key>3</key>
+ </option>
+ <option>
+ <name>4 Channels</name>
+ <key>4</key>
+ </option>
+ <option>
+ <name>5 Channels</name>
+ <key>5</key>
+ </option>
+ <option>
+ <name>6 Channels</name>
+ <key>6</key>
+ </option>
+ <option>
+ <name>7 Channels</name>
+ <key>7</key>
+ </option>
+ <option>
+ <name>8 Channels</name>
+ <key>8</key>
+ </option>
+ </param>
+ <param>
+ <name>Args</name>
+ <key>args</key>
+ <value>addr=192.168.10.2 192.168.20.2</value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Samp Rate (Sps)</name>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ <type>real</type>
+ </param>
+
+ <param>
+ <name>Ch0: Subdev Spec</name>
+ <key>sd_spec0</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 0
+ all
+ #elif $sd_spec0()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch0: Center Freq (Hz)</name>
+ <key>center_freq0</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 0 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch0: Gain (dB)</name>
+ <key>gain0</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 0 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch0: Antenna</name>
+ <key>ant0</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 0
+ all
+ #elif $ant0()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch1: Subdev Spec</name>
+ <key>sd_spec1</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 1
+ all
+ #elif $sd_spec1()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch1: Center Freq (Hz)</name>
+ <key>center_freq1</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 1 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch1: Gain (dB)</name>
+ <key>gain1</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 1 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch1: Antenna</name>
+ <key>ant1</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 1
+ all
+ #elif $ant1()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch2: Subdev Spec</name>
+ <key>sd_spec2</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 2
+ all
+ #elif $sd_spec2()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch2: Center Freq (Hz)</name>
+ <key>center_freq2</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 2 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch2: Gain (dB)</name>
+ <key>gain2</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 2 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch2: Antenna</name>
+ <key>ant2</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 2
+ all
+ #elif $ant2()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch3: Subdev Spec</name>
+ <key>sd_spec3</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 3
+ all
+ #elif $sd_spec3()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch3: Center Freq (Hz)</name>
+ <key>center_freq3</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 3 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch3: Gain (dB)</name>
+ <key>gain3</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 3 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch3: Antenna</name>
+ <key>ant3</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 3
+ all
+ #elif $ant3()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch4: Subdev Spec</name>
+ <key>sd_spec4</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 4
+ all
+ #elif $sd_spec4()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch4: Center Freq (Hz)</name>
+ <key>center_freq4</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 4 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch4: Gain (dB)</name>
+ <key>gain4</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 4 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch4: Antenna</name>
+ <key>ant4</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 4
+ all
+ #elif $ant4()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch5: Subdev Spec</name>
+ <key>sd_spec5</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 5
+ all
+ #elif $sd_spec5()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch5: Center Freq (Hz)</name>
+ <key>center_freq5</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 5 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch5: Gain (dB)</name>
+ <key>gain5</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 5 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch5: Antenna</name>
+ <key>ant5</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 5
+ all
+ #elif $ant5()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch6: Subdev Spec</name>
+ <key>sd_spec6</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 6
+ all
+ #elif $sd_spec6()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch6: Center Freq (Hz)</name>
+ <key>center_freq6</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 6 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch6: Gain (dB)</name>
+ <key>gain6</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 6 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch6: Antenna</name>
+ <key>ant6</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 6
+ all
+ #elif $ant6()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch7: Subdev Spec</name>
+ <key>sd_spec7</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 7
+ all
+ #elif $sd_spec7()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch7: Center Freq (Hz)</name>
+ <key>center_freq7</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 7 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch7: Gain (dB)</name>
+ <key>gain7</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 7 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch7: Antenna</name>
+ <key>ant7</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 7
+ all
+ #elif $ant7()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <check>8 >= $nchan</check>
+ <check>$nchan >= 0</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$type.vlen</vlen>
+ <nports>$nchan</nports>
+ </sink>
+ <doc>
+The UHD Sink Block:
+
+Args:
+Args 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
+
+Sample rate:
+The sample rate is the number of samples per second input by this block. \
+The UHD device driver will try its best to match the requested sample rate. \
+If the requested rate is not possible, the UHD block will print an error at runtime.
+
+Antenna:
+For subdevices/daughterboards with only one antenna, this may be left blank. \
+Otherwise, the user should specify one of the possible antenna choices. \
+See the daughterboard application notes for the possible antenna choices.
+ </doc>
+</block>
diff --git a/gr-uhd/grc/uhd_mimo_source.xml b/gr-uhd/grc/uhd_mimo_source.xml
new file mode 100644
index 000000000..6167838b0
--- /dev/null
+++ b/gr-uhd/grc/uhd_mimo_source.xml
@@ -0,0 +1,549 @@
+<?xml version="1.0"?>
+<block>
+ <name>UHD MIMO Source (DEPRECATED)</name>
+ <key>uhd_mimo_source</key>
+ <import>from gnuradio import uhd</import>
+ <make>uhd.mimo_source($nchan, $args, uhd.io_type_t.$type.type)
+self.$(id).set_samp_rate_all($samp_rate)
+#if $nchan() > 0
+self.$(id).set_subdev_spec(0, $sd_spec0)
+self.$(id).set_center_freq(0, $center_freq0)
+self.$(id).set_gain(0, $gain0)
+ #if $ant0()
+self.$(id).set_antenna(0, $ant0)
+ #end if
+#end if
+#if $nchan() > 1
+self.$(id).set_subdev_spec(1, $sd_spec1)
+self.$(id).set_center_freq(1, $center_freq1)
+self.$(id).set_gain(1, $gain1)
+ #if $ant1()
+self.$(id).set_antenna(1, $ant1)
+ #end if
+#end if
+#if $nchan() > 2
+self.$(id).set_subdev_spec(2, $sd_spec2)
+self.$(id).set_center_freq(2, $center_freq2)
+self.$(id).set_gain(2, $gain2)
+ #if $ant2()
+self.$(id).set_antenna(2, $ant2)
+ #end if
+#end if
+#if $nchan() > 3
+self.$(id).set_subdev_spec(3, $sd_spec3)
+self.$(id).set_center_freq(3, $center_freq3)
+self.$(id).set_gain(3, $gain3)
+ #if $ant3()
+self.$(id).set_antenna(3, $ant3)
+ #end if
+#end if
+#if $nchan() > 4
+self.$(id).set_subdev_spec(4, $sd_spec4)
+self.$(id).set_center_freq(4, $center_freq4)
+self.$(id).set_gain(4, $gain4)
+ #if $ant4()
+self.$(id).set_antenna(4, $ant4)
+ #end if
+#end if
+#if $nchan() > 5
+self.$(id).set_subdev_spec(5, $sd_spec5)
+self.$(id).set_center_freq(5, $center_freq5)
+self.$(id).set_gain(5, $gain5)
+ #if $ant5()
+self.$(id).set_antenna(5, $ant5)
+ #end if
+#end if
+#if $nchan() > 6
+self.$(id).set_subdev_spec(6, $sd_spec6)
+self.$(id).set_center_freq(6, $center_freq6)
+self.$(id).set_gain(6, $gain6)
+ #if $ant6()
+self.$(id).set_antenna(6, $ant6)
+ #end if
+#end if
+#if $nchan() > 7
+self.$(id).set_subdev_spec(7, $sd_spec7)
+self.$(id).set_center_freq(7, $center_freq7)
+self.$(id).set_gain(7, $gain7)
+ #if $ant7()
+self.$(id).set_antenna(7, $ant7)
+ #end if
+#end if
+</make>
+ <callback>set_samp_rate($samp_rate)</callback>
+ <callback>set_center_freq(0, $center_freq0)</callback>
+ <callback>set_gain(0, $gain0)</callback>
+ <callback>set_antenna(0, $ant0)</callback>
+ <callback>set_center_freq(1, $center_freq1)</callback>
+ <callback>set_gain(1, $gain1)</callback>
+ <callback>set_antenna(1, $ant1)</callback>
+ <callback>set_center_freq(2, $center_freq2)</callback>
+ <callback>set_gain(2, $gain2)</callback>
+ <callback>set_antenna(2, $ant2)</callback>
+ <callback>set_center_freq(3, $center_freq3)</callback>
+ <callback>set_gain(3, $gain3)</callback>
+ <callback>set_antenna(3, $ant3)</callback>
+ <callback>set_center_freq(4, $center_freq4)</callback>
+ <callback>set_gain(4, $gain4)</callback>
+ <callback>set_antenna(4, $ant4)</callback>
+ <callback>set_center_freq(5, $center_freq5)</callback>
+ <callback>set_gain(5, $gain5)</callback>
+ <callback>set_antenna(5, $ant5)</callback>
+ <callback>set_center_freq(6, $center_freq6)</callback>
+ <callback>set_gain(6, $gain6)</callback>
+ <callback>set_antenna(6, $ant6)</callback>
+ <callback>set_center_freq(7, $center_freq7)</callback>
+ <callback>set_gain(7, $gain7)</callback>
+ <callback>set_antenna(7, $ant7)</callback>
+ <param>
+ <name>Input Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>type:COMPLEX_FLOAT32</opt>
+ <opt>vlen:1</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>type:COMPLEX_INT16</opt>
+ <opt>vlen:2</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Channels</name>
+ <key>nchan</key>
+ <value>2</value>
+ <type>int</type>
+ <option>
+ <name>2 Channels</name>
+ <key>2</key>
+ </option>
+ <option>
+ <name>3 Channels</name>
+ <key>3</key>
+ </option>
+ <option>
+ <name>4 Channels</name>
+ <key>4</key>
+ </option>
+ <option>
+ <name>5 Channels</name>
+ <key>5</key>
+ </option>
+ <option>
+ <name>6 Channels</name>
+ <key>6</key>
+ </option>
+ <option>
+ <name>7 Channels</name>
+ <key>7</key>
+ </option>
+ <option>
+ <name>8 Channels</name>
+ <key>8</key>
+ </option>
+ </param>
+ <param>
+ <name>Args</name>
+ <key>args</key>
+ <value>addr=192.168.10.2 192.168.20.2</value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Samp Rate (Sps)</name>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ <type>real</type>
+ </param>
+
+ <param>
+ <name>Ch0: Subdev Spec</name>
+ <key>sd_spec0</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 0
+ all
+ #elif $sd_spec0()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch0: Center Freq (Hz)</name>
+ <key>center_freq0</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 0 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch0: Gain (dB)</name>
+ <key>gain0</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 0 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch0: Antenna</name>
+ <key>ant0</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 0
+ all
+ #elif $ant0()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch1: Subdev Spec</name>
+ <key>sd_spec1</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 1
+ all
+ #elif $sd_spec1()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch1: Center Freq (Hz)</name>
+ <key>center_freq1</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 1 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch1: Gain (dB)</name>
+ <key>gain1</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 1 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch1: Antenna</name>
+ <key>ant1</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 1
+ all
+ #elif $ant1()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch2: Subdev Spec</name>
+ <key>sd_spec2</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 2
+ all
+ #elif $sd_spec2()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch2: Center Freq (Hz)</name>
+ <key>center_freq2</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 2 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch2: Gain (dB)</name>
+ <key>gain2</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 2 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch2: Antenna</name>
+ <key>ant2</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 2
+ all
+ #elif $ant2()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch3: Subdev Spec</name>
+ <key>sd_spec3</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 3
+ all
+ #elif $sd_spec3()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch3: Center Freq (Hz)</name>
+ <key>center_freq3</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 3 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch3: Gain (dB)</name>
+ <key>gain3</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 3 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch3: Antenna</name>
+ <key>ant3</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 3
+ all
+ #elif $ant3()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch4: Subdev Spec</name>
+ <key>sd_spec4</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 4
+ all
+ #elif $sd_spec4()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch4: Center Freq (Hz)</name>
+ <key>center_freq4</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 4 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch4: Gain (dB)</name>
+ <key>gain4</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 4 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch4: Antenna</name>
+ <key>ant4</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 4
+ all
+ #elif $ant4()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch5: Subdev Spec</name>
+ <key>sd_spec5</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 5
+ all
+ #elif $sd_spec5()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch5: Center Freq (Hz)</name>
+ <key>center_freq5</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 5 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch5: Gain (dB)</name>
+ <key>gain5</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 5 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch5: Antenna</name>
+ <key>ant5</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 5
+ all
+ #elif $ant5()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch6: Subdev Spec</name>
+ <key>sd_spec6</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 6
+ all
+ #elif $sd_spec6()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch6: Center Freq (Hz)</name>
+ <key>center_freq6</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 6 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch6: Gain (dB)</name>
+ <key>gain6</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 6 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch6: Antenna</name>
+ <key>ant6</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 6
+ all
+ #elif $ant6()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <param>
+ <name>Ch7: Subdev Spec</name>
+ <key>sd_spec7</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 7
+ all
+ #elif $sd_spec7()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+ <param>
+ <name>Ch7: Center Freq (Hz)</name>
+ <key>center_freq7</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 7 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch7: Gain (dB)</name>
+ <key>gain7</key>
+ <value>0</value>
+ <type>real</type>
+ <hide>#if $nchan() > 7 then 'none' else 'all'#</hide>
+ </param>
+ <param>
+ <name>Ch7: Antenna</name>
+ <key>ant7</key>
+ <value></value>
+ <type>string</type>
+ <hide>
+ #if not $nchan() > 7
+ all
+ #elif $ant7()
+ none
+ #else
+ part
+ #end if
+ </hide>
+ </param>
+
+ <check>8 >= $nchan</check>
+ <check>$nchan >= 0</check>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$type.vlen</vlen>
+ <nports>$nchan</nports>
+ </source>
+ <doc>
+The UHD Source Block:
+
+Args:
+Args 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
+
+Sample rate:
+The sample rate is the number of samples per second input by this block. \
+The UHD device driver will try its best to match the requested sample rate. \
+If the requested rate is not possible, the UHD block will print an error at runtime.
+
+Antenna:
+For subdevices/daughterboards with only one antenna, this may be left blank. \
+Otherwise, the user should specify one of the possible antenna choices. \
+See the daughterboard application notes for the possible antenna choices.
+ </doc>
+</block>
diff --git a/gr-uhd/grc/uhd_simple_sink.xml b/gr-uhd/grc/uhd_simple_sink.xml
index 66dc5bf14..ee6051432 100644
--- a/gr-uhd/grc/uhd_simple_sink.xml
+++ b/gr-uhd/grc/uhd_simple_sink.xml
@@ -7,7 +7,6 @@
<block>
<name>UHD Simple Sink (DEPRECATED)</name>
<key>uhd_simple_sink</key>
- <category>UHD</category>
<import>from gnuradio import uhd</import>
<make>uhd.simple_sink($args, uhd.io_type_t.$type.type)
self.$(id).set_subdev_spec($sd_spec)
diff --git a/gr-uhd/grc/uhd_simple_source.xml b/gr-uhd/grc/uhd_simple_source.xml
index 00c60f41d..825981d66 100644
--- a/gr-uhd/grc/uhd_simple_source.xml
+++ b/gr-uhd/grc/uhd_simple_source.xml
@@ -7,7 +7,6 @@
<block>
<name>UHD Simple Source (DEPRECATED)</name>
<key>uhd_simple_source</key>
- <category>UHD</category>
<import>from gnuradio import uhd</import>
<make>uhd.simple_source($args, uhd.io_type_t.$type.type)
self.$(id).set_subdev_spec($sd_spec)
generated by cgit (git 2.34.1) at 2025-01-11 22:11:41 +0000