From 49a5b761bc7b94c976d5255570ef8ede588dca33 Mon Sep 17 00:00:00 2001 From: alessandro negrin Date: Wed, 26 Mar 2025 19:28:26 +0100 Subject: [PATCH] some other timestamps --- connections/gvretserial.cpp | 6 ++++-- connections/lawicel_serial.cpp | 5 +++-- connections/mqtt_bus.cpp | 3 ++- connections/serialbusconnection.cpp | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/connections/gvretserial.cpp b/connections/gvretserial.cpp index dc63ae0..77eeaba 100644 --- a/connections/gvretserial.cpp +++ b/connections/gvretserial.cpp @@ -685,9 +685,11 @@ void GVRetSerial::procRXChar(unsigned char c) buildTimestamp += timeBasis; if (useSystemTime) { - buildTimestamp = QDateTime::currentMSecsSinceEpoch() * 1000l; + buildTimestamp = QDateTime::currentMSecsSinceEpoch(); + buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(buildTimestamp / 1000, (buildTimestamp % 1000) * 1000)); + } else { + buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp)); } - buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp)); break; case 4: buildId = c; diff --git a/connections/lawicel_serial.cpp b/connections/lawicel_serial.cpp index ddf9e4d..fd409bc 100644 --- a/connections/lawicel_serial.cpp +++ b/connections/lawicel_serial.cpp @@ -493,7 +493,8 @@ void LAWICELSerial::readSerialData() if (useSystemTime) { - buildTimestamp = QDateTime::currentMSecsSinceEpoch() * 1000l; + buildTimestamp = QDateTime::currentMSecsSinceEpoch(); + buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(buildTimestamp / 1000, (buildTimestamp % 1000) * 1000)); } else { @@ -508,8 +509,8 @@ void LAWICELSerial::readSerialData() //Default to system time if timestamps are disabled. buildTimestamp = QDateTime::currentMSecsSinceEpoch() * 1000l; } + buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp)); } - buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp)); switch (mBuildLine[0].toLatin1()) { diff --git a/connections/mqtt_bus.cpp b/connections/mqtt_bus.cpp index 4220e34..a6cc0d2 100644 --- a/connections/mqtt_bus.cpp +++ b/connections/mqtt_bus.cpp @@ -302,7 +302,8 @@ void MQTT_BUS::clientMessageReceived(const QMQTT::Message& message) frame_p->isReceived = true; if (useSystemTime) { - frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, QDateTime::currentMSecsSinceEpoch() * 1000ul)); + qint64 currentTimeMs = QDateTime::currentMSecsSinceEpoch(); + frame_p->setTimeStamp(QCanBusFrame::TimeStamp(currentTimeMs / 1000, (currentTimeMs % 1000) * 1000)); } else frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, timeStamp)); diff --git a/connections/serialbusconnection.cpp b/connections/serialbusconnection.cpp index 8ebebbf..b54aa69 100644 --- a/connections/serialbusconnection.cpp +++ b/connections/serialbusconnection.cpp @@ -211,7 +211,8 @@ void SerialBusConnection::framesReceived() frame_p->isReceived = !recFrame.hasLocalEcho(); if (useSystemTime) { - frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, QDateTime::currentMSecsSinceEpoch() * 1000ul)); + qint64 currentTimeMs = 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));