summaryrefslogtreecommitdiffstats
path: root/src/plugins/canbus/peakcan
Commit message (Collapse)AuthorAgeFilesLines
* Avoid conflicting class names if the plugins are linked staticallyAndy Shaw2019-11-051-9/+9
| | | | | | | | | | | | | | QtSerialBus is already using QtSerialPort which has a WriteNotifier and ReadNotifier class in place. Therefore it is possible that if these were linked in together into one application that there would be multiple instances of the same class name which caused problems as it would think that the WriteNotifier in QtSerialPort was a QTimer and not a QSocketNotifier. So keep the names unique to be on the safe side. Change-Id: I8667e3d4230b316d47e266ad1b4319cf5e74444b Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit f129107e472c179e47b37d8fdaff120d1eccc7f8) Reviewed-by: André Hartmann <aha_1980@gmx.de>
* CAN: Avoid symbol clashes on static buildsAndre Hartmann2019-09-232-2/+2
| | | | | | | | | | | | | | | | Having the same function name in a global namespace can lead the linker to pick an arbitrary one instead the right one. [ChangeLog] Fixed problems on static builds where an arbitrary version of resolveSymbol() was used instead the correct one. Fixes: QTBUG-78546 Change-Id: I0ff9bc3e5905b3b9694dfe9d446b2a52700f213f Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> (cherry picked from commit 80144b89ca1adede0db9d6e485037f5e431216c3) Reviewed-by: André Hartmann <aha_1980@gmx.de>
* remove pointless PLUGIN_EXTENDS stanzasOswald Buddenhagen2018-11-071-1/+0
| | | | | | | | there is no point in putting the owning module there. Change-Id: I9bc49ae323a4bbc8cd35d10493c899466645bd44 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* PeakCAN: Fix Clang warning about sign conversionAndre Hartmann2018-05-181-1/+1
| | | | | | | | | | Introduced by e0e89f0719497d43fcbd14a2c8d17bcaaf595a78 which changed the constants PCAN_CHANNEL_AVAILABLE and FEATURE_FD_CAPABLE to unsigned integers. Change-Id: I0d9278d2842180230ac3d744595151762de77794 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* PeakCAN: Adopt symbols file to latest pcanbasic.hAndre Hartmann2018-03-191-149/+177
| | | | | | Change-Id: I802c68d7ea6422640a83d7e5ea17c591a8e3d078 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* PeakCAN: Add CAN FD functionalityAndre Hartmann2018-03-153-50/+269
| | | | | | | | | | | | | | | | | | | Tested on Windows 7 with PCAN-USB Pro, both channels connected, one side connected to PCAN-View, other side to CAN-Example. The bitrate handling is done according the information in the following threads: https://www.peak-system.com/forum/viewtopic.php?f=41&t=1756 https://www.peak-system.com/forum/viewtopic.php?f=177&t=1257 [ChangeLog][QCanBus][Plugins] Added CAN FD functionality to the PeakCAN plugin. Therefore the minimum required PCAN-Basic version is now 4.0.0. Task-number: QTBUG-62959 Change-Id: I76180d3e251969bfaa324708de6b7e39487b45f3 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add more info to QCanBusDeviceInfoAndre Hartmann2018-01-121-4/+20
| | | | | | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-201-2/+14
|\ | | | | | | Change-Id: Ia04f54eee1264b659d8928b7f08d7221f587bc54
| * Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-301-1/+13
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icfbad81955ad8a7c4ddc49ac4ee952bcba6317ec
| | * PeakCAN: Avoid turning PeakCAN status frames into random data framesAndre Hartmann2017-10-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][CanBus][PeakCAN] Peak CAN status frames are no longer converted into QCanBusFrame::DataFrame, they are simply dropped for now. In a later Qt version they might by converted into proper QCanBusFrame::ErrorFrame, together with an interpretErrorFrame() implementation. Change-Id: I673ef2c8d312a96de192def831036ad10d5f2c01 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Marcell Varga <eandr2@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * PeakCAN: Fix connect() always returning false under LinuxMarcell Varga2017-09-291-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was impossible to open a Peak CAN device under Linux, because CAN_SetValue (which is needed for the Windows implementation) always returned with error. Task-number: QTBUG-63428 Change-Id: I353bf44a7bdea4a18ef84d8037a3a9fd86d47d89 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
| * | PeakCAN: Remove unneeded emitAndre Hartmann2017-10-131-1/+1
| |/ | | | | | | | | | | | | | | Found by clazy. Change-Id: Ie04fadd3adacde9739c5cba7f566caac78f1d696 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | CAN: Improve checking for unsupported CAN FD framesAndre Hartmann2017-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for the correct data length is already done by QCanBusFrame::isValid. Plugins that don't support CAN FD should rather check for the CAN FD flag and discard CAN FD frames with payload length < 8 also. [ChangeLog][CAN bus plugins] The CAN bus plugins that don't support CAN FD now also discard CAN FD frames with payload length < 8. Change-Id: I5a699a497b79dab2b8960fadc7fa30dbda6c4a62 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Rolf Eike Beer <eb@emlix.com>
* | CAN: Introduce categorized loggingAndre Hartmann2017-11-132-3/+10
| | | | | | | | | | | | | | | | | | | | [ChangeLog][CAN bus] Introduced categorized logging to the CAN bus module which can be enabled by the "qt.canbus" and "qt.canbus.plugins.<pluginname>" filters. Change-Id: Ib39c0b2ebcd967cd7812602190807ad3488ccb18 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | PeakCAN: Make global structure static and constAndre Hartmann2017-10-051-1/+1
| | | | | | | | | | | | Change-Id: I0a79a81212cf92e88e6a747b2b20e5af268c5edb Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | PeakCAN: Always compile without PCANBasic.hAndre Hartmann2017-10-051-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the possibility to directly link against pcanbasic.dll/so for now, as it allows to use the PeakCAN plugin without requiring QLibrary. However, as we need to declare all symbols in peakcan_symbols_p.h anyway, there is no need to require the header file. And I need to add another symbol in a follow-up to resolve Clang warnings. Change-Id: Idb7e57d40c8074c0d14d0d1525b09663d148cb8b Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | CAN-Plugins: Fix Clang Semantic Issue -Wold-style-castAndre Hartmann2017-10-051-1/+1
| | | | | | | | | | | | | | | | | | warning: use of old-style cast note: expanded from macro 'RESOLVE_SYMBOL' Change-Id: Icd9ae4c8543e63f1c9cf99d130bf2c26012400be Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | CAN-Plugins: Make some more d-pointers constAndre Hartmann2017-10-051-3/+3
| | | | | | | | | | | | Change-Id: I6483232da88963f6dd46d05ebf990fe798b0b45e Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | PeakCAN: Fix Clang Semantic WarningsAndre Hartmann2017-10-053-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 261:45: warning: implicit conversion loses integer precision: 'int' to 'quint16' (aka 'unsigned short') 261:59: warning: implicit conversion loses integer precision: 'const int' to 'quint16' (aka 'unsigned short') 358:39: warning: implicit conversion changes signedness: 'int' to 'quint32' (aka 'unsigned int') qcompilerdetection.h:241:49: note: expanded from macro 'Q_UNLIKELY' 379:27: warning: implicit conversion loses integer precision: 'int' to 'quint8' (aka 'unsigned char') 419:70: warning: implicit conversion changes signedness: 'const quint64' (aka 'const unsigned long long') to 'qint64' (aka 'long long') Change-Id: Ib380145cd8775659bf0145053ac6420b3feb635e Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | PeakCAN: Indent nested includes and definesAndre Hartmann2017-10-052-5/+5
|/ | | | | | Change-Id: I881c9449b9b3594676413cb12ed966522e13f0dc Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* CAN: Remove unneded core-private dependency for pluginsv5.9.0-beta3v5.9.0-beta2Andre Hartmann2017-04-131-1/+1
| | | | | | Change-Id: I9f5c41a5c3cd0c83f3835d29de22b76ac367cdbb Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta1Liang Qi2017-03-315-10/+10
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/canbus/canbus.pro src/plugins/canbus/vectorcan/vectorcanbackend.cpp Change-Id: I3625693784e88204c93479806242ae70c7ec7ff3
| * Updated copyright headersAndre Hartmann2017-02-025-10/+10
| | | | | | | | | | Change-Id: I7d38491c7ee15a1de788375acf9144c59b507d2a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | QCanBusFactory: Restore binary compatibility to Qt 5.8Andre Hartmann2017-03-301-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Added a new QCanBusFactoryV2 to load plugins with the new virtual function availableDevices(). To be able to still load plugins compiled against Qt 5.8, both factories have to be considered when loading plugins and creating devices. Change-Id: I843cdd0b82193e391699daa298454c8b9522e860 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Unify endless loopsv5.9.0-alpha1Andre Hartmann2017-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Replace the macro forever with its expansion "for (;;)", as forever will be deprecated in later Qt versions. Also change the place where another pattern "while (true)" was used, to have them unique (Vector and Systec already use "for (;;)". Change-Id: I3582f7b674c17c35c6954eb359bacf81d2c1faab Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | CAN: Improve error handling codeAndre Hartmann2017-01-241-20/+20
| | | | | | | | | | | | | | | | | | | | | | * Add Q_UNLIKELY to error handling branches * Prefers qWarning("%ls", qUtf16Printable(str)) over qWarning() << str; Task-number: QTBUG-55045 Change-Id: I3e49380bdec0edb2ea00e1b5e3421464b295aacc Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | CAN: Use C++11 class initialization where possibleDenis Shienkov2017-01-182-16/+8
| | | | | | | | | | Change-Id: I2aeeb762297707337273b0a1ecba8b3d13ed923f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-freeAndre Hartmann2017-01-111-1/+2
| | | | | | | | | | Change-Id: I4ec52799514b750c158e3cb8e6c38d1f1063c6c5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | CAN: Add QCanBusDeviceInfoAndre Hartmann2017-01-104-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-121-1/+1
|\| | | | | | | | | | | | | Conflicts: examples/serialbus/can/mainwindow.cpp Change-Id: I8d821a832bc5bf966230b4f66f0113929b3114dc
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-161-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/canbus/peakcan/main.cpp src/plugins/canbus/tinycan/main.cpp src/serialbus/qcanbusframe.h Change-Id: I7a38350688086b5f5cd7072acccb3fa38af76f88
| | * CAN-Backends: Port qUtf8Printable to qUtf16PrintableAndre Hartmann2016-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This amends commit 0c63b3a441437a8bc42770d360a6696bbf11cd2d Change-Id: I934f90384ad9ec7d42e9437cb023b0c5edeb0437 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-232-5/+7
|\| | | | | | | | | | | Change-Id: Iab1b4ac1c44d161a91f7f51cd0da4fc4a674964d
| * | PeakCAN: Create TimeStamp with fromMicroSecondsAndre Hartmann2016-09-231-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I6810460e0ac2b6e9042476b48b662938d792e737 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-192-4/+6
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/canbus/peakcan/main.cpp src/plugins/canbus/tinycan/main.cpp Change-Id: Ia2dac20ddfc27ba96bb36cd70ba011e2d3764f2f
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-172-4/+6
| | |\ | | | | | | | | | | | | Change-Id: I68fd539f6065c6a8351c1d9bdf52f8b01b4ea923
| | | * PeakCAN: Avoid overflows on timestamp calculationAndre Hartmann2016-09-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the formula itself is correct, there is a chance of getting wrong values due to limited data types. Found after a hint from H.Mueller in the Peak Forum: http://www.peak-system.com/forum/viewtopic.php?f=41&t=1238 Change-Id: I0f3036c5d694bee7cc8d3fd54e206545b71344b7 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | | * PeakCAN: Fix timestampsAndre Hartmann2016-08-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TimeStamp object gets seconds and microseconds, so the milliseconds that are smaller than one second have to be transformed to microseconds. Further, add the millis_overflow to extend the range of the timestamps. Change-Id: I0b0b531a7d1f2816d24a0683a2156cb19a3f655e Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | | * PeakCAN: Do not set an error when receive buffer is emptyAndre Hartmann2016-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function PeakCanBackendPrivate::startRead() reads all incoming frames until the receive buffer becomes empty. When the receive buffer is empty, the function should exit silently. Otherwise, an error should be set up. The previous code simply used the wrong constant to allow this valid case. Change-Id: I325e25682d7749950d936bf715a160a2beff7d06 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | | * CAN: Use qUtf8Printable() instead qPrintable() for warningsAndre Hartmann2016-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the qPrintable() help: "Note: qDebug(), qInfo(), qWarning(), qCritical(), qFatal() expect %s arguments to be UTF-8 encoded, while qPrintable() converts to local 8-bit encoding. Therefore qUtf8Printable() should be used for logging strings instead of qPrintable()." Change-Id: I724cc61659dd4f998617eade140b273dca841b35 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | | * CAN: Better error messages when loading dynamic librariesAndre Hartmann2016-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make use of the detailed (and localized) error messages that QLibrary already provides. Example: Cannot load library pcanbasic: \ (pcanbasic: cannot open shared object file: No such file or directory) Change-Id: I3f4fd42d1872a00f2c4ecc6172ccc17995c7888e Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | CAN-Backends: Use std::move to append QCanBusFrame to QVectorAndre Hartmann2016-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For SocketCAN this was already done in 71d19b3e9ccbbfc3131fbd21d983faaca0002621 Change-Id: I734e1d83901f8ce2de189f7d873724aa4aab989f Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | | PeakCAN: Add support for more CAN channelsAndre Hartmann2016-09-153-60/+81
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the PCI and USB interfaces to the maximum supported by the PeakCAN Basic API. The new constants are taken from a recent pcanbasic.h. [ChangeLog][QtSerialBus][PeakCAN] The PeakCAN Plugin now supports up to 16 USB and 16 PCI CAN channels. Change-Id: I02e8e003e56aafd8546cbb32816e4bd9d9c77861 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | CAN: Simplify debug error message generationAndre Hartmann2016-08-311-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The warning is already shown in PeakCanBusPlugin::createDevice() and TinyCanBusPlugin::createDevice() so it does not need to be done here. Change-Id: Ifac34d9b96eff5920d09f3c971caeda62d97839a Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | CAN: Unify interface namesAndre Hartmann2016-08-301-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly, the interfaces now simply start with can0 and the number increases for every next interface. Some vendors distinguish between e.g. PCI and USB interfaces. In this case, the interfaces are named usb0 and pci0, with increasing numbers, respectively. Multiple channels per device are accessed by adding the channel number after a dot: can0.0 for the first channel in the first device (TinyCAN). SocketCAN is still a bit different, as it allows arbitrary interface names to be mapped to the hardware or virtual CAN busses. [ChangeLog][QtSerialBus][Unify interface names] The interface names of the different backends were unified to follow a common rule: The prefixes were unified, the numbering now always starts with zero. Change-Id: Ia2ca76a9be01b9123aed1ede90debf69871bb82c Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge "Merge remote-tracking branch 'gerrit/5.7' into dev" into refs/staging/devAlex Blasche2016-08-021-16/+18
|\ \ \
| * | | Merge remote-tracking branch 'gerrit/5.7' into devAlex Blasche2016-08-011-16/+18
| |\| | | | | | | | | | | | | | Change-Id: I5202af1faa3b92018747b38fe54524cc712d2f43
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-261-13/+19
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/canbus/peakcan/peakcanbackend.cpp One side renamed a member. The other changed some code using it. Change-Id: I14131122835ab9014894eadf4b529bdfd413e436
| | | * PeakCAN: Remove unneeded emitAndre Hartmann2016-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCanBusDevice::setError() is no SIGNAL, but a protected member function. Change-Id: I10e83d189d3df93504b759729d0c4fc5caa682b0 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| | | * CAN: More information when configuration failsAndre Hartmann2016-07-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... for PEAK and TINY backends. Change-Id: I0285107616bbfbaa91df266e2116f5d7460d60ca Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 11:23:28 +0000