Merge pull request #801 from superwofy/master

Added/corrected timestamps for LAWICEL protocol.
collin80 · Jul 9, 2024 · d97c8d4 · d97c8d4
2 parents 2cf6398 + 1b61ae6
commit d97c8d4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/connections/lawicel_serial.cpp b/connections/lawicel_serial.cpp
@@ -491,7 +491,26 @@ void LAWICELSerial::readSerialData()
         {
             qDebug() << "Got CR!";
 
-            buildFrame.setTimeStamp(QDateTime::currentMSecsSinceEpoch() * 1000l);
+            if (useSystemTime)
+            {
+                buildTimestamp = QDateTime::currentMSecsSinceEpoch() * 1000l;
+            }
+            else
+            {
+                //If total length is greater than command, header and data, timestamps must be enabled.
+                if (data.length() > (5 + mBuildLine.mid(4, 1).toInt() * 2 + 1))
+                {
+                    //Four bytes after the end of the data bytes.
+                    buildTimestamp = mBuildLine.mid(5 + mBuildLine.mid(4, 1).toInt() * 2, 4).toInt(nullptr, 16) * 1000l;
+                }
+                else
+                {
+                    //Default to system time if timestamps are disabled.
+                    buildTimestamp = QDateTime::currentMSecsSinceEpoch() * 1000l;
+                }
+            }
+            buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp));
+
             switch (mBuildLine[0].toLatin1())
             {
             case 't': //standard frame

diff --git a/connections/lawicel_serial.h b/connections/lawicel_serial.h
@@ -61,6 +61,7 @@ private slots:
     QSerialPort *serial;
     int framesRapid;
     CANFrame buildFrame;
+    qint64 buildTimestamp;
     bool can0Enabled;
     bool can0ListenOnly;
     bool canFd;