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

TransferSender updated; build is still broken

Browse Source
This commit is contained in:
Pavel Kirienko
2015-06-29 19:13:47 +03:00
parent 350761fa7a
commit a565a9025e
2 changed files with 21 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/transport/transfer_sender.hpp
+3 -17
View File
@@ -45,7 +45,7 @@ public:
MonotonicDuration max_transfer_interval = getDefaultMaxTransferInterval())
: max_transfer_interval_(max_transfer_interval)
, dispatcher_(dispatcher)
, priority_(TransferPriorityNormal)
, priority_(TransferPriority::Default)
, qos_(CanTxQueue::Qos())
, flags_(CanIOFlags(0))
, iface_mask_(AllIfacesMask)
@@ -57,7 +57,7 @@ public:
TransferSender(Dispatcher& dispatcher, MonotonicDuration max_transfer_interval = getDefaultMaxTransferInterval())
: max_transfer_interval_(max_transfer_interval)
, dispatcher_(dispatcher)
, priority_(TransferPriorityNormal)
, priority_(TransferPriority::Default)
, qos_(CanTxQueue::Qos())
, flags_(CanIOFlags(0))
, iface_mask_(AllIfacesMask)
@@ -78,22 +78,8 @@ public:
iface_mask_ = iface_mask;
}
/**
* Transfer priority can be assigned only for message transfers.
* Attempt to change priority of a service transfer will not have any effect.
*/
TransferPriority getPriority() const { return priority_; }
void setPriority(TransferPriority prio)
{
if (prio < NumTransferPriorities && prio != TransferPriorityService)
{
priority_ = prio;
}
else
{
UAVCAN_ASSERT(0);
}
}
void setPriority(TransferPriority prio) { priority_ = prio; }
/**
* Anonymous transfers (i.e. transfers that don't carry a valid Source Node ID) can be sent if