diff options
| author | Martin Braun <martin.braun@ettus.com> | 2021-03-08 16:57:39 +0100 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2021-03-11 09:17:41 -0800 |
| commit | ffc11b931ce769d6cdeacca69e829142d5c462f9 (patch) | |
| tree | 0cceac4ae1d4ba6bf53e6042a91bd42bc4c30574 /gr-uhd/grc/gen_uhd_usrp_blocks.py | |
| parent | 48b9b7b760bd078a7ed206063d6fb78970bc52ac (diff) | |
uhd: Fix generation of FE correction functions
The DC offset and IQ balance functions were incorrectly implemented in
the GRC blocks: It was possible to force-enable, but not force-disable
them. Also, the underlying Python/C++ API allowed changing the actual
correction value, but the GRC did not.
Now, there are four options for IQ and DC:
- Default: Whatever UHD does by default
- Auto: Enable auto-correction
- Disabled: No correction
- Manual: Allows setting the correction value separately
Signed-off-by: Martin Braun <martin@gnuradio.org>
Diffstat (limited to 'gr-uhd/grc/gen_uhd_usrp_blocks.py')
| -rw-r--r-- | gr-uhd/grc/gen_uhd_usrp_blocks.py | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py index d9a7d6e478..aba1f3a223 100644 --- a/gr-uhd/grc/gen_uhd_usrp_blocks.py +++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py @@ -205,11 +205,15 @@ templates: self.${'$'}{id}.set_gain(${'$'}{${'gain' + str(n)}}, ${n}) ${'%'} endif ${'%'} endif # if rx_agc${n} != 'Enabled' - ${'%'} if context.get('dc_offs_enb${n}')(): - self.${'$'}{id}.set_auto_dc_offset(${'$'}{${'dc_offs_enb' + str(n)}}, ${n}) + ${'%'} if context.get('dc_offs_enb${n}')() in ('auto', 'disabled'): + self.${'$'}{id}.set_auto_dc_offset(${'$'}{True if ${'dc_offs_enb' + str(n)} == 'auto' else False}, ${n}) + ${'%'} elif context.get('dc_offs_enb${n}')() == 'manual': + self.${'$'}{id}.set_dc_offset(${'$'}{${'dc_offs' + str(n)}}, ${n}) ${'%'} endif - ${'%'} if context.get('iq_imbal_enb${n}')(): - self.${'$'}{id}.set_auto_iq_balance(${'$'}{${'iq_imbal_enb' + str(n)}}, ${n}) + ${'%'} if context.get('iq_imbal_enb${n}')() in ('auto', 'disabled'): + self.${'$'}{id}.set_auto_iq_balance(${'$'}{True if ${'iq_imbal_enb' + str(n)} == 'auto' else False}, ${n}) + ${'%'} elif context.get('iq_imbal_enb${n}')() == 'manual': + self.${'$'}{id}.set_iq_balance(${'$'}{${'iq_imbal' + str(n)}}, ${n}) ${'%'} endif % else: ${'%'} if context.get('gain_type' + '${n}')() == 'normalized': @@ -525,15 +529,29 @@ PARAMS_TMPL = """ - id: dc_offs_enb${n} label: 'Ch${n}: Enable DC Offset Correction' category: FE Corrections - dtype: raw - default: '""' + dtype: enum + options: [default, auto, disabled, manual] + option_labels: [Default, Automatic, Disabled, Manual] hide: ${'$'}{ 'all' if not nchan > ${n} else 'part'} +- id: dc_offs${n} + label: 'Ch${n}: DC Offset Correction Value' + category: FE Corrections + dtype: complex + default: 0+0j + hide: ${'$'}{ 'all' if not dc_offs_enb${n} == 'manual' else 'part'} - id: iq_imbal_enb${n} label: 'Ch${n}: Enable IQ Imbalance Correction' category: FE Corrections - dtype: raw - default: '""' + dtype: enum + options: [default, auto, disabled, manual] + option_labels: [Default, Automatic, Disabled, Manual] hide: ${'$'}{ 'all' if not nchan > ${n} else 'part'} +- id: iq_imbal${n} + label: 'Ch${n}: IQ imbalance Correction Value' + category: FE Corrections + dtype: complex + default: 0+0j + hide: ${'$'}{ 'all' if not iq_imbal_enb${n} == 'manual' else 'part'} % endif """ |