aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
Diffstat (limited to 'host')
-rw-r--r--host/CMakeLists.txt6
-rw-r--r--host/README.md38
-rw-r--r--host/cmake/Modules/UHDPackage.cmake2
-rw-r--r--host/cmake/Modules/UHDVersion.cmake2
-rw-r--r--host/lib/usrp/x300/x300_impl.cpp3
5 files changed, 45 insertions, 6 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index c45058562..b53e6208e 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -200,7 +200,7 @@ ADD_CUSTOM_TARGET(uninstall
# Install Package Docs
########################################################################
UHD_INSTALL(FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/../README.md
+ ${CMAKE_CURRENT_SOURCE_DIR}/README.md
${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
DESTINATION ${PKG_DOC_DIR}
COMPONENT readme
@@ -210,8 +210,8 @@ UHD_INSTALL(FILES
# Images download directory for utils/uhd_images_downloader.py
########################################################################
-SET(UHD_IMAGES_MD5SUM "02291061d617c7b398a0dbdcc11ca6b6")
-SET(UHD_IMAGES_DOWNLOAD_SRC "http://files.ettus.com/binaries/maint_images/archive/uhd-images_003.007.000-70-gfcc85c95.zip")
+SET(UHD_IMAGES_MD5SUM "6a51f54fb440860f3023fc888c6a5898")
+SET(UHD_IMAGES_DOWNLOAD_SRC "http://files.ettus.com/binaries/maint_images/archive/uhd-images_003.007.001-release.zip")
########################################################################
# Register top level components
diff --git a/host/README.md b/host/README.md
new file mode 100644
index 000000000..e80b10b49
--- /dev/null
+++ b/host/README.md
@@ -0,0 +1,38 @@
+Host UHD™ Software Source Code
+============================================
+
+This directory tree contains the source code that builds the UHD software
+library on your host computer. This library contains the drivers for all Ettus
+Research products, and the framework and API that make them usable to
+application-level programs. The UHD library runs entirely in user-space.
+
+## Documentation
+
+For documentation, please refer to the following resources:
+
+For technical documentation related UHD check out the
+[UHD Manual](http://files.ettus.com/uhd_docs/manual/html/).
+
+If you are looking for API documentation, check out the following resources:
+
+* [Doxygen](http://files.ettus.com/uhd_docs/doxygen/html/index.html)
+* [Coding to the API](http://files.ettus.com/uhd_docs/manual/html/coding.html)
+* [Device Streaming](http://files.ettus.com/uhd_docs/manual/html/stream.html)
+
+Additionally, be sure to check out the Ettus Research
+[FAQ](http://www.ettus.com/kb/detail/frequently-asked-questions), and the
+[Knowledge Base](http://www.ettus.com/kb) for useful application notes and
+tutorials.
+
+## Support
+
+If you have purchased an Ettus Research USRP™ product and need technical support
+using the device or using this UHD™ software, please e-mail the `USRP-Users`
+mailing list, which is where Ettus Research, and our community, provide support
+to users.
+
+Note that you must be *subscribed* to the list in order to post a message to the
+list. This is to prevent spammers from just sending garbage messages out over
+the listserve.
+
+* [Ettus Research USRP-Users Mailing List](http://lists.ettus.com/mailman/listinfo/usrp-users_lists.ettus.com)
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake
index a98a52fc7..8422c24d6 100644
--- a/host/cmake/Modules/UHDPackage.cmake
+++ b/host/cmake/Modules/UHDPackage.cmake
@@ -99,7 +99,7 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ettus Research - USRP Hardware Driver")
SET(CPACK_PACKAGE_VENDOR "Ettus Research LLC")
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)
+SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README.md)
SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
########################################################################
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake
index 41c3ac20b..0fc12d257 100644
--- a/host/cmake/Modules/UHDVersion.cmake
+++ b/host/cmake/Modules/UHDVersion.cmake
@@ -27,7 +27,7 @@ FIND_PACKAGE(Git QUIET)
########################################################################
SET(UHD_VERSION_MAJOR 003)
SET(UHD_VERSION_MINOR 007)
-SET(UHD_VERSION_PATCH 000)
+SET(UHD_VERSION_PATCH 001)
########################################################################
# Set up trimmed version numbers for DLL resource files and packages
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp
index f5e53678c..6a9de1f30 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -1387,7 +1387,8 @@ void x300_impl::update_time_source(mboard_members_t &mb, const std::string &sour
//check for valid pps
if (!is_pps_present(mb.zpu_ctrl))
{
- throw uhd::runtime_error((boost::format("The %d PPS was not detected. Please check the PPS source and try again.") % source).str());
+ // TODO - Implement intelligent PPS detection
+ /* throw uhd::runtime_error((boost::format("The %d PPS was not detected. Please check the PPS source and try again.") % source).str()); */
}
}