fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 19:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed timeouts in uavcan_linux::BlockingServiceClient

Browse Source
This commit is contained in:
Pavel Kirienko
2014-07-15 14:18:22 +04:00
parent 476d8b8513
commit 9d36eef359
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/linux/include/uavcan_linux/helpers.hpp
+12 -12
View File
@@ -67,9 +67,21 @@ public:
* Returns negative error code. * Returns negative error code.
*/ */
int blockingCall(uavcan::NodeID server_node_id, const typename DataType::Request& request) int blockingCall(uavcan::NodeID server_node_id, const typename DataType::Request& request)
{
return blockingCall(server_node_id, request, Super::getDefaultRequestTimeout());
}
/**
* Performs a blocking service call using the specified timeout. Please consider using default timeout instead.
* Use @ref getResponse() to get the actual response.
* Returns negative error code.
*/
int blockingCall(uavcan::NodeID server_node_id, const typename DataType::Request& request,
uavcan::MonotonicDuration timeout)
{ {
const auto SpinDuration = uavcan::MonotonicDuration::fromMSec(2); const auto SpinDuration = uavcan::MonotonicDuration::fromMSec(2);
setup(); setup();
Super::setRequestTimeout(timeout);
const int call_res = Super::call(server_node_id, request); const int call_res = Super::call(server_node_id, request);
if (call_res >= 0) if (call_res >= 0)
{ {
@@ -85,18 +97,6 @@ public:
return call_res; return call_res;
} }
/**
* Performs a blocking service call using the specified timeout. Please consider using default timeout instead.
* Use @ref getResponse() to get the actual response.
* Returns negative error code.
*/
int blockingCall(uavcan::NodeID server_node_id, const typename DataType::Request& request,
uavcan::MonotonicDuration timeout)
{
Super::setRequestTimeout(timeout);
return blockingCall(server_node_id, request);
}
/** /**
* Whether the last blocking call was successful. * Whether the last blocking call was successful.
*/ */