diff options
Diffstat (limited to 'src/plugins/canbus')
7 files changed, 14 insertions, 8 deletions
diff --git a/src/plugins/canbus/passthrucan/passthrucanbackend.cpp b/src/plugins/canbus/passthrucan/passthrucanbackend.cpp index 3d1e817..e9e361f 100644 --- a/src/plugins/canbus/passthrucan/passthrucanbackend.cpp +++ b/src/plugins/canbus/passthrucan/passthrucanbackend.cpp @@ -177,8 +177,7 @@ QList<QCanBusDeviceInfo> PassThruCanBackend::interfaces() const QString name = canAdapterName(entries); if (!name.isEmpty()) - list.append(createDeviceInfo(name, false, false)); - + list.append(createDeviceInfo(QStringLiteral("passthrucan"), name, false, false)); entries.endGroup(); } #endif diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp index b725702..2139110 100644 --- a/src/plugins/canbus/peakcan/peakcanbackend.cpp +++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp @@ -161,7 +161,8 @@ QList<QCanBusDeviceInfo> PeakCanBackend::interfacesByChannelCondition() if (idStat == PCAN_ERROR_OK) alias = QString::number(deviceId); - result.append(createDeviceInfo(QLatin1String(pcanChannels[i].name), + result.append(createDeviceInfo(QStringLiteral("peakcan"), + QLatin1String(pcanChannels[i].name), QString(), QLatin1String(description), alias, channel, false, isFd)); } @@ -208,7 +209,8 @@ QList<QCanBusDeviceInfo> PeakCanBackend::interfacesByAttachedChannels(bool *ok) const int channel = info.controller_number; const bool isCanFd = (info.device_features & FEATURE_FD_CAPABLE); - result.append(createDeviceInfo(name, QString(), description, alias, + result.append(createDeviceInfo(QStringLiteral("peakcan"), name, QString(), + description, alias, channel, false, isCanFd)); } } diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 69dce97..752c4aa 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -146,7 +146,8 @@ QList<QCanBusDeviceInfo> SocketCanBackend::interfaces() const QString serial; const QString description = deviceDescription(deviceName); const int channel = deviceChannel(deviceName); - result.append(createDeviceInfo(deviceName, serial, description, + result.append(createDeviceInfo(QStringLiteral("socketcan"), deviceName, + serial, description, QString(), channel, isVirtual(deviceName), isFlexibleDataRateCapable(deviceName))); } diff --git a/src/plugins/canbus/systeccan/systeccanbackend.cpp b/src/plugins/canbus/systeccan/systeccanbackend.cpp index 4daf48d..a95d243 100644 --- a/src/plugins/canbus/systeccan/systeccanbackend.cpp +++ b/src/plugins/canbus/systeccan/systeccanbackend.cpp @@ -69,7 +69,8 @@ QCanBusDeviceInfo SystecCanBackend::createDeviceInfo(const QString &serialNumber int channelNumber) { const QString name = QString::fromLatin1("can%1.%2").arg(deviceNumber).arg(channelNumber); - return QCanBusDevice::createDeviceInfo(name, serialNumber, description, + return QCanBusDevice::createDeviceInfo(QStringLiteral("systeccan"), name, + serialNumber, description, QString(), channelNumber, false, false); } diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp index eed10ae..527cd14 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.cpp +++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp @@ -74,7 +74,8 @@ bool TinyCanBackend::canCreate(QString *errorReason) QList<QCanBusDeviceInfo> TinyCanBackend::interfaces() { QList<QCanBusDeviceInfo> result; - result.append(createDeviceInfo(QStringLiteral("can0.0"), false, false)); + result.append(createDeviceInfo(QStringLiteral("tinycan"), QStringLiteral("can0.0"), + false, false)); return result; } diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp index 1300a27..c05b57c 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp @@ -93,7 +93,8 @@ QList<QCanBusDeviceInfo> VectorCanBackend::interfaces() 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(createDeviceInfo(name, serial, description, QString(), + result.append(createDeviceInfo(QStringLiteral("vectorcan"), name, + serial, description, QString(), channel, isVirtual, isFd)); } diff --git a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp index 5a7403b..4e02c7d 100644 --- a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp +++ b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp @@ -306,6 +306,7 @@ QList<QCanBusDeviceInfo> VirtualCanBackend::interfaces() for (int channel = 0; channel < VirtualChannels; ++channel) { result.append(createDeviceInfo( + QStringLiteral("virtualcan"), QStringLiteral("can%1").arg(channel), QString(), QStringLiteral("Qt Virtual CAN bus"), QString(), channel, true, true)); |