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

Extra warnings for the debug build: -Wfloat-equal -Wconversion. The code was fixed accordingly. No broken tests.

Browse Source
This commit is contained in:
Pavel Kirienko
2014-08-28 01:33:27 +04:00
parent 61c4f89ea3
commit 8240c7962b
26 changed files with 112 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/transport/uc_can_io.cpp
+5 -5
View File
@@ -20,7 +20,7 @@ std::string CanRxFrame::toString(StringRepresentation mode) const
out += " ts_m=" + ts_mono.toString();
out += " ts_utc=" + ts_utc.toString();
out += " iface=";
out += '0' + iface_index;
out += char('0' + iface_index);
return out;
}
#endif
@@ -268,7 +268,7 @@ uint8_t CanIOManager::makePendingTxMask() const
{
if (!tx_queues_[i]->isEmpty())
{
write_mask |= 1 << i;
write_mask |= uint8_t(1 << i);
}
}
return write_mask;
@@ -331,7 +331,7 @@ int CanIOManager::send(const CanFrame& frame, MonotonicTime tx_deadline, Monoton
uint8_t iface_mask, CanTxQueue::Qos qos, CanIOFlags flags)
{
const uint8_t num_ifaces = getNumIfaces();
const uint8_t all_ifaces_mask = (1U << num_ifaces) - 1;
const uint8_t all_ifaces_mask = uint8_t((1U << num_ifaces) - 1);
iface_mask &= all_ifaces_mask;
if (blocking_deadline > tx_deadline)
@@ -375,7 +375,7 @@ int CanIOManager::send(const CanFrame& frame, MonotonicTime tx_deadline, Monoton
res = sendToIface(i, frame, tx_deadline, flags);
if (res > 0)
{
iface_mask &= ~(1 << i); // Mark transmitted
iface_mask &= uint8_t(~(1 << i)); // Mark transmitted
}
}
}
@@ -420,7 +420,7 @@ int CanIOManager::receive(CanRxFrame& out_frame, MonotonicTime blocking_deadline
{
CanSelectMasks masks;
masks.write = makePendingTxMask();
masks.read = (1 << num_ifaces) - 1;
masks.read = uint8_t((1 << num_ifaces) - 1);
{
const int select_res = callSelect(masks, blocking_deadline);
if (select_res < 0)