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

Functions from <algorithm> reimplemented in libuavcan

Browse Source
This commit is contained in:
Pavel Kirienko
2014-05-04 23:13:38 +04:00
parent cf3d6e2c08
commit 7608e4ca08
19 changed files with 152 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/node/uc_generic_publisher.cpp
+2 -2
View File
@@ -64,8 +64,8 @@ TransferSender* GenericPublisherBase::getTransferSender()
void GenericPublisherBase::setTxTimeout(MonotonicDuration tx_timeout)
{
tx_timeout = std::max(tx_timeout, getMinTxTimeout());
tx_timeout = std::min(tx_timeout, getMaxTxTimeout());
tx_timeout = max(tx_timeout, getMinTxTimeout());
tx_timeout = min(tx_timeout, getMaxTxTimeout());
tx_timeout_ = tx_timeout;
}
libuavcan/src/node/uc_scheduler.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ MonotonicTime DeadlineScheduler::getEarliestDeadline() const
*/
MonotonicTime Scheduler::computeDispatcherSpinDeadline(MonotonicTime spin_deadline) const
{
const MonotonicTime earliest = std::min(deadline_scheduler_.getEarliestDeadline(), spin_deadline);
const MonotonicTime earliest = min(deadline_scheduler_.getEarliestDeadline(), spin_deadline);
const MonotonicTime ts = getMonotonicTime();
if (earliest > ts)
{