diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-10-18 21:52:21 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-10-23 15:25:30 +0000 |
| commit | 9cfcc2f9868759dc679c0cf4532fb1c0883451d0 (patch) | |
| tree | b662103e34ecdb56ff2eae06ac12c0c1b4b4d92d | |
| parent | f7bd7f294b0b92fad31c39c876c7e42d1a2a3038 (diff) | |
SystecCAN: Fix device number assignment in availableDevices()
[ChangeLog][QCanBus][SystecCAN] The function availableDevices()
returned the wrong device number in some cases. In turn, it was
not possible to connect to the correct device afterwards.
Task-number: QTBUG-63833
Change-Id: I37cc250d144596af00aec9f743f0016e5634abe7
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| -rw-r--r-- | src/plugins/canbus/systeccan/systeccanbackend.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/canbus/systeccan/systeccanbackend.cpp b/src/plugins/canbus/systeccan/systeccanbackend.cpp index 652c8cb..ca63e86 100644 --- a/src/plugins/canbus/systeccan/systeccanbackend.cpp +++ b/src/plugins/canbus/systeccan/systeccanbackend.cpp @@ -67,13 +67,13 @@ static void DRV_CALLBACK_TYPE ucanEnumCallback(DWORD index, BOOL isUsed, { auto result = static_cast<QStringList *>(args); + Q_UNUSED(index); Q_UNUSED(isUsed); - Q_UNUSED(hardwareInfo); Q_UNUSED(initInfo); - result->append(QString::fromLatin1("can%1.0").arg(index)); + result->append(QString::fromLatin1("can%1.0").arg(hardwareInfo->m_bDeviceNr)); if (USBCAN_CHECK_SUPPORT_TWO_CHANNEL(hardwareInfo)) - result->append(QString::fromLatin1("can%1.1").arg(index)); + result->append(QString::fromLatin1("can%1.1").arg(hardwareInfo->m_bDeviceNr)); } QList<QCanBusDeviceInfo> SystecCanBackend::interfaces() |