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

Removed duplicated code of Timer

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-28 00:27:14 +04:00
parent 96aa295615
commit c7cc8c8758
2 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/node/timer.hpp
+2 -19
View File
@@ -87,7 +87,7 @@ public:
, callback_()
{ }
TimerEventForwarder(INode& node, Callback callback)
TimerEventForwarder(INode& node, const Callback& callback)
: TimerBase(node)
, callback_(callback)
{ }
@@ -99,24 +99,7 @@ public:
#if UAVCAN_CPP_VERSION >= UAVCAN_CPP11
class Timer : public TimerBase
{
void handleTimerEvent(const TimerEvent& event);
public:
typedef std::function<void (const TimerEvent& event)> Callback;
explicit Timer(INode& node)
: TimerBase(node)
{ }
Timer(INode& node, const Callback& callback)
: TimerBase(node)
, callback(callback)
{ }
Callback callback;
};
typedef TimerEventForwarder<std::function<void (const TimerEvent& event)> > Timer;
#endif
libuavcan/src/node/timer.cpp
-19
View File
@@ -47,23 +47,4 @@ void TimerBase::startPeriodic(MonotonicDuration period)
DeadlineHandler::startWithDelay(period);
}
/*
* Timer
*/
#if UAVCAN_CPP_VERSION >= UAVCAN_CPP11
void Timer::handleTimerEvent(const TimerEvent& event)
{
if (callback)
{
callback(event);
}
else
{
assert(0);
}
}
#endif
}