diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-03-25 12:36:16 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-03-25 12:36:16 -0700 |
| commit | 70cf1da4bde1358a406ba40aab707643ad6407b9 (patch) | |
| tree | 610e4b6bdb560aecfdae3d5d4ee8d008919405af /host/utils | |
| parent | c6c7acd8a63244b032d7e59f767f311f9bb0d522 (diff) | |
| parent | 8bfc4f541c083a60d27113897b0e7bacbc395717 (diff) | |
| download | uhd-70cf1da4bde1358a406ba40aab707643ad6407b9.tar.gz uhd-70cf1da4bde1358a406ba40aab707643ad6407b9.tar.bz2 uhd-70cf1da4bde1358a406ba40aab707643ad6407b9.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/utils')
| -rw-r--r-- | host/utils/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | host/utils/query_gpsdo_sensors.cpp | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt index bf8d88799..6f72c97bc 100644 --- a/host/utils/CMakeLists.txt +++ b/host/utils/CMakeLists.txt @@ -192,4 +192,18 @@ IF(ENABLE_USRP2) ENDIF(ENABLE_USRP2) +######################################################################## +# Other files that are not utilities or executables +######################################################################## +IF(WIN32) + SET(windows_extra_files + FastSendDatagramThreshold.reg + ) + UHD_INSTALL( + FILES ${windows_extra_files} + DESTINATION ${PKG_DATA_DIR} + COMPONENT utilities + ) +ENDIF(WIN32) + ADD_SUBDIRECTORY(latency) diff --git a/host/utils/query_gpsdo_sensors.cpp b/host/utils/query_gpsdo_sensors.cpp index 4c17c6044..21d26e81e 100644 --- a/host/utils/query_gpsdo_sensors.cpp +++ b/host/utils/query_gpsdo_sensors.cpp @@ -1,5 +1,5 @@ // -// Copyright 2012,2014,2015 Ettus Research LLC +// Copyright 2012,2014-2016 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 @@ -158,7 +158,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //instruct the USRP to wait for the next PPS edge, then set the new time on the following PPS usrp->set_time_unknown_pps(next_pps_time); //allow some time to make sure the PPS has come… - boost::this_thread::sleep(boost::posix_time::seconds(1.1)); + boost::this_thread::sleep(boost::posix_time::milliseconds(1100)); //…then ask gps_seconds = usrp->get_mboard_sensor("gps_time").to_int(); pps_seconds = usrp->get_time_last_pps().to_ticks(1.0); |