summaryrefslogtreecommitdiff
path: root/gr-uhd
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2018-12-16 12:41:18 -0800
committerMartin Braun <martin.braun@ettus.com>2018-12-17 17:37:59 -0800
commit2199c88b1b3b4e14e087409e2eba3112258102d8 (patch)
tree9a82f8052acb9f7e9a562dfff21c31769f83104d /gr-uhd
parentb76e7c429076064926bd85fa15d9bbf262f934a5 (diff)
uhd: Fix even more GRC binding issues
- The callback for gain would always use normalized gain, which would cause errors since the non-normalized gain range would cause exceptions - The "Show Command Port" menu was removed, it didn't work, but no other block has this.
Diffstat (limited to 'gr-uhd')
-rw-r--r--gr-uhd/grc/gen_uhd_usrp_blocks.py15
1 files changed, 1 insertions, 14 deletions
diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py
index c680098812..96ba6dbf3f 100644
--- a/gr-uhd/grc/gen_uhd_usrp_blocks.py
+++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py
@@ -114,7 +114,6 @@ inputs:
- domain: message
id: command
optional: true
- hide: ${'$'}{hide_cmd_port}
% if sourk == 'source':
outputs:
@@ -201,7 +200,7 @@ templates:
- set_samp_rate(${'$'}{samp_rate})
% for n in range(max_nchan):
- set_center_freq(${'$'}{${'center_freq' + str(n)}}, ${n})
- - self.${'$'}{id}.set_${'$'}{'normalized_' if bool(eval(norm_gain${n})) else ''}gain(${'$'}{${'gain' + str(n)}}, ${n})
+ - self.${'$'}{id}.set_${'$'}{'normalized_' if bool(eval(context.get('norm_gain${n}')())) else ''}gain(${'$'}{${'gain' + str(n)}}, ${n})
- ${'$'}{'set_lo_source(' + lo_source${n} + ', uhd.ALL_LOS, ${n})' if show_lo_controls else ''}
- ${'$'}{'set_lo_export_enabled(' + lo_export${n} + ', uhd.ALL_LOS, ${n})' if show_lo_controls else ''}
- set_antenna(${'$'}{${'ant' + str(n)}}, ${n})
@@ -358,17 +357,6 @@ PARAMS_TMPL = """
% endif
"""
-SHOW_CMD_PORT_PARAM = """
-- id: hide_cmd_port
- label: Show Command Port
- category: Advanced
- dtype: enum
- default: 'False'
- options: ['False', 'True']
- option_labels: ['Yes', 'No']
- hide: part
-"""
-
SHOW_LO_CONTROLS_PARAM = """
- id: show_lo_controls
label: Show LO Controls
@@ -414,7 +402,6 @@ if __name__ == '__main__':
parse_tmpl(PARAMS_TMPL, n=n, sourk=sourk)
for n in range(MAX_NUM_CHANNELS)
])
- params += SHOW_CMD_PORT_PARAM
params += SHOW_LO_CONTROLS_PARAM
if sourk == 'sink':
params += TSBTAG_PARAM