TransferReceiver tests fixed, 17 to go

This commit is contained in:
Pavel Kirienko
2015-07-03 02:41:27 +03:00
parent 19cd458ae6
commit c56458c73d
4 changed files with 83 additions and 78 deletions
+2 -2
View File
@@ -13,13 +13,13 @@ namespace uavcan
/**
* Frame
*/
int Frame::setPayload(const uint8_t* data, unsigned len)
uint8_t Frame::setPayload(const uint8_t* data, unsigned len)
{
const uint8_t maxlen = getPayloadCapacity();
len = min(unsigned(maxlen), len);
(void)copy(data, data + len, payload_);
payload_len_ = uint_fast8_t(len);
return int(len);
return static_cast<uint8_t>(len);
}
template <int OFFSET, int WIDTH>
@@ -192,6 +192,7 @@ TransferReceiver::ResultCode TransferReceiver::addFrame(const RxFrame& frame, Tr
(frame.getMonotonicTimestamp() < prev_transfer_ts_) ||
(frame.getMonotonicTimestamp() < this_transfer_ts_))
{
UAVCAN_TRACE("TransferReceiver", "Invalid frame, %s", frame.toString().c_str());
return ResultNotComplete;
}