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

this was missing

Browse Source
This commit is contained in:
alessandro negrin
2025-03-29 16:52:34 +01:00
parent 49a5b761bc
commit 2f70a608e3
5 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/canconmanager.cpp
+1 -2
View File
@@ -222,8 +222,7 @@ bool CANConManager::sendFrame(const CANFrame& pFrame)
workingFrame.isReceived = false; workingFrame.isReceived = false;
if (useSystemTime) if (useSystemTime)
{ {
qint64 currentTimeMs = QDateTime::currentMSecsSinceEpoch(); workingFrame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(QDateTime::currentMSecsSinceEpoch()));
workingFrame.setTimeStamp(QCanBusFrame::TimeStamp(currentTimeMs / 1000, (currentTimeMs % 1000) * 1000));
} }
else else
{ {
connections/gvretserial.cpp
+4 -4
View File
@@ -685,8 +685,7 @@ void GVRetSerial::procRXChar(unsigned char c)
buildTimestamp += timeBasis; buildTimestamp += timeBasis;
if (useSystemTime) if (useSystemTime)
{ {
buildTimestamp = QDateTime::currentMSecsSinceEpoch(); buildFrame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(QDateTime::currentMSecsSinceEpoch()));
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(buildTimestamp / 1000, (buildTimestamp % 1000) * 1000));
} else { } else {
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp)); buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp));
} }
@@ -772,9 +771,10 @@ void GVRetSerial::procRXChar(unsigned char c)
buildTimestamp += timeBasis; buildTimestamp += timeBasis;
if (useSystemTime) if (useSystemTime)
{ {
buildTimestamp = QDateTime::currentMSecsSinceEpoch() * 1000l; buildFrame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(QDateTime::currentMSecsSinceEpoch()));
} else {
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp));
} }
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp));
break; break;
case 4: case 4:
buildId = c; buildId = c;
connections/lawicel_serial.cpp
+1 -2
View File
@@ -493,8 +493,7 @@ void LAWICELSerial::readSerialData()
if (useSystemTime) if (useSystemTime)
{ {
buildTimestamp = QDateTime::currentMSecsSinceEpoch(); buildFrame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(QDateTime::currentMSecsSinceEpoch()));
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(buildTimestamp / 1000, (buildTimestamp % 1000) * 1000));
} }
else else
{ {
connections/mqtt_bus.cpp
+1 -2
View File
@@ -302,8 +302,7 @@ void MQTT_BUS::clientMessageReceived(const QMQTT::Message& message)
frame_p->isReceived = true; frame_p->isReceived = true;
if (useSystemTime) if (useSystemTime)
{ {
qint64 currentTimeMs = QDateTime::currentMSecsSinceEpoch(); frame_p->setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(QDateTime::currentMSecsSinceEpoch()));
frame_p->setTimeStamp(QCanBusFrame::TimeStamp(currentTimeMs / 1000, (currentTimeMs % 1000) * 1000));
} }
else frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, timeStamp)); else frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, timeStamp));
connections/serialbusconnection.cpp
+1 -2
View File
@@ -211,8 +211,7 @@ void SerialBusConnection::framesReceived()
frame_p->isReceived = !recFrame.hasLocalEcho(); frame_p->isReceived = !recFrame.hasLocalEcho();
if (useSystemTime) { if (useSystemTime) {
qint64 currentTimeMs = QDateTime::currentMSecsSinceEpoch(); frame_p->setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(QDateTime::currentMSecsSinceEpoch()));
frame_p->setTimeStamp(QCanBusFrame::TimeStamp(currentTimeMs / 1000, (currentTimeMs % 1000) * 1000));
} }
else frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, (recFrame.timeStamp().seconds() * 1000000ul + recFrame.timeStamp().microSeconds()) - timeBasis)); else frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, (recFrame.timeStamp().seconds() * 1000000ul + recFrame.timeStamp().microSeconds()) - timeBasis));