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

cleanup

Browse Source
This commit is contained in:
Tomasz Dobrowolski
2026-03-18 13:21:54 +01:00
parent 5e3d6a305d
commit ee3e2e2712
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/lawicel_serial.cpp
+3 -11
View File
@@ -503,11 +503,8 @@ void LAWICELSerial::readSerialData()
CANFrame buildFrame; CANFrame buildFrame;
QByteArray buildData; QByteArray buildData;
if (useSystemTime) buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, QDateTime::currentMSecsSinceEpoch() * 1000ll));
{ if (!useSystemTime)
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, QDateTime::currentMSecsSinceEpoch() * 1000ll));
}
else
{ {
bool isFD = false; bool isFD = false;
char offset; char offset;
@@ -537,8 +534,7 @@ void LAWICELSerial::readSerialData()
int dlc = mBuildLine.mid(len_index, 1).toInt(); int dlc = mBuildLine.mid(len_index, 1).toInt();
int byteCount = isFD ? (int)dlc_code_to_bytes(dlc) : dlc; int byteCount = isFD ? (int)dlc_code_to_bytes(dlc) : dlc;
int frameStringLen = offset + byteCount * 2; int frameStringLen = offset + byteCount * 2;
bool hasTimestamp = mBuildLine.length() > frameStringLen + 1; if (mBuildLine.length() > frameStringLen + 1)
if (hasTimestamp)
{ {
qint64 hwTs = mBuildLine.mid(frameStringLen, 4).toInt(nullptr, 16); qint64 hwTs = mBuildLine.mid(frameStringLen, 4).toInt(nullptr, 16);
qint64 sysMs = QDateTime::currentMSecsSinceEpoch(); qint64 sysMs = QDateTime::currentMSecsSinceEpoch();
@@ -553,10 +549,6 @@ void LAWICELSerial::readSerialData()
timeBasis = sysMs - unwrappedMs; timeBasis = sysMs - unwrappedMs;
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, (timeBasis + unwrappedMs) * 1000ll)); buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, (timeBasis + unwrappedMs) * 1000ll));
} }
else
{
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, QDateTime::currentMSecsSinceEpoch() * 1000ll));
}
} }
switch (mBuildLine[0].toLatin1()) switch (mBuildLine[0].toLatin1())