diff options
author | Andre Hartmann <aha_1980@gmx.de> | 2021-07-27 17:41:27 +0200 |
---|---|---|
committer | André Hartmann <aha_1980@gmx.de> | 2021-08-05 13:27:46 +0000 |
commit | a9a7ffb5a97f254a57591e69c3e24212d1743cf4 (patch) | |
tree | 5384b946019a304fbe6361399584699ce2f10234 /src/plugins/canbus/socketcan/socketcanbackend.cpp | |
parent | 8c8b0c4cdabca6917a35daf75a799b8d75a18cdb (diff) |
CAN: Implement QCanBusDevice::deviceInfo() in the plugins
* PasstruCAN: Untested
* PeakCAN: Tested on Windows with PCAN-USB Pro FD.
* SocketCAN: Tested on Linux with virtual and real hardware.
* SystecCAN: Tested on Windows with USBcanmodul2.
* TinyCAN: Untested
* VectorCAN: Tested with the virtual Vector interface.
* VirtualCAN: Tested on Windows and Linux.
Pick-to: 6.2
Change-Id: I3836a81a9cb1570a22b6264b34fca88ccc0ab57e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/canbus/socketcan/socketcanbackend.cpp')
-rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 752c4aa..8d887bf 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -127,6 +127,18 @@ static int deviceChannel(const QString &canDevice) return content.toInt(nullptr, 0); } +QCanBusDeviceInfo SocketCanBackend::socketCanDeviceInfo(const QString &deviceName) +{ + const QString serial; // exists for code readability purposes only + const QString alias; // exists for code readability purposes only + const QString description = deviceDescription(deviceName); + const int channel = deviceChannel(deviceName); + return createDeviceInfo(QStringLiteral("socketcan"), deviceName, + serial, description, + alias, channel, isVirtual(deviceName), + isFlexibleDataRateCapable(deviceName)); +} + QList<QCanBusDeviceInfo> SocketCanBackend::interfaces() { QList<QCanBusDeviceInfo> result; @@ -143,13 +155,7 @@ QList<QCanBusDeviceInfo> SocketCanBackend::interfaces() if (!(flags(deviceName) & DeviceIsActive)) continue; - const QString serial; - const QString description = deviceDescription(deviceName); - const int channel = deviceChannel(deviceName); - result.append(createDeviceInfo(QStringLiteral("socketcan"), deviceName, - serial, description, - QString(), channel, isVirtual(deviceName), - isFlexibleDataRateCapable(deviceName))); + result.append(socketCanDeviceInfo(deviceName)); } std::sort(result.begin(), result.end(), @@ -160,6 +166,11 @@ QList<QCanBusDeviceInfo> SocketCanBackend::interfaces() return result; } +QCanBusDeviceInfo SocketCanBackend::deviceInfo() const +{ + return socketCanDeviceInfo(canSocketName); +} + SocketCanBackend::SocketCanBackend(const QString &name) : canSocketName(name) { |