diff options
| -rw-r--r-- | host/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | host/cmake/Modules/UHDPackage.cmake | 4 | ||||
| -rw-r--r-- | host/docs/sync.dox | 16 | ||||
| -rw-r--r-- | host/utils/uhd_config_info.cpp | 9 |
4 files changed, 19 insertions, 11 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index c388a2ada..643857708 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -50,6 +50,7 @@ IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") ELSE() MESSAGE(WARNING "\nCannot determine the version of the compiler selected to build UHD (GCC : ${CMAKE_CXX_COMPILER}). This build may or not work. We highly recommend using GCC version ${GCC_MIN_VERSION} or more recent.") ENDIF() + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og") ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -v diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index b9fcdf9ed..6c36407b9 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -1,5 +1,5 @@ # -# Copyright 2010-2014 Ettus Research LLC +# Copyright 2010-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 @@ -114,7 +114,7 @@ ENDIF() # Setup CPack General ######################################################################## SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ettus Research - USRP Hardware Driver") -SET(CPACK_PACKAGE_VENDOR "Ettus Research LLC") +SET(CPACK_PACKAGE_VENDOR "Ettus Research (National Instruments)") SET(CPACK_PACKAGE_CONTACT "Ettus Research <support@ettus.com>") SET(CPACK_PACKAGE_VERSION "${UHD_VERSION}") SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README.md) diff --git a/host/docs/sync.dox b/host/docs/sync.dox index 5a0870bea..8c609f407 100644 --- a/host/docs/sync.dox +++ b/host/docs/sync.dox @@ -64,10 +64,10 @@ synchronize multiple pairs of devices. \section sync_time Synchronizing the Device Time The purpose of the PPS signal is to synchronously latch a time into the -device. You can use the `set_time_next_pps(...)` function to either +device. You can use the uhd::multi_usrp::set_time_next_pps() function to either initialize the sample time to 0 or an absolute time, such as GPS time or UTC time. For the purposes of synchronizing devices, it doesn't matter -what time you initialize to when using `set_time_next_pps(...)`. +what time you initialize to when using uhd::multi_usrp::set_time_next_pps(). \subsection sync_time_reg Method 1 - poll the USRP time registers @@ -100,15 +100,13 @@ PPS edge, and the user can also parse this string to determine GPS time: usrp->set_time_next_pps(uhd::time_spec_t(gps_time+1)); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -\subsection sync_time_internalgps Method 3 - internal GPSDO +\subsection sync_time_mimocable Method 3 - MIMO cable -USRP devices with internal GPSDOs properly configured will automatically -configure themselves to set the VITA time to current UTC time. See \ref page_gpsdo -for more details. +Note: This only applies to USRP2 and N200/N210. This method does *not* +require a separate PPS input to the devices, but it is limited to +a total of 2 USRPs. -\subsection sync_time_mimocable Method 4 - MIMO cable - -A USRP device can synchronize its time to another USRP device via the +A USRP2 device can synchronize its time to another USRP device via the MIMO cable. Unlike the other methods, this does not use a real "pulse per second". Rather, the USRP device sends an encoded time message over the MIMO cable. The slave device will automatically synchronize to the diff --git a/host/utils/uhd_config_info.cpp b/host/utils/uhd_config_info.cpp index c4034e560..78fcb201b 100644 --- a/host/utils/uhd_config_info.cpp +++ b/host/utils/uhd_config_info.cpp @@ -17,6 +17,7 @@ #include <uhd/build_info.hpp> #include <uhd/version.hpp> +#include <uhd/utils/paths.hpp> #include <uhd/utils/safe_main.hpp> #include <boost/format.hpp> @@ -37,6 +38,8 @@ int UHD_SAFE_MAIN(int argc, char* argv[]) { ("install-prefix", "Print install prefix") ("boost-version", "Print Boost version") ("libusb-version", "Print libusb version") + ("pkg-path", "Print pkg path") + ("images-dir", "Print images dir") ("print-all", "Print everything") ("version", "Print this UHD build's version") ("help", "Print help message") @@ -85,6 +88,12 @@ int UHD_SAFE_MAIN(int argc, char* argv[]) { std::string _libusb_version = uhd::build_info::libusb_version(); std::cout << "Libusb version: " << (_libusb_version.empty() ? "N/A" : _libusb_version) << std::endl; } + if(vm.count("pkg-path") > 0 or print_all) { + std::cout << "Package path: " << uhd::get_pkg_path() << std::endl; + } + if(vm.count("images-dir") > 0 or print_all) { + std::cout << "Images directory: " << uhd::get_images_dir("") << std::endl; + } return EXIT_SUCCESS; } |