Merge branch 'bugfix/enumeration_timeout' into 'devel'

Increased enumeration timeout. Fixes enumeration failure on faster computers.

See merge request software/libbarrett!48

Author: Brian Zenowich

Diff for: CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/). 
 
+## [dev-3.0.1]
+
+- Increased enumeration timeout from 1 ms to 5 ms
+
 ## [dev-3.0.0]
 
 - Python3 support
@@ -14,5 +18,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Improved mutex handling for non-rt operation
 - Offered Top10 tactile values from BHand for higher update rates
 
+[dev-3.0.1]: https://git.barrett.com/software/libbarrett/-/tags/dev-3.0.1
 [dev-3.0.0]: https://git.barrett.com/software/libbarrett/-/tags/dev-3.0.0
 

Diff for: CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6)
 project(libbarrett)
 set(libbarrett_VERSION_MAJOR 3)
 set(libbarrett_VERSION_MINOR 0)
-set(libbarrett_VERSION_PATCH 0)
+set(libbarrett_VERSION_PATCH 1)
 set(libbarrett_VERSION "${libbarrett_VERSION_MAJOR}.${libbarrett_VERSION_MINOR}.${libbarrett_VERSION_PATCH}")
 set(libbarrett_SOVERSION "${libbarrett_VERSION_MAJOR}.${libbarrett_VERSION_MINOR}")
 

Diff for: include/barrett/products/puck.h

@@ -115,10 +115,10 @@ class Puck {
 	template<typename Parser> static void getProperty(
 			const bus::CommunicationsBus& bus, int id, int propId, typename Parser::result_type* result, bool realtime = false);
 	static int tryGetProperty(const bus::CommunicationsBus& bus, int id, int propId,
-			int* result, double timeout_s = 0.001);
+			int* result, double timeout_s = 0.005);
 	template<typename Parser> static int tryGetProperty(
 			const bus::CommunicationsBus& bus, int id, int propId, typename Parser::result_type* result,
-			double timeout_s = 0.001);
+			double timeout_s = 0.005);
 	static void setProperty(const bus::CommunicationsBus& bus, int id, int propId,
 			int value, bool blocking = false);