[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/07: uhd: Rearranged GRC bindings for USR
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/07: uhd: Rearranged GRC bindings for USRP blocks |
|
Date: |
Fri, 4 Sep 2015 12:57:49 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 24bf23d75fb88e77f86f4ddd1990995fd41ecdfa
Author: Martin Braun <address@hidden>
Date: Fri Jun 12 15:10:07 2015 -0700
uhd: Rearranged GRC bindings for USRP blocks
- Better preselect options
- RF Options moved to own tab
- FE Corrections tab for rx corrections
- sc12 preselect
---
gr-uhd/grc/gen_uhd_usrp_blocks.py | 108 +++++++++++++++++++++++++++++++++++---
1 file changed, 100 insertions(+), 8 deletions(-)
diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py
b/gr-uhd/grc/gen_uhd_usrp_blocks.py
index 72f1b50..8531bc0 100644
--- a/gr-uhd/grc/gen_uhd_usrp_blocks.py
+++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py
@@ -81,6 +81,12 @@ self.\$(id).set_antenna(\$ant$(n), $n)
\#if \$bw$(n)()
self.\$(id).set_bandwidth(\$bw$(n), $n)
\#end if
+ \#if \$dc_offs_enb$(n)()
+self.\$(id).set_rx_dc_offset(\$dc_offs_enb$(n), $n)
+ \#end if
+ \#if \$iq_imbal_enb$(n)()
+self.\$(id).set_rx_iq_balance(\$iq_imbal_enb$(n), $n)
+ \#end if
\#end if
#end for
</make>
@@ -137,6 +143,10 @@ self.\$(id).set_gain(\$gain$(n), $n)
<key>sc16</key>
</option>
<option>
+ <name>Complex int12</name>
+ <key>sc12</key>
+ </option>
+ <option>
<name>Complex int8</name>
<key>sc8</key>
</option>
@@ -226,6 +236,22 @@ self.\$(id).set_gain(\$gain$(n), $n)
<name>Default</name>
<key>0.0</key>
</option>
+ <option>
+ <name>200 MHz</name>
+ <key>200e6</key>
+ </option>
+ <option>
+ <name>184.32 MHz</name>
+ <key>184.32e6</key>
+ </option>
+ <option>
+ <name>120 MHz</name>
+ <key>120e6</key>
+ </option>
+ <option>
+ <name>30.72 MHz</name>
+ <key>30.72e6</key>
+ </option>
</param>
<param>
<name>Num Mboards</name>
@@ -327,7 +353,8 @@ self.\$(id).set_gain(\$gain$(n), $n)
<sink>
<name>command</name>
<type>message</type>
- <optional>1</optional>
+ <optional>1</optional>
+ <hide>\$hide_cmd_port</hide>
</sink>
<$sourk>
<name>$direction</name>
@@ -420,13 +447,15 @@ PARAMS_TMPL = """
<value>0</value>
<type>real</type>
<hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
+ <tab>RF Options</tab>
</param>
<param>
- <name>Ch$(n): Gain Value</name>
+ <name>Ch$(n): Gain Value</name>
<key>gain$(n)</key>
<value>0</value>
<type>float</type>
<hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
+ <tab>RF Options</tab>
</param>
<param>
<name>Ch$(n): Gain Type</name>
@@ -448,6 +477,7 @@ PARAMS_TMPL = """
<name>Normalized</name>
<key>True</key>
</option>
+ <tab>RF Options</tab>
</param>
<param>
<name>Ch$(n): Antenna</name>
@@ -463,6 +493,17 @@ PARAMS_TMPL = """
part
\#end if
</hide>
+#if $sourk == 'sink'
+ <option>
+ <name>TX/RX</name>
+ <key>TX/RX</key>
+ </option>
+#end if
+ <option>
+ <name>RX2</name>
+ <key>RX2</key>
+ </option>
+ <tab>RF Options</tab>
</param>
<param>
<name>Ch$(n): Bandwidth (Hz)</name>
@@ -478,18 +519,68 @@ PARAMS_TMPL = """
part
\#end if
</hide>
+ <tab>RF Options</tab>
+ </param>
+#if $sourk == 'source'
+ <param>
+ <name>Ch$(n): Enable DC Offset Correction</name>
+ <key>dc_offs_enb$(n)</key>
+ <value>""</value>
+ <type>raw</type>
+ <hide>
+ \#if not \$nchan() > $n
+ all
+ \#else
+ part
+ \#end if
+ </hide>
+ <tab>FE Corrections</tab>
+ </param>
+ <param>
+ <name>Ch$(n): Enable IQ Imbalance Correction</name>
+ <key>iq_imbal_enb$(n)</key>
+ <value>""</value>
+ <type>raw</type>
+ <hide>
+ \#if not \$nchan() > $n
+ all
+ \#else
+ part
+ \#end if
+ </hide>
+ <tab>FE Corrections</tab>
+ </param>
+#end if
+"""
+
+SHOW_CMD_PORT_PARAM = """
+ <param>
+ <name>Show Command Port</name>
+ <key>hide_cmd_port</key>
+ <value>False</value>
+ <type>enum</type>
+ <hide>part</hide>
+ <option>
+ <name>Yes</name>
+ <key>False</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>True</key>
+ </option>
+ <tab>Advanced</tab>
</param>
"""
-LENTAG_PARAM = """ <param>
- <name>Length tag name</name>
+TSBTAG_PARAM = """ <param>
+ <name>TSB tag name</name>
<key>len_tag_name</key>
<value></value>
<type>string</type>
<hide>\#if len(str(\$len_tag_name())) then 'none' else
'part'#</hide>
</param>"""
-LENTAG_ARG = """
+TSBTAG_ARG = """
#if $len_tag_name()
$len_tag_name,
#end if"""
@@ -512,10 +603,11 @@ if __name__ == '__main__':
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)])
+ params = ''.join([parse_tmpl(PARAMS_TMPL, n=n, sourk=sourk) for
n in range(max_num_channels)])
+ params += SHOW_CMD_PORT_PARAM
if sourk == 'sink':
- params += LENTAG_PARAM
- lentag_arg = LENTAG_ARG
+ params += TSBTAG_PARAM
+ lentag_arg = TSBTAG_ARG
else: lentag_arg = ''
open(file, 'w').write(parse_tmpl(MAIN_TMPL,
lentag_arg=lentag_arg,
- [Commit-gnuradio] [gnuradio] branch master updated (7d1ead9 -> 80d5255), git, 2015/09/04
- [Commit-gnuradio] [gnuradio] 05/07: Merge remote-tracking branch 'mbr0wn/uhd/usrp_block_grc', git, 2015/09/04
- [Commit-gnuradio] [gnuradio] 07/07: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg', git, 2015/09/04
- [Commit-gnuradio] [gnuradio] 04/07: gr-qtgui: default font size of the colorbar title in the Waterfall plot was never set. Now set to font size 18., git, 2015/09/04
- [Commit-gnuradio] [gnuradio] 06/07: Merge remote-tracking branch 'saikwolf/qt_themeing', git, 2015/09/04
- [Commit-gnuradio] [gnuradio] 02/07: grc: refactor FlowGraph.py(s), git, 2015/09/04
- [Commit-gnuradio] [gnuradio] 03/07: grc: sort blocks in export_data(), draw disabled blocks first (fixes #830), git, 2015/09/04
- [Commit-gnuradio] [gnuradio] 01/07: uhd: Rearranged GRC bindings for USRP blocks,
git <=