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

libuavcan core now uses UAVCAN_ASSERT() instead of assert() (autoreplace)

Browse Source
This commit is contained in:
Pavel Kirienko
2014-07-12 17:17:09 +04:00
parent cf19d86842
commit 530242819d
55 changed files with 208 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/protocol/uc_node_status_provider.cpp
+4 -4
View File
@@ -18,10 +18,10 @@ bool NodeStatusProvider::isNodeInfoInitialized() const
int NodeStatusProvider::publish()
{
const MonotonicDuration uptime = getNode().getMonotonicTime() - creation_timestamp_;
assert(uptime.isPositive());
UAVCAN_ASSERT(uptime.isPositive());
node_info_.status.uptime_sec = uptime.toMSec() / 1000;
assert(node_info_.status.status_code <= protocol::NodeStatus::FieldTypes::status_code::max());
UAVCAN_ASSERT(node_info_.status.status_code <= protocol::NodeStatus::FieldTypes::status_code::max());
return node_status_pub_.broadcast(node_info_.status);
}
@@ -50,7 +50,7 @@ void NodeStatusProvider::handleGetNodeInfoRequest(const protocol::GetNodeInfo::R
protocol::GetNodeInfo::Response& rsp)
{
UAVCAN_TRACE("NodeStatusProvider", "Got GetNodeInfo request");
assert(isNodeInfoInitialized());
UAVCAN_ASSERT(isNodeInfoInitialized());
rsp = node_info_;
}
@@ -93,7 +93,7 @@ int NodeStatusProvider::startAndPublish()
return res;
fail:
assert(res < 0);
UAVCAN_ASSERT(res < 0);
gdr_sub_.stop();
gni_srv_.stop();
TimerBase::stop();