diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-02-14 06:50:12 +0100 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-02-16 12:23:40 +0000 |
| commit | 1f2f5b700b0e72785af46ae23775009cb55a1192 (patch) | |
| tree | fbbb7c09f8dfac5a45a9157161b266809b89f78b /src/plugins/canbus/vectorcan/vectorcan_symbols_p.h | |
| parent | a0c5dc1bb516e205e10264f8c5dd8b5402d10bfe (diff) | |
VectorCAN: Fix receiving frames with extended ID
Beside the CAN ID, the bit XL_CAN_EXT_MSG_ID
is stored in event.tagData.msg.id. This bit
indicates, that the received frame has
extended frame format.
However, this bit must be masked before calling
QCanBusFrame::setFrameId(), otherwise the frame
is marked as invalid with the ID set to zero.
Most likely this was broken by commit
a54fd820916caed2fb13b1a38e57deb5d918f74f
Task-number: QTBUG-58840
Change-Id: I1814f19fe3ba8a7d057c42e112b62228fabf4206
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/canbus/vectorcan/vectorcan_symbols_p.h')
| -rw-r--r-- | src/plugins/canbus/vectorcan/vectorcan_symbols_p.h | 2 |
1 files changed, 1 insertions, 1 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. |