Renaming: Timer --> TimerBase, see the next commit

This commit is contained in:
Pavel Kirienko
2014-03-27 11:59:02 +04:00
parent 0dff5b36e4
commit 9476dfbdad
7 changed files with 19 additions and 19 deletions
+4 -4
View File
@@ -8,7 +8,7 @@
namespace uavcan
{
void Timer::handleDeadline(MonotonicTime current)
void TimerBase::handleDeadline(MonotonicTime current)
{
assert(!isRunning());
@@ -23,21 +23,21 @@ void Timer::handleDeadline(MonotonicTime current)
handleTimerEvent(TimerEvent(scheduled_time, current));
}
void Timer::startOneShotWithDeadline(MonotonicTime deadline)
void TimerBase::startOneShotWithDeadline(MonotonicTime deadline)
{
stop();
period_ = MonotonicDuration::getInfinite();
DeadlineHandler::startWithDeadline(deadline);
}
void Timer::startOneShotWithDelay(MonotonicDuration delay)
void TimerBase::startOneShotWithDelay(MonotonicDuration delay)
{
stop();
period_ = MonotonicDuration::getInfinite();
DeadlineHandler::startWithDelay(delay);
}
void Timer::startPeriodic(MonotonicDuration period)
void TimerBase::startPeriodic(MonotonicDuration period)
{
assert(period < MonotonicDuration::getInfinite());
stop();
@@ -83,7 +83,7 @@ int NodeStatusMonitor::start()
const int res = sub_.start(NodeStatusCallback(this, &NodeStatusMonitor::handleNodeStatus));
if (res >= 0)
{
Timer::startPeriodic(MonotonicDuration::fromMSec(TimerPeriodMs100 * 100));
TimerBase::startPeriodic(MonotonicDuration::fromMSec(TimerPeriodMs100 * 100));
}
return res;
}
@@ -85,7 +85,7 @@ int NodeStatusProvider::startAndPublish()
goto fail;
}
Timer::startPeriodic(MonotonicDuration::fromMSec(protocol::NodeStatus::PUBLICATION_PERIOD_MS));
TimerBase::startPeriodic(MonotonicDuration::fromMSec(protocol::NodeStatus::PUBLICATION_PERIOD_MS));
return res;
@@ -93,7 +93,7 @@ fail:
assert(res < 0);
gdr_sub_.stop();
gni_srv_.stop();
Timer::stop();
TimerBase::stop();
return res;
}