fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-31 18:01:36 +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_can_io.cpp
+4 -1
View File
@@ -4,7 +4,6 @@
*/
#include <algorithm>
#include <string>
#include <cassert>
#include <limits>
#include <uavcan/transport/can_io.hpp>
@@ -15,6 +14,7 @@ namespace uavcan
/*
* CanRxFrame
*/
#if UAVCAN_TOSTRING
std::string CanRxFrame::toString(StringRepresentation mode) const
{
std::string out = CanFrame::toString(mode);
@@ -25,6 +25,7 @@ std::string CanRxFrame::toString(StringRepresentation mode) const
out += '0' + iface_index;
return out;
}
#endif
/*
* CanTxQueue::Entry
@@ -57,6 +58,7 @@ bool CanTxQueue::Entry::qosLowerThan(const CanFrame& rhs_frame, Qos rhs_qos) con
return frame.priorityLowerThan(rhs_frame);
}
#if UAVCAN_TOSTRING
std::string CanTxQueue::Entry::toString() const
{
std::string str_qos;
@@ -78,6 +80,7 @@ std::string CanTxQueue::Entry::toString() const
}
return str_qos + frame.toString();
}
#endif
/*
* CanTxQueue