diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2014-08-15 16:06:28 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2014-09-02 12:08:36 +0200 |
| commit | da018c53b473428bc5a53134136db24bdc3cf4dc (patch) | |
| tree | 2d8c7670613930b25fca080e2a7912cbabcc508b /host/lib/usrp/x300/x300_impl.cpp | |
| parent | c219cee65a691792154e0ae2cdf9d81e539b1da8 (diff) | |
| download | uhd-da018c53b473428bc5a53134136db24bdc3cf4dc.tar.gz uhd-da018c53b473428bc5a53134136db24bdc3cf4dc.tar.bz2 uhd-da018c53b473428bc5a53134136db24bdc3cf4dc.zip | |
Give user the option to ignore daughterboard's calibration file at runtime
* Add "ignore-cal-file" to the uhd::device_addr_t arguments
* Added documentation for new feature
Diffstat (limited to 'host/lib/usrp/x300/x300_impl.cpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index d5eacc3ea..a670f28c4 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -356,6 +356,7 @@ x300_impl::x300_impl(const uhd::device_addr_t &dev_addr) { UHD_MSG(status) << "X300 initialization sequence..." << std::endl; _type = device::USRP; + _ignore_cal_file = dev_addr.has_key("ignore-cal-file"); _async_md.reset(new async_md_type(1000/*messages deep*/)); _tree = uhd::property_tree::make(); _tree->create<std::string>("/name").set("X-Series Device"); @@ -1082,12 +1083,16 @@ void x300_impl::setup_radio(const size_t mb_i, const std::string &slot_name) void x300_impl::set_rx_fe_corrections(const uhd::fs_path &mb_path, const std::string &fe_name, const double lo_freq) { - apply_rx_fe_corrections(this->get_tree()->subtree(mb_path), fe_name, lo_freq); + if(not _ignore_cal_file){ + apply_rx_fe_corrections(this->get_tree()->subtree(mb_path), fe_name, lo_freq); + } } void x300_impl::set_tx_fe_corrections(const uhd::fs_path &mb_path, const std::string &fe_name, const double lo_freq) { - apply_tx_fe_corrections(this->get_tree()->subtree(mb_path), fe_name, lo_freq); + if(not _ignore_cal_file){ + apply_tx_fe_corrections(this->get_tree()->subtree(mb_path), fe_name, lo_freq); + } } boost::uint32_t get_pcie_dma_channel(boost::uint8_t destination, boost::uint8_t prefix) |