From da018c53b473428bc5a53134136db24bdc3cf4dc Mon Sep 17 00:00:00 2001
From: Nicholas Corgan <nick.corgan@ettus.com>
Date: Fri, 15 Aug 2014 16:06:28 -0700
Subject: 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
---
 host/lib/usrp/b100/b100_impl.cpp | 9 +++++++--
 host/lib/usrp/b100/b100_impl.hpp | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'host/lib/usrp/b100')

diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp
index 26b0a5aea..24a87a3c8 100644
--- a/host/lib/usrp/b100/b100_impl.cpp
+++ b/host/lib/usrp/b100/b100_impl.cpp
@@ -150,6 +150,7 @@ b100_impl::b100_impl(const device_addr_t &device_addr){
 
     _type = device::USRP;
     _tree = property_tree::make();
+    _ignore_cal_file = device_addr.has_key("ignore-cal-file");
 
     //extract the FPGA path for the B100
     std::string b100_fpga_image = find_image_path(
@@ -609,9 +610,13 @@ sensor_value_t b100_impl::get_ref_locked(void){
 }
 
 void b100_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 b100_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);
+    }
 }
diff --git a/host/lib/usrp/b100/b100_impl.hpp b/host/lib/usrp/b100/b100_impl.hpp
index b6752681e..59ea2202e 100644
--- a/host/lib/usrp/b100/b100_impl.hpp
+++ b/host/lib/usrp/b100/b100_impl.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2011-2013 Ettus Research LLC
+// Copyright 2011-2014 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -127,6 +127,7 @@ private:
     //dboard stuff
     uhd::usrp::dboard_manager::sptr _dboard_manager;
     uhd::usrp::dboard_iface::sptr _dboard_iface;
+    bool _ignore_cal_file;
 
     std::vector<boost::weak_ptr<uhd::rx_streamer> > _rx_streamers;
     std::vector<boost::weak_ptr<uhd::tx_streamer> > _tx_streamers;
-- 
cgit v1.2.3