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

Added config macro UAVCAN_TOSTRING

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-10 13:32:35 +04:00
parent 29138214dc
commit d0b541e22d
20 changed files with 62 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/transport/uc_frame.cpp
+4 -1
View File
@@ -3,7 +3,6 @@
*/
#include <cassert>
#include <cstdio>
#include <uavcan/transport/frame.hpp>
#include <uavcan/transport/can_io.hpp>
@@ -194,6 +193,7 @@ bool Frame::operator==(const Frame& rhs) const
std::equal(payload_, payload_ + payload_len_, rhs.payload_);
}
#if UAVCAN_TOSTRING
std::string Frame::toString() const
{
using namespace std; // For snprintf()
@@ -223,6 +223,7 @@ std::string Frame::toString() const
ofs += snprintf(buf + ofs, BUFLEN - ofs, "]");
return std::string(buf);
}
#endif
/**
* RxFrame
@@ -244,6 +245,7 @@ bool RxFrame::parse(const CanRxFrame& can_frame)
return true;
}
#if UAVCAN_TOSTRING
std::string RxFrame::toString() const
{
std::string out = Frame::toString();
@@ -254,5 +256,6 @@ std::string RxFrame::toString() const
out += '0' + iface_index_;
return out;
}
#endif
}