fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-31 20:01:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

LPC11C24 test update

Browse Source
This commit is contained in:
Pavel Kirienko
2015-07-09 07:02:51 +03:00
parent 9ac61008b1
commit 5223244a62
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/lpc11c24/driver/src/can.cpp
+3 -6
View File
@@ -291,7 +291,9 @@ uavcan::int16_t CanDriver::receive(uavcan::CanFrame& out_frame, uavcan::Monotoni
return 1;
}
uavcan::int16_t CanDriver::select(uavcan::CanSelectMasks& inout_masks, uavcan::MonotonicTime blocking_deadline)
uavcan::int16_t CanDriver::select(uavcan::CanSelectMasks& inout_masks,
const uavcan::CanFrame* (&)[uavcan::MaxCanIfaces],
uavcan::MonotonicTime blocking_deadline)
{
const bool noblock = ((inout_masks.read == 1) && hasReadyRx()) ||
((inout_masks.write == 1) && hasEmptyTx());
@@ -348,11 +350,6 @@ uavcan::ICanIface* CanDriver::getIface(uavcan::uint8_t iface_index)
return (iface_index == 0) ? this : NULL;
}
const uavcan::ICanIface* CanDriver::getIface(uavcan::uint8_t iface_index) const
{
return (iface_index == 0) ? this : NULL;
}
uavcan::uint8_t CanDriver::getNumIfaces() const
{
return 1;