summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/b200
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2014-06-25 14:56:20 -0700
committermichael-west <michael.west@ettus.com>2014-06-25 14:56:20 -0700
commitbca5edb57979983a9eb8d6cd1016961552ad217c (patch)
tree887f28c8271a035209af5824ffa7b1d4410afe53 /host/lib/usrp/b200
parent96c30a11f2924fcb5f914f2922506fe6cfdd93ec (diff)
downloaduhd-bca5edb57979983a9eb8d6cd1016961552ad217c.tar.gz
uhd-bca5edb57979983a9eb8d6cd1016961552ad217c.tar.bz2
uhd-bca5edb57979983a9eb8d6cd1016961552ad217c.zip
Fix for BUG #492: UHD: set_time_unknown_pps() fails with GPSDO installed
- Added polling for PPS time change after setting time from GPSDO.
Diffstat (limited to 'host/lib/usrp/b200')
-rw-r--r--host/lib/usrp/b200/b200_impl.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp
index 261183128..f2b3885e6 100644
--- a/host/lib/usrp/b200/b200_impl.cpp
+++ b/host/lib/usrp/b200/b200_impl.cpp
@@ -477,6 +477,11 @@ b200_impl::b200_impl(const device_addr_t &device_addr)
UHD_MSG(status) << "Initializing time to the internal GPSDO" << std::endl;
const time_t tp = time_t(_gps->get_sensor("gps_time").to_int()+1);
_tree->access<time_spec_t>(mb_path / "time" / "pps").set(time_spec_t(tp));
+
+ //wait for next PPS edge (timeout after 1 second)
+ time_spec_t pps_time = _tree->access<time_spec_t>(mb_path / "time" / "pps").get();
+ for (size_t i = 0; i < 10 && _tree->access<time_spec_t>(mb_path / "time" / "pps").get() == pps_time; i++)
+ boost::this_thread::sleep(boost::posix_time::milliseconds(100));
}
}