diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2016-07-31 20:43:13 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-01-10 15:18:02 +0000 |
| commit | 55d405697c79c4ca23535140e60915e89b4054e3 (patch) | |
| tree | 8144ae742df62f6d362a71d160a2e3e93484fd96 /src/plugins/canbus/tinycan | |
| parent | 66fd2b9655d5f34f880b8daf8b2f422a27789517 (diff) | |
CAN: Add QCanBusDeviceInfo
Returns:
* a list of available devices for the chosen plugin
* if the device is virtual
* if the device is CAN FD capable
Use this list in the CAN Example for interface selection.
If information about virtual channels or CAN FD capabability is not
available, false is returned.
For SocketCAN, PeakCAN, VectorCAN and SystecCAN, the implementation is
completed. TinyCAN only return the list of possible interfaces for now.
This is can be changed later, but needs quite some refactoring of the
TinyCAN plugin.
[ChangeLog][QtCanBus] Added the new class QCanBusDeviceInfo
for enumeration of available CAN interfaces and more information
about them.
Task-number: QTBUG-54298
Change-Id: I851bcc3b9ee41aaaf1164c6b4a5aaf6503cd8746
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/canbus/tinycan')
| -rw-r--r-- | src/plugins/canbus/tinycan/main.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.h | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/src/plugins/canbus/tinycan/main.cpp b/src/plugins/canbus/tinycan/main.cpp index fe988ba..55c5590 100644 --- a/src/plugins/canbus/tinycan/main.cpp +++ b/src/plugins/canbus/tinycan/main.cpp @@ -51,6 +51,12 @@ class TinyCanBusPlugin : public QObject, public QCanBusFactory public: + QList<QCanBusDeviceInfo> availableDevices(QString *errorMessage) const override + { + Q_UNUSED(errorMessage); + return TinyCanBackend::interfaces(); + } + QCanBusDevice *createDevice(const QString &interfaceName, QString *errorMessage) const override { QString errorReason; diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp index 0961813..390adee 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.cpp +++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp @@ -68,6 +68,11 @@ bool TinyCanBackend::canCreate(QString *errorReason) #endif } +QList<QCanBusDeviceInfo> TinyCanBackend::interfaces() +{ + return { createDeviceInfo(QStringLiteral("can0.0")), createDeviceInfo(QStringLiteral("can0.1")) }; +} + Q_GLOBAL_STATIC(QList<TinyCanBackendPrivate *>, qChannels) static QMutex channelsGuard(QMutex::NonRecursive); diff --git a/src/plugins/canbus/tinycan/tinycanbackend.h b/src/plugins/canbus/tinycan/tinycanbackend.h index bd3aca0..3726a71 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.h +++ b/src/plugins/canbus/tinycan/tinycanbackend.h @@ -40,6 +40,7 @@ #include <QtSerialBus/qcanbusframe.h> #include <QtSerialBus/qcanbusdevice.h> +#include <QtSerialBus/qcanbusdeviceinfo.h> #include <QtCore/qvariant.h> #include <QtCore/qvector.h> @@ -68,6 +69,7 @@ public: QString interpretErrorFrame(const QCanBusFrame &errorFrame) override; static bool canCreate(QString *errorReason); + static QList<QCanBusDeviceInfo> interfaces(); private: TinyCanBackendPrivate * const d_ptr; |