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

TransportCRC --> TransferCRC

Browse Source
This commit is contained in:
Pavel Kirienko
2014-02-26 18:16:14 +04:00
parent dc2460f264
commit 121f8d2dee
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/transport/crc.cpp
+1 -1
View File
@@ -9,7 +9,7 @@ namespace uavcan
{
// print ', '.join(map(lambda x: '%04x' % x, map(lambda x: int(x, 0), c.crc_ccitt_tab)))
const uint16_t TransportCRC::Table[256] =
const uint16_t TransferCRC::Table[256] =
{
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
libuavcan/src/transport/transfer_listener.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ int MultiFrameIncomingTransfer::read(unsigned int offset, uint8_t* data, unsigne
*/
bool TransferListenerBase::checkPayloadCrc(const uint16_t compare_with, const ITransferBuffer& tbb) const
{
TransportCRC crc = crc_base_;
TransferCRC crc = crc_base_;
unsigned int offset = 0;
while (true)
{
libuavcan/src/transport/transfer_receiver.cpp
+4 -4
View File
@@ -56,7 +56,7 @@ bool TransferReceiver::validate(const RxFrame& frame) const
if (iface_index_ != frame.getIfaceIndex())
return false;
if (frame.isFirst() && !frame.isLast() && (frame.getPayloadLen() < TransportCRC::NumBytes))
if (frame.isFirst() && !frame.isLast() && (frame.getPayloadLen() < TransferCRC::NumBytes))
{
UAVCAN_TRACE("TransferReceiver", "CRC expected, %s", frame.toString().c_str());
return false;
@@ -90,13 +90,13 @@ bool TransferReceiver::writePayload(const RxFrame& frame, ITransferBuffer& buf)
if (frame.isFirst()) // First frame contains CRC, we need to extract it now
{
if (frame.getPayloadLen() < TransportCRC::NumBytes) // Must have been validated earlier though. I think I'm paranoid.
if (frame.getPayloadLen() < TransferCRC::NumBytes) // Must have been validated earlier though. I think I'm paranoid.
return false;
this_transfer_crc_ = (payload[0] & 0xFF) | (uint16_t(payload[1] & 0xFF) << 8); // Little endian.
const int effective_payload_len = payload_len - TransportCRC::NumBytes;
const int res = buf.write(buffer_write_pos_, payload + TransportCRC::NumBytes, effective_payload_len);
const int effective_payload_len = payload_len - TransferCRC::NumBytes;
const int res = buf.write(buffer_write_pos_, payload + TransferCRC::NumBytes, effective_payload_len);
const bool success = res == effective_payload_len;
if (success)
buffer_write_pos_ += effective_payload_len;
libuavcan/src/transport/transfer_sender.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ int TransferSender::send(const uint8_t* payload, int payload_len, uint64_t monot
{
int offset = 0;
{
TransportCRC crc = crc_base_;
TransferCRC crc = crc_base_;
crc.add(payload, payload_len);
static const int BUFLEN = sizeof(CanFrame::data);