diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-31 20:34:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-31 20:34:15 +0200 |
| commit | 943518be292f929ff49a589eaa39f7de8a2a14a1 (patch) | |
| tree | 4d5ae1f4084b7f5286f11076b4256a6588ae4c4b /src/plugins/canbus/vectorcan/vectorcanbackend.cpp | |
| parent | 518606690eb1fa021aaecb8e75c6686c4ebea6cf (diff) | |
| parent | 90be9fc65329509229eb17aef74e400fada58da9 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta1
Conflicts:
src/plugins/canbus/canbus.pro
src/plugins/canbus/vectorcan/vectorcanbackend.cpp
Change-Id: I3625693784e88204c93479806242ae70c7ec7ff3
Diffstat (limited to 'src/plugins/canbus/vectorcan/vectorcanbackend.cpp')
| -rw-r--r-- | src/plugins/canbus/vectorcan/vectorcanbackend.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp index e57bb40..47662a6 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 Denis Shienkov <denis.shienkov@gmail.com> +** Copyright (C) 2017 Denis Shienkov <denis.shienkov@gmail.com> ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtSerialBus module of the Qt Toolkit. @@ -354,8 +354,8 @@ void VectorCanBackendPrivate::startRead() if ((msg.flags & XL_CAN_MSG_FLAG_TX_COMPLETED) && !transmitEcho) continue; - QCanBusFrame frame(msg.id, QByteArray(reinterpret_cast<const char *>(msg.data), - int(msg.dlc))); + QCanBusFrame frame(msg.id & ~XL_CAN_EXT_MSG_ID, + QByteArray(reinterpret_cast<const char *>(msg.data), int(msg.dlc))); 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) |