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

some other timestamps

Browse Source
This commit is contained in:
alessandro negrin
2025-03-26 19:28:26 +01:00
parent b0fba1b6de
commit 49a5b761bc
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/gvretserial.cpp
+4 -2
View File
@@ -685,9 +685,11 @@ void GVRetSerial::procRXChar(unsigned char c)
buildTimestamp += timeBasis; buildTimestamp += timeBasis;
if (useSystemTime) 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; break;
case 4: case 4:
buildId = c; buildId = c;
connections/lawicel_serial.cpp
+3 -2
View File
@@ -493,7 +493,8 @@ void LAWICELSerial::readSerialData()
if (useSystemTime) if (useSystemTime)
{ {
buildTimestamp = QDateTime::currentMSecsSinceEpoch() * 1000l; buildTimestamp = QDateTime::currentMSecsSinceEpoch();
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(buildTimestamp / 1000, (buildTimestamp % 1000) * 1000));
} }
else else
{ {
@@ -508,8 +509,8 @@ void LAWICELSerial::readSerialData()
//Default to system time if timestamps are disabled. //Default to system time if timestamps are disabled.
buildTimestamp = QDateTime::currentMSecsSinceEpoch() * 1000l; buildTimestamp = QDateTime::currentMSecsSinceEpoch() * 1000l;
} }
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp));
} }
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp));
switch (mBuildLine[0].toLatin1()) switch (mBuildLine[0].toLatin1())
{ {
connections/mqtt_bus.cpp
+2 -1
View File
@@ -302,7 +302,8 @@ void MQTT_BUS::clientMessageReceived(const QMQTT::Message& message)
frame_p->isReceived = true; frame_p->isReceived = true;
if (useSystemTime) 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)); else frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, timeStamp));
connections/serialbusconnection.cpp
+2 -1
View File
@@ -211,7 +211,8 @@ void SerialBusConnection::framesReceived()
frame_p->isReceived = !recFrame.hasLocalEcho(); frame_p->isReceived = !recFrame.hasLocalEcho();
if (useSystemTime) { 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)); else frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, (recFrame.timeStamp().seconds() * 1000000ul + recFrame.timeStamp().microSeconds()) - timeBasis));