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

Merge branch 'master' of github.com:collin80/SavvyCAN into WIP

Browse Source
This commit is contained in:
Collin Kidder
2021-02-17 21:18:34 -05:00
parent 91610202ce 7e6ead19e0
commit a5cf484e7c
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/serialbusconnection.cpp
+4 -2
View File
@@ -183,11 +183,12 @@ void SerialBusConnection::framesReceived()
CANFrame* frame_p = getQueue().get();
if(frame_p) {
frame_p->setPayload(recFrame.payload());
frame_p->bus = 0;
frame_p->bus = 0;
if (recFrame.frameType() == recFrame.ErrorFrame)
{
frame_p->setExtendedFrameFormat(recFrame.hasExtendedFrameFormat());
frame_p->setFrameId(recFrame.frameId() + 0x20000000ull);
frame_p->isReceived = true;
}
else
{
@@ -197,7 +198,8 @@ void SerialBusConnection::framesReceived()
frame_p->setTimeStamp(recFrame.timeStamp());
frame_p->setFrameType(recFrame.frameType());
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();
if (useSystemTime) {
frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, QDateTime::currentMSecsSinceEpoch() * 1000ul));