diff options
| -rw-r--r-- | src/plugins/canbus/vectorcan/vectorcan_symbols_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/canbus/vectorcan/vectorcanbackend.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h index 186aef6..a2ab367 100644 --- a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h +++ b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h @@ -214,7 +214,7 @@ typedef HANDLE XLhandle; //current version #define XL_INTERFACE_VERSION XL_INTERFACE_VERSION_V3 -#define XL_CAN_EXT_MSG_ID 0x80000000 +#define XL_CAN_EXT_MSG_ID 0x80000000U #define XL_CAN_MSG_FLAG_ERROR_FRAME 0x01 #define XL_CAN_MSG_FLAG_OVERRUN 0x02 // Overrun in Driver or CAN Controller, previous msgs have been lost. diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp index 6ad5047..c91afad 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp @@ -322,8 +322,8 @@ void VectorCanBackendPrivate::startRead() const s_xl_can_msg &msg = event.tagData.msg; - 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) |