diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-08-18 16:34:08 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-08-18 16:34:08 -0700 |
| commit | 3cbd3ffb5c3591c2c03d4297780654b4cfe0dc9a (patch) | |
| tree | d267c3edfe85562184e6308c26338de6100d0798 /host | |
| parent | 9b51084c27d8dd9c020dca2161b092587255e4a4 (diff) | |
| parent | 6cb54d84338a8d68b1725416eb120ec115fcad44 (diff) | |
| download | uhd-3cbd3ffb5c3591c2c03d4297780654b4cfe0dc9a.tar.gz uhd-3cbd3ffb5c3591c2c03d4297780654b4cfe0dc9a.tar.bz2 uhd-3cbd3ffb5c3591c2c03d4297780654b4cfe0dc9a.zip | |
Merge branch 'maint'
Diffstat (limited to 'host')
| -rw-r--r-- | host/cmake/debian/libuhd003.install | 1 | ||||
| -rw-r--r-- | host/utils/query_gpsdo_sensors.cpp | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/host/cmake/debian/libuhd003.install b/host/cmake/debian/libuhd003.install index 3de3b10a4..b13e00bd7 100644 --- a/host/cmake/debian/libuhd003.install +++ b/host/cmake/debian/libuhd003.install @@ -1 +1,2 @@ usr/lib/*/*.so.* +usr/share/uhd diff --git a/host/utils/query_gpsdo_sensors.cpp b/host/utils/query_gpsdo_sensors.cpp index 7c5728e39..7420e62e9 100644 --- a/host/utils/query_gpsdo_sensors.cpp +++ b/host/utils/query_gpsdo_sensors.cpp @@ -112,12 +112,12 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //Verify GPS sensors are present (i.e. EEPROM has been burnt) std::vector<std::string> sensor_names = usrp->get_mboard_sensor_names(0); - if(std::find(sensor_names.begin(), sensor_names.end(), "gps_locked") == sensor_names.end()) { - std::cout << boost::format("\ngps_locked sensor not found. This could mean that you have not installed the GPSDO correctly.\n\n"); - std::cout << boost::format("Visit one of these pages if the problem persists:\n"); - std::cout << boost::format(" * N2X0/E1X0: http://files.ettus.com/manual/page_gpsdo.html"); - std::cout << boost::format(" * X3X0: http://files.ettus.com/manual/page_gpsdo_x3x0.html\n\n"); - exit(EXIT_FAILURE); + if (std::find(sensor_names.begin(), sensor_names.end(), "gps_locked") == sensor_names.end()) { + std::cout << boost::format("\ngps_locked sensor not found. This could mean that you have not installed the GPSDO correctly.\n\n"); + std::cout << boost::format("Visit one of these pages if the problem persists:\n"); + std::cout << boost::format(" * N2X0/E1X0: http://files.ettus.com/manual/page_gpsdo.html\n"); + std::cout << boost::format(" * X3X0: http://files.ettus.com/manual/page_gpsdo_x3x0.html\n\n"); + return EXIT_FAILURE; } // Explicitly set time source to gpsdo |