fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 07:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

uavcan_dynamic_node_id_server - cleaner time formatting

Browse Source
This commit is contained in:
Pavel Kirienko
2015-05-24 14:23:04 +03:00
parent 5361d7bbeb
commit 7cac4cd4fa
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/linux/apps/uavcan_dynamic_node_id_server.cpp
+6 -7
View File
@@ -86,20 +86,19 @@ public:
uavcan::MakeString<81>::Type toString() const // Heapless return uavcan::MakeString<81>::Type toString() const // Heapless return
{ {
char timerbuf[11] = { }; char timebuf[11] = { };
{ {
const std::time_t rawtime = utc_timestamp.toUSec() * 1e-6; const std::time_t rawtime = utc_timestamp.toUSec() * 1e-6;
const auto tm = localtime(&rawtime); const auto tm = localtime(&rawtime);
std::strftime(timerbuf, sizeof(timerbuf) - 1U, "%H:%M:%S.", tm); std::strftime(timebuf, 10, "%H:%M:%S.", tm);
timerbuf[9] = '0' + (utc_timestamp.toMSec() % 1000) / 100; std::snprintf(&timebuf[9], 3, "%02u", static_cast<unsigned>((utc_timestamp.toMSec() % 1000U) / 10U));
timerbuf[10] = '\0';
} }
decltype(toString()) out; decltype(toString()) out;
out.resize(out.capacity()); out.resize(out.capacity());
(void)std::snprintf(reinterpret_cast<char*>(out.begin()), out.size() - 1U, (void)std::snprintf(reinterpret_cast<char*>(out.begin()), out.size() - 1U,
"%-10s %-28s % -20lld %016llx", "%-11s %-28s %-20lld %016llx",
timerbuf, timebuf,
getEventName(code), getEventName(code),
static_cast<long long>(argument), static_cast<long long>(argument),
static_cast<long long>(argument)); static_cast<long long>(argument));
@@ -109,7 +108,7 @@ public:
static const char* getTableHeader() static const char* getTableHeader()
{ {
// Matches the string format above // Matches the string format above
return "Timestamp Event name Argument (dec) Argument (hex)"; return "Timestamp Event name Argument (dec) Argument (hex)";
} }
}; };