diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-09-05 20:05:23 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-09-05 20:05:23 -0700 |
| commit | 5d29a17c12d19ebc5f4494b8ae1be77568b235e7 (patch) | |
| tree | c4864a49a6088ec2a04265cd63bb6d5f47285228 /gr-uhd/grc/gen_uhd_usrp_blocks.py | |
| parent | 45c0feeaeffde561758a4d92bf4463d60b85633a (diff) | |
Revert "uhd: Rearranged GRC bindings for USRP blocks"
This reverts commit 24bf23d75fb88e77f86f4ddd1990995fd41ecdfa.
Diffstat (limited to 'gr-uhd/grc/gen_uhd_usrp_blocks.py')
| -rw-r--r-- | gr-uhd/grc/gen_uhd_usrp_blocks.py | 108 |
1 files changed, 8 insertions, 100 deletions
diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py index 8531bc05c2..72f1b50135 100644 --- a/gr-uhd/grc/gen_uhd_usrp_blocks.py +++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py @@ -81,12 +81,6 @@ 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> @@ -143,10 +137,6 @@ 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> @@ -236,22 +226,6 @@ 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> @@ -353,8 +327,7 @@ self.\$(id).set_gain(\$gain$(n), $n) <sink> <name>command</name> <type>message</type> - <optional>1</optional> - <hide>\$hide_cmd_port</hide> + <optional>1</optional> </sink> <$sourk> <name>$direction</name> @@ -447,15 +420,13 @@ 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> @@ -477,7 +448,6 @@ PARAMS_TMPL = """ <name>Normalized</name> <key>True</key> </option> - <tab>RF Options</tab> </param> <param> <name>Ch$(n): Antenna</name> @@ -493,17 +463,6 @@ 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> @@ -519,68 +478,18 @@ 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> """ -TSBTAG_PARAM = """ <param> - <name>TSB tag name</name> +LENTAG_PARAM = """ <param> + <name>Length 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>""" -TSBTAG_ARG = """ +LENTAG_ARG = """ #if $len_tag_name() $len_tag_name, #end if""" @@ -603,11 +512,10 @@ if __name__ == '__main__': direction = 'in' else: raise Exception, 'is %s a source or sink?'%file - params = ''.join([parse_tmpl(PARAMS_TMPL, n=n, sourk=sourk) for n in range(max_num_channels)]) - params += SHOW_CMD_PORT_PARAM + params = ''.join([parse_tmpl(PARAMS_TMPL, n=n) for n in range(max_num_channels)]) if sourk == 'sink': - params += TSBTAG_PARAM - lentag_arg = TSBTAG_ARG + params += LENTAG_PARAM + lentag_arg = LENTAG_ARG else: lentag_arg = '' open(file, 'w').write(parse_tmpl(MAIN_TMPL, lentag_arg=lentag_arg, |