diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2016-09-22 21:48:11 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2016-09-23 08:50:05 +0000 |
| commit | a69c84909c6fdc8cd9f8bafdf4ad4575ec634a4a (patch) | |
| tree | 8512ed68c1f843950628019b714f5d72691495a5 /src/plugins/canbus/peakcan/peakcanbackend.cpp | |
| parent | ac5c174e87f070a82abc7c3e331cb2cd1093611b (diff) | |
PeakCAN: Create TimeStamp with fromMicroSeconds
Change-Id: I6810460e0ac2b6e9042476b48b662938d792e737
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/canbus/peakcan/peakcanbackend.cpp')
| -rw-r--r-- | src/plugins/canbus/peakcan/peakcanbackend.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp index 09d4e34..d8ddf76 100644 --- a/src/plugins/canbus/peakcan/peakcanbackend.cpp +++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp @@ -400,8 +400,8 @@ void PeakCanBackendPrivate::startRead() QCanBusFrame frame(message.ID, QByteArray(reinterpret_cast<const char *>(message.DATA), int(message.LEN))); const quint64 millis = timestamp.millis + Q_UINT64_C(0xFFFFFFFF) * timestamp.millis_overflow; - const quint64 micros = Q_UINT64_C(1000) * (millis % 1000) + timestamp.micros; - frame.setTimeStamp(QCanBusFrame::TimeStamp(millis / 1000, micros)); + const quint64 micros = Q_UINT64_C(1000) * millis + timestamp.micros; + frame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(micros)); frame.setExtendedFrameFormat(message.MSGTYPE & PCAN_MESSAGE_EXTENDED); frame.setFrameType((message.MSGTYPE & PCAN_MESSAGE_RTR) ? QCanBusFrame::RemoteRequestFrame : QCanBusFrame::DataFrame); |