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

getIface() constants added

Browse Source
This commit is contained in:
ilia-sheremet
2015-06-13 20:15:45 +02:00
parent 3784484b16
commit bad7123b7d
6 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/linux/include/uavcan_linux/socketcan.hpp
+5
View File
@@ -601,6 +601,11 @@ public:
{
return (iface_index >= num_ifaces_) ? nullptr : static_cast<SocketCanIface*>(ifaces_[iface_index]);
}
const SocketCanIface* getIface(std::uint8_t iface_index) const override
{
return (iface_index >= num_ifaces_) ? nullptr : static_cast<const SocketCanIface*>(ifaces_[iface_index]);
}
std::uint8_t getNumIfaces() const override { return num_ifaces_; }
libuavcan_drivers/lpc11c24/driver/include/uavcan_lpc11c24/can.hpp
+3 -1
View File
@@ -48,7 +48,7 @@ public:
uavcan::CanIOFlags flags);
virtual uavcan::int16_t receive(uavcan::CanFrame& out_frame, uavcan::MonotonicTime& out_ts_monotonic,
uavcan::UtcTime& out_ts_utc, uavcan::CanIOFlags& out_flags);
uavcan::UtcTime& out_ts_utc, uavcan::CanIOFlags& out_flags);
virtual uavcan::int16_t select(uavcan::CanSelectMasks& inout_masks, uavcan::MonotonicTime blocking_deadline);
@@ -61,6 +61,8 @@ public:
virtual uavcan::ICanIface* getIface(uavcan::uint8_t iface_index);
virtual const uavcan::ICanIface* getIface(uavcan::uint8_t iface_index) const;
virtual uavcan::uint8_t getNumIfaces() const;
};
libuavcan_drivers/lpc11c24/driver/src/can.cpp
+5
View File
@@ -348,6 +348,11 @@ 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;