From d029af43c3367a4611185ade70639cc6b7cc5e3d Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 18 Oct 2010 14:09:23 -0700
Subject: uhd: created multi usrp grc wrapper generator, removed mimo gen and
checked in its generated files
---
gr-uhd/grc/uhd_mimo_sink.xml | 550 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 550 insertions(+)
create mode 100644 gr-uhd/grc/uhd_mimo_sink.xml
(limited to 'gr-uhd/grc/uhd_mimo_sink.xml')
diff --git a/gr-uhd/grc/uhd_mimo_sink.xml b/gr-uhd/grc/uhd_mimo_sink.xml
new file mode 100644
index 000000000..2f5f2011f
--- /dev/null
+++ b/gr-uhd/grc/uhd_mimo_sink.xml
@@ -0,0 +1,550 @@
+
+
+ UHD MIMO Sink
+ uhd_mimo_sink
+ UHD
+ from gnuradio import uhd
+ 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
+
+ set_samp_rate($samp_rate)
+ set_center_freq(0, $center_freq0)
+ set_gain(0, $gain0)
+ set_antenna(0, $ant0)
+ set_center_freq(1, $center_freq1)
+ set_gain(1, $gain1)
+ set_antenna(1, $ant1)
+ set_center_freq(2, $center_freq2)
+ set_gain(2, $gain2)
+ set_antenna(2, $ant2)
+ set_center_freq(3, $center_freq3)
+ set_gain(3, $gain3)
+ set_antenna(3, $ant3)
+ set_center_freq(4, $center_freq4)
+ set_gain(4, $gain4)
+ set_antenna(4, $ant4)
+ set_center_freq(5, $center_freq5)
+ set_gain(5, $gain5)
+ set_antenna(5, $ant5)
+ set_center_freq(6, $center_freq6)
+ set_gain(6, $gain6)
+ set_antenna(6, $ant6)
+ set_center_freq(7, $center_freq7)
+ set_gain(7, $gain7)
+ set_antenna(7, $ant7)
+
+ Input Type
+ type
+ enum
+
+
+
+
+ Num Channels
+ nchan
+ 2
+ int
+
+
+
+
+
+
+
+
+
+ Args
+ args
+ addr=192.168.10.2 192.168.20.2
+ string
+
+
+ Samp Rate (Sps)
+ samp_rate
+ samp_rate
+ real
+
+
+
+ Ch0: Subdev Spec
+ sd_spec0
+
+ string
+
+ #if not $nchan() > 0
+ all
+ #elif $sd_spec0()
+ none
+ #else
+ part
+ #end if
+
+
+
+ Ch0: Center Freq (Hz)
+ center_freq0
+ 0
+ real
+ #if $nchan() > 0 then 'none' else 'all'#
+
+
+ Ch0: Gain (dB)
+ gain0
+ 0
+ real
+ #if $nchan() > 0 then 'none' else 'all'#
+
+
+ Ch0: Antenna
+ ant0
+
+ string
+
+ #if not $nchan() > 0
+ all
+ #elif $ant0()
+ none
+ #else
+ part
+ #end if
+
+
+
+
+ Ch1: Subdev Spec
+ sd_spec1
+
+ string
+
+ #if not $nchan() > 1
+ all
+ #elif $sd_spec1()
+ none
+ #else
+ part
+ #end if
+
+
+
+ Ch1: Center Freq (Hz)
+ center_freq1
+ 0
+ real
+ #if $nchan() > 1 then 'none' else 'all'#
+
+
+ Ch1: Gain (dB)
+ gain1
+ 0
+ real
+ #if $nchan() > 1 then 'none' else 'all'#
+
+
+ Ch1: Antenna
+ ant1
+
+ string
+
+ #if not $nchan() > 1
+ all
+ #elif $ant1()
+ none
+ #else
+ part
+ #end if
+
+
+
+
+ Ch2: Subdev Spec
+ sd_spec2
+
+ string
+
+ #if not $nchan() > 2
+ all
+ #elif $sd_spec2()
+ none
+ #else
+ part
+ #end if
+
+
+
+ Ch2: Center Freq (Hz)
+ center_freq2
+ 0
+ real
+ #if $nchan() > 2 then 'none' else 'all'#
+
+
+ Ch2: Gain (dB)
+ gain2
+ 0
+ real
+ #if $nchan() > 2 then 'none' else 'all'#
+
+
+ Ch2: Antenna
+ ant2
+
+ string
+
+ #if not $nchan() > 2
+ all
+ #elif $ant2()
+ none
+ #else
+ part
+ #end if
+
+
+
+
+ Ch3: Subdev Spec
+ sd_spec3
+
+ string
+
+ #if not $nchan() > 3
+ all
+ #elif $sd_spec3()
+ none
+ #else
+ part
+ #end if
+
+
+
+ Ch3: Center Freq (Hz)
+ center_freq3
+ 0
+ real
+ #if $nchan() > 3 then 'none' else 'all'#
+
+
+ Ch3: Gain (dB)
+ gain3
+ 0
+ real
+ #if $nchan() > 3 then 'none' else 'all'#
+
+
+ Ch3: Antenna
+ ant3
+
+ string
+
+ #if not $nchan() > 3
+ all
+ #elif $ant3()
+ none
+ #else
+ part
+ #end if
+
+
+
+
+ Ch4: Subdev Spec
+ sd_spec4
+
+ string
+
+ #if not $nchan() > 4
+ all
+ #elif $sd_spec4()
+ none
+ #else
+ part
+ #end if
+
+
+
+ Ch4: Center Freq (Hz)
+ center_freq4
+ 0
+ real
+ #if $nchan() > 4 then 'none' else 'all'#
+
+
+ Ch4: Gain (dB)
+ gain4
+ 0
+ real
+ #if $nchan() > 4 then 'none' else 'all'#
+
+
+ Ch4: Antenna
+ ant4
+
+ string
+
+ #if not $nchan() > 4
+ all
+ #elif $ant4()
+ none
+ #else
+ part
+ #end if
+
+
+
+
+ Ch5: Subdev Spec
+ sd_spec5
+
+ string
+
+ #if not $nchan() > 5
+ all
+ #elif $sd_spec5()
+ none
+ #else
+ part
+ #end if
+
+
+
+ Ch5: Center Freq (Hz)
+ center_freq5
+ 0
+ real
+ #if $nchan() > 5 then 'none' else 'all'#
+
+
+ Ch5: Gain (dB)
+ gain5
+ 0
+ real
+ #if $nchan() > 5 then 'none' else 'all'#
+
+
+ Ch5: Antenna
+ ant5
+
+ string
+
+ #if not $nchan() > 5
+ all
+ #elif $ant5()
+ none
+ #else
+ part
+ #end if
+
+
+
+
+ Ch6: Subdev Spec
+ sd_spec6
+
+ string
+
+ #if not $nchan() > 6
+ all
+ #elif $sd_spec6()
+ none
+ #else
+ part
+ #end if
+
+
+
+ Ch6: Center Freq (Hz)
+ center_freq6
+ 0
+ real
+ #if $nchan() > 6 then 'none' else 'all'#
+
+
+ Ch6: Gain (dB)
+ gain6
+ 0
+ real
+ #if $nchan() > 6 then 'none' else 'all'#
+
+
+ Ch6: Antenna
+ ant6
+
+ string
+
+ #if not $nchan() > 6
+ all
+ #elif $ant6()
+ none
+ #else
+ part
+ #end if
+
+
+
+
+ Ch7: Subdev Spec
+ sd_spec7
+
+ string
+
+ #if not $nchan() > 7
+ all
+ #elif $sd_spec7()
+ none
+ #else
+ part
+ #end if
+
+
+
+ Ch7: Center Freq (Hz)
+ center_freq7
+ 0
+ real
+ #if $nchan() > 7 then 'none' else 'all'#
+
+
+ Ch7: Gain (dB)
+ gain7
+ 0
+ real
+ #if $nchan() > 7 then 'none' else 'all'#
+
+
+ Ch7: Antenna
+ ant7
+
+ string
+
+ #if not $nchan() > 7
+ all
+ #elif $ant7()
+ none
+ #else
+ part
+ #end if
+
+
+
+ 8 >= $nchan
+ $nchan >= 0
+
+ in
+ $type
+ $type.vlen
+ $nchan
+
+
+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.
+
+
--
cgit
From 1e5db4248e2488e0f1b44ac1405d78e16c2408d8 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 18 Oct 2010 16:13:10 -0700
Subject: uhd: work on multi usrp blocks, use block tree to categorize blocks,
deprecate mimo blocks
---
gr-uhd/grc/uhd_mimo_sink.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'gr-uhd/grc/uhd_mimo_sink.xml')
diff --git a/gr-uhd/grc/uhd_mimo_sink.xml b/gr-uhd/grc/uhd_mimo_sink.xml
index 2f5f2011f..13865c913 100644
--- a/gr-uhd/grc/uhd_mimo_sink.xml
+++ b/gr-uhd/grc/uhd_mimo_sink.xml
@@ -1,8 +1,7 @@
- UHD MIMO Sink
+ UHD MIMO Sink (DEPRECATED)
uhd_mimo_sink
- UHD
from gnuradio import uhd
uhd.mimo_sink($nchan, $args, uhd.io_type_t.$type.type)
self.$(id).set_samp_rate_all($samp_rate)
--
cgit