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

Minor renaming in TransferReceiver

Browse Source
This commit is contained in:
Pavel Kirienko
2014-02-11 15:34:19 +04:00
parent afd265e8c6
commit 55ea9963f0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/internal/transport/transfer_receiver.hpp
+1 -1
View File
@@ -91,7 +91,7 @@ public:
return *this; return *this;
} }
bool isTimedOut(uint64_t timestamp) const; bool isTimedOut(uint64_t ts_monotonic) const;
ResultCode addFrame(const RxFrame& frame); ResultCode addFrame(const RxFrame& frame);
libuavcan/src/transport/transfer_receiver.cpp
+3 -3
View File
@@ -137,13 +137,13 @@ TransferReceiver::ResultCode TransferReceiver::receive(const RxFrame& frame)
return RESULT_NOT_COMPLETE; return RESULT_NOT_COMPLETE;
} }
bool TransferReceiver::isTimedOut(uint64_t timestamp) const bool TransferReceiver::isTimedOut(uint64_t ts_monotonic) const
{ {
static const uint64_t INTERVAL_MULT = (1 << TransferID::BITLEN) / 2 - 1; static const uint64_t INTERVAL_MULT = (1 << TransferID::BITLEN) / 2 - 1;
const uint64_t ts = this_transfer_ts_monotonic_; const uint64_t ts = this_transfer_ts_monotonic_;
if (timestamp <= ts) if (ts_monotonic <= ts)
return false; return false;
return (timestamp - ts) > (uint64_t(transfer_interval_) * INTERVAL_MULT); return (ts_monotonic - ts) > (uint64_t(transfer_interval_) * INTERVAL_MULT);
} }
TransferReceiver::ResultCode TransferReceiver::addFrame(const RxFrame& frame) TransferReceiver::ResultCode TransferReceiver::addFrame(const RxFrame& frame)