Added prefix TRANSFER_TYPE_ to enum TransferType

This commit is contained in:
Pavel Kirienko
2014-02-06 12:24:24 +04:00
parent 46657e8449
commit 805fea8234
2 changed files with 6 additions and 6 deletions
@@ -20,10 +20,10 @@ enum NodeIDConstants
enum TransferType
{
SERVICE_RESPONSE = 0,
SERVICE_REQUEST = 1,
MESSAGE_BROADCAST = 2,
MESSAGE_UNICAST = 3,
TRANSFER_TYPE_SERVICE_RESPONSE = 0,
TRANSFER_TYPE_SERVICE_REQUEST = 1,
TRANSFER_TYPE_MESSAGE_BROADCAST = 2,
TRANSFER_TYPE_MESSAGE_UNICAST = 3,
NUM_TRANSFER_TYPES = 4
};
+2 -2
View File
@@ -156,12 +156,12 @@ TEST(Transfer, RxFrameParse)
Frame frame;
frame.data_type_id = 456;
frame.transfer_type = uavcan::MESSAGE_BROADCAST;
frame.transfer_type = uavcan::TRANSFER_TYPE_MESSAGE_BROADCAST;
*static_cast<CanFrame*>(&can_rx_frame) = frame.compile();
ASSERT_TRUE(rx_frame.parse(can_rx_frame));
ASSERT_EQ(123, rx_frame.timestamp);
ASSERT_EQ(2, rx_frame.iface_index);
ASSERT_EQ(456, rx_frame.data_type_id);
ASSERT_EQ(uavcan::MESSAGE_BROADCAST, rx_frame.transfer_type);
ASSERT_EQ(uavcan::TRANSFER_TYPE_MESSAGE_BROADCAST, rx_frame.transfer_type);
}