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

Fixed name: TransferID::forwardDistance() --> computeForwardDistance()

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-20 13:38:02 +04:00
parent 8feacc9072
commit de64f2aef3
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/transport/transfer.hpp
+1 -1
View File
@@ -60,7 +60,7 @@ public:
/**
* Amount of increment() calls to reach rhs value.
*/
int forwardDistance(TransferID rhs) const;
int computeForwardDistance(TransferID rhs) const;
};
libuavcan/src/transport/transfer.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ const NodeID NodeID::Broadcast(ValueBroadcast);
/**
* TransferID
*/
int TransferID::forwardDistance(TransferID rhs) const
int TransferID::computeForwardDistance(TransferID rhs) const
{
int d = int(rhs.get()) - int(get());
if (d < 0)
libuavcan/src/transport/transfer_receiver.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ const uint32_t TransferReceiver::MaxTransferIntervalUSec;
TransferReceiver::TidRelation TransferReceiver::getTidRelation(const RxFrame& frame) const
{
const int distance = tid_.forwardDistance(frame.getTransferID());
const int distance = tid_.computeForwardDistance(frame.getTransferID());
if (distance == 0)
return TidSame;
if (distance < ((1 << TransferID::BitLen) / 2))
libuavcan/test/transport/transfer.cpp
+11 -11
View File
@@ -17,16 +17,16 @@ TEST(Transfer, TransferID)
/*
* forwardDistance()
*/
EXPECT_EQ(0, TransferID(0).forwardDistance(0));
EXPECT_EQ(1, TransferID(0).forwardDistance(1));
EXPECT_EQ(7, TransferID(0).forwardDistance(7));
EXPECT_EQ(0, TransferID(0).computeForwardDistance(0));
EXPECT_EQ(1, TransferID(0).computeForwardDistance(1));
EXPECT_EQ(7, TransferID(0).computeForwardDistance(7));
EXPECT_EQ(0, TransferID(7).forwardDistance(7));
EXPECT_EQ(7, TransferID(7).forwardDistance(6));
EXPECT_EQ(1, TransferID(7).forwardDistance(0));
EXPECT_EQ(0, TransferID(7).computeForwardDistance(7));
EXPECT_EQ(7, TransferID(7).computeForwardDistance(6));
EXPECT_EQ(1, TransferID(7).computeForwardDistance(0));
EXPECT_EQ(7, TransferID(7).forwardDistance(6));
EXPECT_EQ(5, TransferID(0).forwardDistance(5));
EXPECT_EQ(7, TransferID(7).computeForwardDistance(6));
EXPECT_EQ(5, TransferID(0).computeForwardDistance(5));
/*
* Misc
@@ -42,8 +42,8 @@ TEST(Transfer, TransferID)
ASSERT_EQ(i & ((1 << TransferID::BitLen) - 1), tid.get());
const TransferID copy = tid;
tid.increment();
ASSERT_EQ(1, copy.forwardDistance(tid));
ASSERT_EQ(7, tid.forwardDistance(copy));
ASSERT_EQ(0, tid.forwardDistance(tid));
ASSERT_EQ(1, copy.computeForwardDistance(tid));
ASSERT_EQ(7, tid.computeForwardDistance(copy));
ASSERT_EQ(0, tid.computeForwardDistance(tid));
}
}