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

Fixed publication timeouts (Server, Publisher, GenericPublisher)

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-13 14:45:31 +04:00
parent 2eaa4b3c31
commit 51833fb08f
3 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/internal/node/generic_publisher.hpp
+12 -5
View File
@@ -94,13 +94,18 @@ class GenericPublisher
}
public:
GenericPublisher(Scheduler& scheduler, IMarshalBufferProvider& buffer_provider,
GenericPublisher(Scheduler& scheduler, IMarshalBufferProvider& buffer_provider, MonotonicDuration tx_timeout,
MonotonicDuration max_transfer_interval = TransferSender::getDefaultMaxTransferInterval())
: max_transfer_interval_(max_transfer_interval)
, tx_timeout_(getDefaultTxTimeout())
, tx_timeout_(tx_timeout)
, scheduler_(scheduler)
, buffer_provider_(buffer_provider)
{ }
{
setTxTimeout(tx_timeout);
#if UAVCAN_DEBUG
assert(getTxTimeout() == tx_timeout); // Making sure default values are OK
#endif
}
~GenericPublisher() { }
@@ -116,13 +121,15 @@ public:
return genericPublish(message, transfer_type, dst_node_id, &tid, blocking_deadline);
}
static MonotonicDuration getDefaultTxTimeout() { return MonotonicDuration::fromUSec(2500); }// 2500ms --> 400Hz max
static MonotonicDuration getMinTxTimeout() { return MonotonicDuration::fromUSec(200); }
static MonotonicDuration getMaxTxTimeout() { return MonotonicDuration::fromMSec(60000); }
MonotonicDuration getTxTimeout() const { return tx_timeout_; }
void setTxTimeout(MonotonicDuration tx_timeout)
{
tx_timeout_ = std::max(tx_timeout, getMinTxTimeout());
tx_timeout = std::max(tx_timeout, getMinTxTimeout());
tx_timeout = std::min(tx_timeout, getMaxTxTimeout());
tx_timeout_ = tx_timeout;
}
Scheduler& getScheduler() const { return scheduler_; }