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

OTR deinterfaced

Browse Source
This commit is contained in:
Pavel Kirienko
2015-10-14 20:15:19 +03:00
parent 0d5fc65907
commit 899aae44f7
10 changed files with 56 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/node/node.hpp
+1 -3
View File
@@ -47,7 +47,6 @@ class UAVCAN_EXPORT Node : public INode
typedef PoolAllocator<MemPoolSize, MemPoolBlockSize> Allocator;
Allocator pool_allocator_;
OutgoingTransferRegistry outgoing_trans_reg_;
Scheduler scheduler_;
NodeStatusProvider proto_nsp_;
@@ -75,8 +74,7 @@ protected:
public:
Node(ICanDriver& can_driver, ISystemClock& system_clock)
: outgoing_trans_reg_(pool_allocator_)
, scheduler_(can_driver, pool_allocator_, system_clock, outgoing_trans_reg_)
: scheduler_(can_driver, pool_allocator_, system_clock)
, proto_nsp_(*this)
#if !UAVCAN_TINY
, proto_dtp_(*this)
libuavcan/include/uavcan/node/scheduler.hpp
+2 -2
View File
@@ -92,8 +92,8 @@ class UAVCAN_EXPORT Scheduler : Noncopyable
void pollCleanup(MonotonicTime mono_ts, uint32_t num_frames_processed_with_last_spin);
public:
Scheduler(ICanDriver& can_driver, IPoolAllocator& allocator, ISystemClock& sysclock, IOutgoingTransferRegistry& otr)
: dispatcher_(can_driver, allocator, sysclock, otr)
Scheduler(ICanDriver& can_driver, IPoolAllocator& allocator, ISystemClock& sysclock)
: dispatcher_(can_driver, allocator, sysclock)
, prev_cleanup_ts_(sysclock.getMonotonic())
, deadline_resolution_(MonotonicDuration::fromMSec(DefaultDeadlineResolutionMs))
, cleanup_period_(MonotonicDuration::fromMSec(DefaultCleanupPeriodMs))
libuavcan/include/uavcan/node/sub_node.hpp
+1 -3
View File
@@ -31,7 +31,6 @@ class UAVCAN_EXPORT SubNode : public INode
typedef PoolAllocator<MemPoolSize, MemPoolBlockSize> Allocator;
Allocator pool_allocator_;
OutgoingTransferRegistry outgoing_trans_reg_;
Scheduler scheduler_;
uint64_t internal_failure_cnt_;
@@ -46,8 +45,7 @@ protected:
public:
SubNode(ICanDriver& can_driver, ISystemClock& system_clock) :
outgoing_trans_reg_(pool_allocator_),
scheduler_(can_driver, pool_allocator_, system_clock, outgoing_trans_reg_),
scheduler_(can_driver, pool_allocator_, system_clock),
internal_failure_cnt_(0)
{ }