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

Merge branch 'master' into dynamic_node_id_raft

Browse Source
This commit is contained in:
Pavel Kirienko
2015-05-01 20:54:05 +03:00
parent 5527faca5d 90435991ca
commit 8096ac3e7c
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/node/service_client.hpp
+4 -1
View File
@@ -84,12 +84,15 @@ static Stream& operator<<(Stream& s, const ServiceCallResult<DataType>& scr)
*/
class ServiceClientBase : protected DeadlineHandler
{
const DataTypeDescriptor* data_type_descriptor_; ///< This will be initialized at the time of first call
protected:
MonotonicDuration request_timeout_;
bool pending_;
explicit ServiceClientBase(INode& node)
: DeadlineHandler(node.getScheduler())
, data_type_descriptor_(NULL)
, request_timeout_(getDefaultRequestTimeout())
, pending_(false)
{ }
@@ -159,7 +162,7 @@ private:
void invokeCallback(ServiceCallResultType& result);
void handleReceivedDataStruct(ReceivedDataStructure<ResponseType>& response);
virtual void handleReceivedDataStruct(ReceivedDataStructure<ResponseType>& response);
virtual void handleDeadline(MonotonicTime);