diff options
author | Martin Braun <martin.braun@ettus.com> | 2014-08-18 23:05:48 +0200 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2014-08-18 23:05:48 +0200 |
commit | 83249208bdc17603358019be0910d0a74ec41085 (patch) | |
tree | 1520ee3b13e2e42776faa2803b15627b050ac7fd /host/lib/usrp/b200 | |
parent | 90fd966e25b0947483defbe5e3a7247e00c06619 (diff) | |
parent | 9bf965c804022e876c4ca5382db4849257c6222d (diff) | |
download | uhd-83249208bdc17603358019be0910d0a74ec41085.tar.gz uhd-83249208bdc17603358019be0910d0a74ec41085.tar.bz2 uhd-83249208bdc17603358019be0910d0a74ec41085.zip |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/b200')
-rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 393da2d04..7c85176ef 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -475,11 +475,6 @@ 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)); } else { //init to internal clock and time source _tree->access<std::string>(mb_path / "clock_source/value").set("internal"); |