diff options
author | Andre Hartmann <aha_1980@gmx.de> | 2017-10-26 22:28:50 +0200 |
---|---|---|
committer | André Hartmann <aha_1980@gmx.de> | 2018-01-12 06:56:45 +0000 |
commit | 44a449ff8f0b7cdb71e67385e1bd9a098209045e (patch) | |
tree | 3860802a1afff79563970166f4739a6b187f265e /src/plugins/canbus/vectorcan | |
parent | df9735fc1660dd40730693f08f6e046a5e01deb3 (diff) |
Add more info to QCanBusDeviceInfo
Added description, serial number and channel for SocketCAN, PeakCAN,
SystecCAN, and VectorCAN plugins. For now, not all plugins do support
all kind of information:
SocketCAN: description and channel
PeakCAN: description and channel (Windows PCANBasic >= 4.2.0)
SystecCAN: description, serial number, and channel
VectorCAN: description, serial number, and channel
[ChangeLog][QCanBusDeviceInfo] Added description, serial number
and channel to QCanBusDeviceInfo, as far as supported by the
various plugins.
Change-Id: Ib2292e06065eb91848f682ebf69a4cc968f4d4ba
Reviewed-by: Rolf Eike Beer <eb@emlix.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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp index 656491c..dc28d7c 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp @@ -89,7 +89,12 @@ QList<QCanBusDeviceInfo> VectorCanBackend::interfaces() const bool isVirtual = config.channel[i].hwType == XL_HWTYPE_VIRTUAL; const bool isFd = config.channel[i].channelCapabilities & XL_CHANNEL_FLAG_CANFD_SUPPORT; - result.append(createDeviceInfo(QStringLiteral("can") + QString::number(i), isVirtual, isFd)); + const int channel = config.channel[i].hwChannel; + const QString name = QStringLiteral("can") + QString::number(i); + const QString serial = QString::number(config.channel[i].serialNumber); + const QString description = QLatin1String(config.channel[i].name); + result.append(std::move(createDeviceInfo(name, serial, description, channel, + isVirtual, isFd))); } VectorCanBackendPrivate::cleanupDriver(); |