t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SocketCan: Correctly support CAN frames with extended identifier

Browse Source
This commit is contained in:
Andre Hartmann
2017-09-02 10:09:42 +02:00
parent 3f8e2bb5c3
commit ee4a218a67
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/socketcan.cpp
+2 -2
View File
@@ -115,7 +115,7 @@ bool SocketCan::piSendFrame(const CANFrame& pFrame)
/* fill frame */ /* fill frame */
QCanBusFrame frame; QCanBusFrame frame;
frame.setFrameId(pFrame.ID); frame.setFrameId(pFrame.ID);
frame.setExtendedFrameFormat(false); frame.setExtendedFrameFormat(pFrame.extended);
frame.setPayload(QByteArray(reinterpret_cast<const char *>(pFrame.data), frame.setPayload(QByteArray(reinterpret_cast<const char *>(pFrame.data),
static_cast<int>(pFrame.len))); static_cast<int>(pFrame.len)));
@@ -187,7 +187,7 @@ void SocketCan::framesReceived()
frame_p->len = static_cast<uint32_t>(recFrame.payload().length()); frame_p->len = static_cast<uint32_t>(recFrame.payload().length());
frame_p->bus = 0; frame_p->bus = 0;
memcpy(frame_p->data, recFrame.payload().data(), frame_p->len); memcpy(frame_p->data, recFrame.payload().data(), frame_p->len);
frame_p->extended = false; frame_p->extended = recFrame.hasExtendedFrameFormat();
frame_p->ID = recFrame.frameId(); frame_p->ID = recFrame.frameId();
frame_p->isReceived = true; frame_p->isReceived = true;
if (useSystemTime) { if (useSystemTime) {