DSDL catchup

This commit is contained in:
Pavel Kirienko
2015-07-05 09:27:22 +03:00
parent a25a9252a7
commit 27ec2419ff
10 changed files with 32 additions and 32 deletions
@@ -77,7 +77,7 @@ int NodeStatusProvider::startAndPublish(TransferPriority priority)
goto fail;
}
setStatusPublicationPeriod(MonotonicDuration::fromMSec(protocol::NodeStatus::MAX_PUBLICATION_PERIOD_MS));
setStatusPublicationPeriod(MonotonicDuration::fromMSec(protocol::NodeStatus::MAX_BROADCASTING_PERIOD_MS));
return res;
@@ -90,8 +90,8 @@ fail:
void NodeStatusProvider::setStatusPublicationPeriod(uavcan::MonotonicDuration period)
{
const MonotonicDuration maximum = MonotonicDuration::fromMSec(protocol::NodeStatus::MAX_PUBLICATION_PERIOD_MS);
const MonotonicDuration minimum = MonotonicDuration::fromMSec(protocol::NodeStatus::MIN_PUBLICATION_PERIOD_MS);
const MonotonicDuration maximum = MonotonicDuration::fromMSec(protocol::NodeStatus::MAX_BROADCASTING_PERIOD_MS);
const MonotonicDuration minimum = MonotonicDuration::fromMSec(protocol::NodeStatus::MIN_BROADCASTING_PERIOD_MS);
period = min(period, maximum);
period = max(period, minimum);