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

CanRxFrame inherits CanFrame

Browse Source
This commit is contained in:
Pavel Kirienko
2014-02-02 22:58:44 +04:00
parent 8794c7eab9
commit 6790b04056
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/transport/can/io.cpp
+4 -3
View File
@@ -196,13 +196,14 @@ TEST(CanIOManager, CanDriverMock)
static bool rxFrameEquals(const uavcan::CanRxFrame& rxframe, const uavcan::CanFrame& frame,
uint64_t timestamp, int iface_index)
{
if (rxframe.frame != frame)
if (static_cast<const uavcan::CanFrame&>(rxframe) != frame)
{
std::cout << "Frame mismatch:\n"
<< " " << rxframe.frame.toString(uavcan::CanFrame::STR_ALIGNED) << "\n"
<< " " << rxframe.toString(uavcan::CanFrame::STR_ALIGNED) << "\n"
<< " " << frame.toString(uavcan::CanFrame::STR_ALIGNED) << std::endl;
}
return (rxframe.frame == frame) && (rxframe.timestamp == timestamp) && (rxframe.iface_index == iface_index);
return (static_cast<const uavcan::CanFrame&>(rxframe) == frame) &&
(rxframe.timestamp == timestamp) && (rxframe.iface_index == iface_index);
}
TEST(CanIOManager, Reception)
libuavcan/test/transport/transfer.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ TEST(Transfer, RxFrameParseCompile)
ASSERT_FALSE(rx_frame.parse(can_rx_frame));
// Default
can_rx_frame.frame.id = CanFrame::FLAG_EFF;
can_rx_frame.id = CanFrame::FLAG_EFF;
ASSERT_TRUE(rx_frame.parse(can_rx_frame));
ASSERT_EQ(0, rx_frame.timestamp);
ASSERT_EQ(0, rx_frame.iface_index);