aboutsummaryrefslogtreecommitdiffstats
path: root/host/examples
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2017-03-01 16:39:08 -0800
committerMartin Braun <martin.braun@ettus.com>2017-03-01 16:39:08 -0800
commitda26a3e34ece4a68ddc3542644308c406a162683 (patch)
treec390929a21b8ccaeb4d79dc75b59a57c300c2865 /host/examples
parent79a797d5b376fbfa51ffcd42d57956e83b4903c9 (diff)
parent5ca309a86e8d99f3431bfd0116579e7d57bf64a7 (diff)
downloaduhd-da26a3e34ece4a68ddc3542644308c406a162683.tar.gz
uhd-da26a3e34ece4a68ddc3542644308c406a162683.tar.bz2
uhd-da26a3e34ece4a68ddc3542644308c406a162683.zip
Merge branch 'maint'
Diffstat (limited to 'host/examples')
-rw-r--r--host/examples/sync_to_gps.cpp3
-rw-r--r--host/examples/test_messages.cpp8
2 files changed, 6 insertions, 5 deletions
diff --git a/host/examples/sync_to_gps.cpp b/host/examples/sync_to_gps.cpp
index f27c3eff5..3a9b5c7e4 100644
--- a/host/examples/sync_to_gps.cpp
+++ b/host/examples/sync_to_gps.cpp
@@ -99,7 +99,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[])
std::cout << "LOCKED" << std::endl;
} else {
std::cout << "FAILED" << std::endl;
- throw uhd::runtime_error("Failed to lock to GPSDO 10 MHz Reference");
+ std::cout << "Failed to lock to GPSDO 10 MHz Reference. Exiting." << std::endl;
+ exit(EXIT_FAILURE);
}
}
else
diff --git a/host/examples/test_messages.cpp b/host/examples/test_messages.cpp
index 2583811ba..8a50e4c85 100644
--- a/host/examples/test_messages.cpp
+++ b/host/examples/test_messages.cpp
@@ -73,8 +73,8 @@ bool test_late_command_message(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streame
default:
std::cout << boost::format(
"failed:\n"
- " Got unexpected error code 0x%x, nsamps %u.\n"
- ) % md.error_code % nsamps << std::endl;
+ " Got unexpected error code 0x%x (%s), nsamps %u.\n"
+ ) % md.error_code % md.strerror() % nsamps << std::endl;
return false;
}
}
@@ -121,8 +121,8 @@ bool test_broken_chain_message(UHD_UNUSED(uhd::usrp::multi_usrp::sptr usrp), uhd
default:
std::cout << boost::format(
"failed:\n"
- " Got unexpected error code 0x%x.\n"
- ) % md.error_code << std::endl;
+ " Got unexpected error code 0x%x (%s).\n"
+ ) % md.error_code % md.strerror() << std::endl;
return false;
}
}