summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Blum2011-11-03 21:38:26 -0700
committerJosh Blum2011-11-07 18:56:29 -0800
commitd04404e1dd647b2de0f711a6ccba92e9dc21b823 (patch)
tree19ad2e671712a96a37d8adb5b2c271d8b195f5b7
parentbf8984bac6551dc2a98d615431fb6c9b4bfb9f4e (diff)
downloadgnuradio-d04404e1dd647b2de0f711a6ccba92e9dc21b823.tar.gz
gnuradio-d04404e1dd647b2de0f711a6ccba92e9dc21b823.tar.bz2
gnuradio-d04404e1dd647b2de0f711a6ccba92e9dc21b823.zip
uhd: added docs and removed unimplemented options in grc files
-rw-r--r--gr-uhd/grc/gen_uhd_usrp_blocks.py35
1 files changed, 15 insertions, 20 deletions
diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py
index b57a6cfbe..67343541c 100644
--- a/gr-uhd/grc/gen_uhd_usrp_blocks.py
+++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py
@@ -95,16 +95,6 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
<opt>type:sc16</opt>
</option>
<option>
- <name>Real float32</name>
- <key>f32</key>
- <opt>type:f32</opt>
- </option>
- <option>
- <name>Real uint16</name>
- <key>s16</key>
- <opt>type:s16</opt>
- </option>
- <option>
<name>VITA word32</name>
<key>item32</key>
<opt>type:s32</opt>
@@ -134,14 +124,6 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
<name>Complex int8</name>
<key>sc8</key>
</option>
- <option>
- <name>Real int16</name>
- <key>s16</key>
- </option>
- <option>
- <name>Real int8</name>
- <key>s8</key>
- </option>
</param>
<param>
<name>Stream args</name>
@@ -156,8 +138,8 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
\#end if
</hide>
<option>
- <name>scaler=1024</name>
- <key>scaler=1024</key>
+ <name>scalar=1024</name>
+ <key>scalar=1024</key>
</option>
</param>
<param>
@@ -308,6 +290,19 @@ USRP1 Example: serial=12345678
USRP2 Example: addr=192.168.10.2
USRP2 Example: addr0=192.168.10.2, addr1=192.168.10.3
+$(direction.title()) Type:
+This parameter controls the data type of the stream in gnuradio.
+
+Wire Format:
+This parameter controls the form of the data over the bus/network. \
+Complex bytes may be used to trade off precision for bandwidth. \
+Not all formats are supported on all devices.
+
+Stream Args:
+Optional arguments to be passed in the UHD streamer object. \
+Streamer args is a list of key/value pairs; usage is determined by the implementation.
+Ex: the scalar key affects the scaling between 16 and 8 bit integers in sc8 wire format.
+
Num Motherboards:
Selects the number of USRP motherboards in this device configuration.