From fbdf07fa74dc45e94688f81d5951d0571a2622dc Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Fri, 20 Mar 2015 01:51:25 +0300 Subject: [PATCH] Cleaner naming --- .../include/uavcan/protocol/node_status_provider.hpp | 4 ++-- libuavcan/src/protocol/uc_node_status_provider.cpp | 6 +++--- libuavcan/test/protocol/node_status_provider.cpp | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libuavcan/include/uavcan/protocol/node_status_provider.hpp b/libuavcan/include/uavcan/protocol/node_status_provider.hpp index ced87a08aa..6b06fa76dd 100644 --- a/libuavcan/include/uavcan/protocol/node_status_provider.hpp +++ b/libuavcan/include/uavcan/protocol/node_status_provider.hpp @@ -81,8 +81,8 @@ public: * Refer to the DSDL definition of uavcan.protocol.NodeStatus to see what is the default rate. * Doesn't fail; if the value is outside of acceptable range, a closest valid value will be used instead. */ - void setStatusPublishingPeriod(uavcan::MonotonicDuration period); - uavcan::MonotonicDuration getStatusPublishingPeriod() const; + void setStatusPublicationPeriod(uavcan::MonotonicDuration period); + uavcan::MonotonicDuration getStatusPublicationPeriod() const; /** * Local node status code control. diff --git a/libuavcan/src/protocol/uc_node_status_provider.cpp b/libuavcan/src/protocol/uc_node_status_provider.cpp index ebff29c533..d83b48f191 100644 --- a/libuavcan/src/protocol/uc_node_status_provider.cpp +++ b/libuavcan/src/protocol/uc_node_status_provider.cpp @@ -92,7 +92,7 @@ int NodeStatusProvider::startAndPublish() goto fail; } - setStatusPublishingPeriod(MonotonicDuration::fromMSec(protocol::NodeStatus::MAX_PUBLICATION_PERIOD_MS)); + setStatusPublicationPeriod(MonotonicDuration::fromMSec(protocol::NodeStatus::MAX_PUBLICATION_PERIOD_MS)); return res; @@ -104,7 +104,7 @@ fail: return res; } -void NodeStatusProvider::setStatusPublishingPeriod(uavcan::MonotonicDuration period) +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); @@ -120,7 +120,7 @@ void NodeStatusProvider::setStatusPublishingPeriod(uavcan::MonotonicDuration per period.toString().c_str(), node_status_pub_.getTxTimeout().toString().c_str()); } -uavcan::MonotonicDuration NodeStatusProvider::getStatusPublishingPeriod() const +uavcan::MonotonicDuration NodeStatusProvider::getStatusPublicationPeriod() const { return TimerBase::getPeriod(); } diff --git a/libuavcan/test/protocol/node_status_provider.cpp b/libuavcan/test/protocol/node_status_provider.cpp index 9a3eb18545..31c4e5cc20 100644 --- a/libuavcan/test/protocol/node_status_provider.cpp +++ b/libuavcan/test/protocol/node_status_provider.cpp @@ -48,15 +48,15 @@ TEST(NodeStatusProvider, Basic) // Checking the publishing rate settings ASSERT_EQ(uavcan::MonotonicDuration::fromMSec(uavcan::protocol::NodeStatus::MAX_PUBLICATION_PERIOD_MS), - nsp.getStatusPublishingPeriod()); + nsp.getStatusPublicationPeriod()); - nsp.setStatusPublishingPeriod(uavcan::MonotonicDuration()); + nsp.setStatusPublicationPeriod(uavcan::MonotonicDuration()); ASSERT_EQ(uavcan::MonotonicDuration::fromMSec(uavcan::protocol::NodeStatus::MIN_PUBLICATION_PERIOD_MS), - nsp.getStatusPublishingPeriod()); + nsp.getStatusPublicationPeriod()); - nsp.setStatusPublishingPeriod(uavcan::MonotonicDuration::fromMSec(3600 * 1000 * 24)); + nsp.setStatusPublicationPeriod(uavcan::MonotonicDuration::fromMSec(3600 * 1000 * 24)); ASSERT_EQ(uavcan::MonotonicDuration::fromMSec(uavcan::protocol::NodeStatus::MAX_PUBLICATION_PERIOD_MS), - nsp.getStatusPublishingPeriod()); + nsp.getStatusPublicationPeriod()); /* * Initial status publication