fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 23:53: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/include/uavcan/node/scheduler.hpp
+4 -4
View File
@@ -99,16 +99,16 @@ public:
MonotonicDuration getDeadlineResolution() const { return deadline_resolution_; }
void setDeadlineResolution(MonotonicDuration res)
{
res = std::min(res, MonotonicDuration::fromMSec(MaxDeadlineResolutionMs));
res = std::max(res, MonotonicDuration::fromMSec(MinDeadlineResolutionMs));
res = min(res, MonotonicDuration::fromMSec(MaxDeadlineResolutionMs));
res = max(res, MonotonicDuration::fromMSec(MinDeadlineResolutionMs));
deadline_resolution_ = res;
}
MonotonicDuration getCleanupPeriod() const { return cleanup_period_; }
void setCleanupPeriod(MonotonicDuration period)
{
period = std::min(period, MonotonicDuration::fromMSec(MaxCleanupPeriodMs));
period = std::max(period, MonotonicDuration::fromMSec(MinCleanupPeriodMs));
period = min(period, MonotonicDuration::fromMSec(MaxCleanupPeriodMs));
period = max(period, MonotonicDuration::fromMSec(MinCleanupPeriodMs));
cleanup_period_ = period;
}
};
libuavcan/include/uavcan/node/service_client.hpp
+3 -3
View File
@@ -168,11 +168,11 @@ public:
MonotonicDuration getRequestTimeout() const { return request_timeout_; }
void setRequestTimeout(MonotonicDuration timeout)
{
timeout = std::max(timeout, getMinRequestTimeout());
timeout = std::min(timeout, getMaxRequestTimeout());
timeout = max(timeout, getMinRequestTimeout());
timeout = min(timeout, getMaxRequestTimeout());
publisher_.setTxTimeout(timeout);
request_timeout_ = std::max(timeout, publisher_.getTxTimeout()); // No less than TX timeout
request_timeout_ = max(timeout, publisher_.getTxTimeout()); // No less than TX timeout
}
};