diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2016-09-07 21:03:44 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2016-09-19 06:35:59 +0000 |
| commit | a6691ac17232863b063d6e6dd4fd7da3bab9f908 (patch) | |
| tree | 08f05bd85c71614fc8698312bd43873b4291bb70 /src/plugins/canbus/vectorcan | |
| parent | 0def912c140ff23b107bf1ba93d9f0b1487033b2 (diff) | |
QCanBusFrame: Easier TimeStamp creation from microseconds only
The new function fromMicroSeconds() automatically converts overflow
microseconds to seconds.
[ChangeLog][QtSerialBus][QCanBusFrame::TimeStamp]
TimeStamp::fromMicroSeconds() creates time stamps with normalized
microseconds and the overflow added to seconds.
Change-Id: I55aab33c1bcf444c50b09415e038a3c8929caeab
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/canbus/vectorcan')
| -rw-r--r-- | src/plugins/canbus/vectorcan/vectorcanbackend.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp index c178b50..d06f124 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp @@ -324,8 +324,7 @@ void VectorCanBackendPrivate::startRead() QCanBusFrame frame(msg.id, QByteArray(reinterpret_cast<const char *>(msg.data), int(msg.dlc))); - const quint64 usecs = event.timeStamp / 1000; - frame.setTimeStamp(QCanBusFrame::TimeStamp(usecs / 1000000, usecs % 1000000)); + frame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(event.timeStamp / 1000)); frame.setExtendedFrameFormat(msg.id & XL_CAN_EXT_MSG_ID); frame.setFrameType((msg.flags & XL_CAN_MSG_FLAG_REMOTE_FRAME) ? QCanBusFrame::RemoteRequestFrame |