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

Merge pull request #278 from CSS-Electronics/feature_qcanbus_rxtx

Browse Source 
Support for Tx when logging via QCanBus
This commit is contained in:
Collin Kidder
2021-02-17 19:16:06 -05:00
committed by GitHub
parent d7dcc0513b 0cfa6ce379
commit 7e6ead19e0
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/serialbusconnection.cpp
+5 -3
View File
@@ -222,16 +222,18 @@ void SerialBusConnection::framesReceived()
} }
frame_p->extended = true; frame_p->extended = true;
*/ */
frame_p->isReceived = true;
} else { } else {
frame_p->setExtendedFrameFormat(recFrame.hasExtendedFrameFormat()); frame_p->setExtendedFrameFormat(recFrame.hasExtendedFrameFormat());
frame_p->setFrameId(recFrame.frameId()); frame_p->setFrameId(recFrame.frameId());
frame_p->setTimeStamp(recFrame.timeStamp()); frame_p->setTimeStamp(recFrame.timeStamp());
frame_p->setFrameType(recFrame.frameType()); frame_p->setFrameType(recFrame.frameType());
frame_p->setError(recFrame.error()); frame_p->setError(recFrame.error());
frame_p->isReceived = true;
/* If recorded frame has a local echo, it is a Tx message, and thus should not be marked as Rx */
frame_p->isReceived = !recFrame.hasLocalEcho();
} }
frame_p->isReceived = true;
if (useSystemTime) { if (useSystemTime) {
frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, QDateTime::currentMSecsSinceEpoch() * 1000ul)); frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, QDateTime::currentMSecsSinceEpoch() * 1000ul));
} }