From 0cfa6ce37931ed198b2714d0a3c13dd06613d392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20Aagaard=20S=C3=B8rensen?= Date: Mon, 15 Feb 2021 10:27:43 +0100 Subject: [PATCH] Enable support for Tx via QCanBus by utilizing information stored in hasLocalEcho. --- connections/serialbusconnection.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/connections/serialbusconnection.cpp b/connections/serialbusconnection.cpp index f628cb6..5da0d19 100644 --- a/connections/serialbusconnection.cpp +++ b/connections/serialbusconnection.cpp @@ -222,16 +222,18 @@ void SerialBusConnection::framesReceived() } frame_p->extended = true; */ + frame_p->isReceived = true; } else { frame_p->setExtendedFrameFormat(recFrame.hasExtendedFrameFormat()); frame_p->setFrameId(recFrame.frameId()); 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(); } - - frame_p->isReceived = true; + if (useSystemTime) { frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, QDateTime::currentMSecsSinceEpoch() * 1000ul)); }