diff options
author | michael-west <michael.west@ettus.com> | 2014-08-08 17:40:54 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2014-08-18 22:52:53 +0200 |
commit | 8055ac0d4f10c8c13709d49fedcc66615e472a79 (patch) | |
tree | 0e47c9967061e45f22630c5e8e4e8ab7288be317 /host/lib/usrp/usrp2 | |
parent | 7297ebffc344cce30f2570b1587beae94adeed1e (diff) | |
download | uhd-8055ac0d4f10c8c13709d49fedcc66615e472a79.tar.gz uhd-8055ac0d4f10c8c13709d49fedcc66615e472a79.tar.bz2 uhd-8055ac0d4f10c8c13709d49fedcc66615e472a79.zip |
- Fixes for channel alignment
- Added analog delay for radio clock
- Added analog delay for DAC reference clocks
- Removed resetting of clock control
- Removed setting of reference clock and PPS to external sources during initialization
- Fixes for set_time_unknown_pps
- Removed wait for PPS edge after setting time from GPSDO
- Changed set_time_unknonw_pps to time out based on system time rather than device VITA time
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 7c478d8e1..d96a8ab7d 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -763,11 +763,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)); } } |