diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-05-19 17:43:48 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-05-19 17:43:48 -0700 |
| commit | f34e0beab103ff21315c7d417a68501a7722ef7d (patch) | |
| tree | 19e0968b3caf670fe6d678ecf3553a74a506916b | |
| parent | 6842e836e17d782bb13e0958de543478298c73d7 (diff) | |
| parent | 1aa5d7e2360d2d3d6e843ebe970cd89a9ecc3c0b (diff) | |
| download | uhd-f34e0beab103ff21315c7d417a68501a7722ef7d.tar.gz uhd-f34e0beab103ff21315c7d417a68501a7722ef7d.tar.bz2 uhd-f34e0beab103ff21315c7d417a68501a7722ef7d.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | host/examples/benchmark_rate.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 012135967..d6b91fc4c 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -453,8 +453,9 @@ UHD_INSTALL( # Handle pre-built UHD Images for packaging ######################################################################## IF(DEFINED UHD_IMAGES_SRC_DIR AND EXISTS "${UHD_IMAGES_SRC_DIR}") + MESSAGE(STATUS "Reading images from directory `${UHD_IMAGES_SRC_DIR}'") FILE(GLOB_RECURSE _image_files "${UHD_IMAGES_SRC_DIR}/*") - MESSAGE(STATUS "Using images:") + MESSAGE(STATUS "These images files will be installed/packaged:") FOREACH(_img ${_image_files}) MESSAGE(STATUS " ${_img}") ENDFOREACH(_img) diff --git a/host/examples/benchmark_rate.cpp b/host/examples/benchmark_rate.cpp index e7abf76b3..f395b1062 100644 --- a/host/examples/benchmark_rate.cpp +++ b/host/examples/benchmark_rate.cpp @@ -31,7 +31,8 @@ namespace po = boost::program_options; -const double INIT_DELAY = 0.05; // 50mS initial delay before transmit +const double CLOCK_TIMEOUT = 1000; // 1000mS timeout for external clock locking +const double INIT_DELAY = 0.05; // 50mS initial delay before transmit //typedef boost::atomic<bool> atomic_bool; // We'll fake atomic bools for now, for more backward compat. // This is just an example, after all. @@ -335,7 +336,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ if(ref != "internal") { std::cout << "Now confirming lock on clock signals..." << std::endl; bool is_locked = false; - boost::system_time end_time = boost::get_system_time() + boost::posix_time::milliseconds(80); + boost::system_time end_time = boost::get_system_time() + boost::posix_time::milliseconds(CLOCK_TIMEOUT); for (int i = 0; i < num_mboards; i++) { if (ref == "mimo" and i == 0) continue; while((is_locked = usrp->get_mboard_sensor("ref_locked",i).to_bool()) == false and |