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

Renamed some Frame methods

Browse Source
This commit is contained in:
Pavel Kirienko
2014-02-17 12:53:07 +04:00
parent 9d06a328dc
commit d3d85a671c
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/transport/transfer.cpp
+3 -3
View File
@@ -79,8 +79,8 @@ TEST(Transfer, FrameParseCompile)
ASSERT_TRUE(frame.parse(makeCanFrame(can_id, payload_string, EXT)));
EXPECT_EQ(TransferID(2), frame.getTransferID());
EXPECT_TRUE(frame.isLastFrame());
EXPECT_EQ(29, frame.getFrameIndex());
EXPECT_TRUE(frame.isLast());
EXPECT_EQ(29, frame.getIndex());
EXPECT_EQ(uavcan::NodeID(42), frame.getSrcNodeID());
EXPECT_EQ(uavcan::TRANSFER_TYPE_MESSAGE_BROADCAST, frame.getTransferType());
EXPECT_EQ(456, frame.getDataTypeID());
@@ -163,7 +163,7 @@ TEST(Transfer, FrameToString)
// RX frame max len
rx_frame = RxFrame(Frame(Frame::DATA_TYPE_ID_MAX, uavcan::TRANSFER_TYPE_MESSAGE_UNICAST,
uavcan::NodeID::MAX, uavcan::NodeID::MAX - 1, Frame::FRAME_INDEX_MAX,
uavcan::NodeID::MAX, uavcan::NodeID::MAX - 1, Frame::INDEX_MAX,
uavcan::TransferID::MAX, true),
0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 3);
libuavcan/test/transport/transfer_receiver.cpp
+2 -2
View File
@@ -254,12 +254,12 @@ TEST(TransferReceiver, UnterminatedTransfer)
uavcan::TransferBufferAccessor bk(&context.bufmgr, RxFrameGenerator::DEFAULT_KEY);
std::string content;
for (int i = 0; i <= uavcan::Frame::FRAME_INDEX_MAX; i++)
for (int i = 0; i <= uavcan::Frame::INDEX_MAX; i++)
{
CHECK_NOT_COMPLETE(rcv.addFrame(gen(1, "12345678", i, false, 0, 1000 + i), bk)); // Last one will be dropped
content += "12345678";
}
CHECK_COMPLETE(rcv.addFrame(gen(1, "12345678", uavcan::Frame::FRAME_INDEX_MAX, true, 0, 1100), bk));
CHECK_COMPLETE(rcv.addFrame(gen(1, "12345678", uavcan::Frame::INDEX_MAX, true, 0, 1100), bk));
ASSERT_EQ(1000, rcv.getLastTransferTimestampMonotonic());
ASSERT_TRUE(matchBufferContent(bufmgr.access(gen.bufmgr_key), std::string(content, 2)));
ASSERT_EQ(0x3231, rcv.getLastTransferCrc());
libuavcan/test/transport/transfer_test_helpers.hpp
+2 -2
View File
@@ -185,14 +185,14 @@ std::vector<uavcan::RxFrame> serializeTransfer(const Transfer& transfer, uavcan:
offset += spres;
frame_index++;
EXPECT_TRUE(uavcan::Frame::FRAME_INDEX_MAX >= frame_index);
EXPECT_TRUE(uavcan::Frame::INDEX_MAX >= frame_index);
const uavcan::RxFrame rxfrm(frm, ts_monotonic, ts_utc, 0);
ts_monotonic += 1;
ts_utc += 1;
output.push_back(rxfrm);
if (frm.isLastFrame())
if (frm.isLast())
break;
}
return output;