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/e100/e100_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/e100/e100_impl.cpp')
-rw-r--r-- | host/lib/usrp/e100/e100_impl.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/host/lib/usrp/e100/e100_impl.cpp b/host/lib/usrp/e100/e100_impl.cpp index e59df7708..5becaf5bb 100644 --- a/host/lib/usrp/e100/e100_impl.cpp +++ b/host/lib/usrp/e100/e100_impl.cpp @@ -110,6 +110,7 @@ static const uhd::dict<std::string, std::string> model_to_fpga_file_name = boost e100_impl::e100_impl(const uhd::device_addr_t &device_addr){ _tree = property_tree::make(); _type = device::USRP; + _ignore_cal_file = device_addr.has_key("ignore-cal-file"); //read the eeprom so we can determine the hardware _dev_i2c_iface = e100_ctrl::make_dev_i2c_iface(E100_I2C_DEV_NODE); @@ -549,9 +550,13 @@ void e100_impl::check_fpga_compat(void){ } void e100_impl::set_rx_fe_corrections(const double lo_freq){ - apply_rx_fe_corrections(this->get_tree()->subtree("/mboards/0"), "A", lo_freq); + if(not _ignore_cal_file){ + apply_rx_fe_corrections(this->get_tree()->subtree("/mboards/0"), "A", lo_freq); + } } void e100_impl::set_tx_fe_corrections(const double lo_freq){ - apply_tx_fe_corrections(this->get_tree()->subtree("/mboards/0"), "A", lo_freq); + if(not _ignore_cal_file){ + apply_tx_fe_corrections(this->get_tree()->subtree("/mboards/0"), "A", lo_freq); + } } |