fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 06:33:33 +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/include/uavcan_lpc11c24/can.hpp
+3 -1
View File
@@ -50,7 +50,9 @@ public:
virtual uavcan::int16_t receive(uavcan::CanFrame& out_frame, uavcan::MonotonicTime& out_ts_monotonic,
uavcan::UtcTime& out_ts_utc, uavcan::CanIOFlags& out_flags);
virtual uavcan::int16_t select(uavcan::CanSelectMasks& inout_masks, uavcan::MonotonicTime blocking_deadline);
virtual uavcan::int16_t select(uavcan::CanSelectMasks& inout_masks,
const uavcan::CanFrame* (&)[uavcan::MaxCanIfaces],
uavcan::MonotonicTime blocking_deadline);
virtual uavcan::int16_t configureFilters(const uavcan::CanFilterConfig* filter_configs,
uavcan::uint16_t num_configs);
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;
libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/src/main.cpp
+2 -2
View File
@@ -62,7 +62,7 @@ void init()
swver.major = FW_VERSION_MAJOR;
swver.minor = FW_VERSION_MINOR;
swver.vcs_commit = GIT_HASH;
swver.optional_field_mask = swver.OPTIONAL_FIELD_MASK_VCS_COMMIT;
swver.optional_field_flags = swver.OPTIONAL_FIELD_FLAG_VCS_COMMIT;
getNode().setSoftwareVersion(swver);
uavcan::protocol::HardwareVersion hwver;
@@ -128,7 +128,7 @@ int main()
{
init();
getNode().setStatusOk();
getNode().setModeOperational();
uavcan::MonotonicTime prev_log_at;