diff options
author | Mark Meserve <mark.meserve@ni.com> | 2019-02-20 15:04:05 -0600 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2019-02-22 09:26:28 -0800 |
commit | 056faab862e97ca9949c13790ab88ec50543000f (patch) | |
tree | ff1e8f7a889653715f78759085b40ec6947be42a /host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp | |
parent | 9271d5a00b9764d1b76ddffa6e8ec61b895f0375 (diff) | |
download | uhd-056faab862e97ca9949c13790ab88ec50543000f.tar.gz uhd-056faab862e97ca9949c13790ab88ec50543000f.tar.bz2 uhd-056faab862e97ca9949c13790ab88ec50543000f.zip |
rh: revise correction data usage
- UHD's calibration utilities use the LO frequency, so this is the
frequency we should be using too.
- Disables loaded corrections in lowband, as the utilities will not
generate valid corrections at these frequencies. Manual corrections
can still be added via the property tree.
- Changed corrections logging to include frequency and less certainty
of the correction file's existence.
Diffstat (limited to 'host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp')
-rw-r--r-- | host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp index 8567229d8..405862485 100644 --- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp +++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp @@ -264,7 +264,9 @@ void rhodium_radio_ctrl_impl::set_tx_lo_source( throw uhd::value_error(str(boost::format("set_tx_lo_source was called with an invalid LO source: %s Valid sources are [internal, external]") % src)); } - _update_corrections(src, get_tx_frequency(0), TX_DIRECTION); + const bool enable_corrections = not _is_tx_lowband(get_tx_frequency(0)) + and src == "internal"; + _update_corrections(get_tx_frequency(0), TX_DIRECTION, enable_corrections); _tx_lo_source = src; } @@ -295,7 +297,9 @@ void rhodium_radio_ctrl_impl::set_rx_lo_source( throw uhd::value_error(str(boost::format("set_rx_lo_source was called with an invalid LO source: %s Valid sources for LO1 are [internal, external]") % src)); } - _update_corrections(src, get_rx_frequency(0), RX_DIRECTION); + const bool enable_corrections = not _is_rx_lowband(get_rx_frequency(0)) + and src == "internal"; + _update_corrections(get_rx_frequency(0), RX_DIRECTION, enable_corrections); _rx_lo_source = src; } |