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/usrp2 | |
| 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/usrp2')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index 2ad15aade..93885fbd3 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -764,11 +764,6 @@ usrp2_impl::usrp2_impl(const device_addr_t &_device_addr){ UHD_MSG(status) << "Initializing time to the internal GPSDO" << std::endl; const time_t tp = time_t(_mbc[mb].gps->get_sensor("gps_time").to_int()+1); _tree->access<time_spec_t>(root / "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>(root / "time" / "pps").get(); - for (size_t i = 0; i < 10 && _tree->access<time_spec_t>(root / "time" / "pps").get() == pps_time; i++) - boost::this_thread::sleep(boost::posix_time::milliseconds(100)); } } |