summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-091-0/+24
| | | | | Change-Id: Ie285fad74e95575f225e4b2008ae641637907b01 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Add binary compatibility file for QtSerialBus for 5.11Milla Pohjanheimo2018-06-051-0/+5038
| | | | | | | Binary compatibility file for bic test added. Change-Id: I93a13cf30861a7f3e3e97811216c0c37a8158151 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add changes file for Qt 5.9.6Andre Hartmann2018-06-041-0/+28
| | | | | | | Change-Id: Id08a15b9c9425fe0b7c49e6f73318afb8fc23ff8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 6654d88750cf5431086fe1d3187ec87f52533b18) Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Add changes file for Qt 5.9.5Antti Kokko2018-06-041-0/+24
| | | | | | Change-Id: Ic8a343394048d5c267ab4aa50bb20ef722788f3c Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit df1c204a5214b2d77901572d9de2576f90662a09)
* Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | Change-Id: I3c3f593bca8588a1931f0fa265cb593bb7631c3b
* tst_qmodbusclient: Fix inconsistent overridesFriedemann Kleint2018-05-301-1/+1
| | | | | | | | | | Add override to processResponse(), fixing: \tst_qmodbusclient.cpp(70,10): warning: 'processResponse' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] bool processResponse(const QModbusResponse &response, QModbusDataUnit *data) Change-Id: Ie12af6914647c0a078189f85af1d3b037828eb6e Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Modernize CAN bus exampleAndre Hartmann2018-05-111-1/+1
| | | | | Change-Id: I3f732cf739c598b7725ca43a90f98d0ac9f76750 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-093-26/+75
|\ | | | | | | Change-Id: Ia0b6c9e1918a268f46bb251931377ba26aff17f4
| * Fix compilation with MSVC 2017v5.11.0-rc2v5.11.0Thiago Macieira2018-05-092-26/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | std::bitset<8> fails to compile with MSVC 2017. I don't know why nor do I care. Just use a regular byte for one byte, QBitArray for multiple. bitset(271): error C2666: 'operator /': 10 overloads have similar conversions [...] bitset(271): note: or 'built-in C++ operator/(size_t, )' bitset(271): note: while trying to match the argument list '(size_t, )' bitset(267): note: while compiling class template member function 'std::bitset<8> &std::bitset<8>::set(size_t,bool)' bitset(40): note: see reference to function template instantiation 'std::bitset<8> &std::bitset<8>::set(size_t,bool)' being compiled Change-Id: I5d0ee9389a794d80983efffd152cc64b1e99d236 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * Add changes file for Qt 5.11.0v5.11.0-rc1Antti Kokko2018-04-231-0/+53
|/ | | | | Change-Id: I47f00b9b940e85d8c4d9d77b707283a2ab12b26e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Improve QCanBusDeviceInfo documentationv5.11.0-beta4v5.11.0-beta3Andre Hartmann2018-04-032-1/+3
| | | | | | | | | * Add a link to QCanBusDeviceInfo on the "Qt CAN Bus" page * Add an example for channel() Change-Id: I95e7a36b998c2bb27abdd6839c9653a7c14568e9 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Doc: Remove last remaining \since < Qt 5.8Andre Hartmann2018-04-032-6/+2
| | | | | | | | | | | The binary compatibility promise started with Qt 5.8, so any history before must not be kept. Amends a31a7e0b2b7b3de3e1867ad954ac7fad9531cc99 Change-Id: I45917e2e17ae6c79d2e9f0118873fd421c742e01 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Doc: Fix documentation warningsTopi Reinio2018-03-265-14/+14
| | | | | | | | | | | QDoc in Qt 5.11 uses Clang to parse C++ documentation, and it's capable of resolving templated function signatures; adjust the \fn commands accordingly. Also fix a couple of other minor documentation warnings. Change-Id: I867713a9e805b75bbd57e183aad91d7e21021f0a Reviewed-by: Martin Smith <martin.smith@qt.io>
* VectorCAN: Fix receiving frames with multiple open channelsAndre Hartmann2018-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As reason for the fix, see section "3.4.1 XLevent" in the Vector documentation XL_Driver_Library_Manual_EN.pdf, which states: "portHandle: Internal use only". This portHandle seems to be always zero and therefore channels greater then zero could not receive frames. Tested with Vectors simulated channels by sending frames to one channel which in turn were received by both channels. The sending channel had the local echo flag set, the other one not. [ChangeLog][QCanBus][VectorCAN] Fixed a receive problem in the VectorCAN plugin. When multiple channels were open, only the first one could receive frames. Task-number: QTBUG-67030 Change-Id: Ib76a04bc06e7b810d1c1cb092b79c4bc1aacf23a Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Mihai Baneu <bdmihai@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Ensure QModbusDevice::close() handles being unconnected alreadyv5.11.0-beta2Alex Blasche2018-03-062-0/+13
| | | | | | | | | | | | Prior to this change, an unconnected device would transition into the Closing state if disconnectDevice() was called. Since the transition to Unconnected is bound to sockets being closed the already unconnected ModbusDevice would forever hang in CLosing. Task-number: QTBUG-66648 Change-Id: Ia439f6b63b7d4ab7f377a45fb09cb5f5b99627f7 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Rename master example title to "Client"Alex Blasche2018-03-011-1/+1
| | | | | | | | | | The slave example already uses the Server terminology in the same spot. This change makes the master example consistent with the slave example. The client/server terminology is much easier to understand than Modbus' Master/Slave terminology. Change-Id: Ic99cc75f223394faba8dcd62f144edd76a9dd50a Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Fix compiler warning about extra ";"Alex Blasche2018-02-281-1/+1
| | | | | Change-Id: Ic1c740f779152c330e590f79e6f0343e2191f6e5 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* SYSTEC: std::move received frames into vectorv5.11.0-beta1Andre Hartmann2018-02-191-1/+1
| | | | | Change-Id: I11ca3256347075cf9767eba4667a6ab3da671baf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-180-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I82b9b6698415558f316026ca9cd2465c38a40a22
| * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | Change-Id: I49ad76debc9516151a632110e6b1680efaddd721
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+31
|\ \ | | | | | | | | | Change-Id: I10aed9c0a858c7e1aa6303788a6f623bf3752089
| * | Add changes file for Qt 5.10.1v5.10.1Alex Blasche2018-02-051-0/+31
| | | | | | | | | | | | | | | Change-Id: I486e39d4fe6f02d58b784def4cfd66f23ea1066c Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | QModbusResponse: Silence Clazy warningAndre Hartmann2018-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like a false positive, as response is const, otherwise it should not hurt. Change-Id: I8607abe73566141267c1241f6356d0e9e83f9129 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Tests: Use read-only access to array objects in tst_qcanbusdeviceAndre Hartmann2018-02-101-3/+3
| | | | | | | | | | | | | | | | | | | | | Amends 48325e7e0b1094d96d32c39ad4df6d1c816c5c1e Change-Id: I328199bb0b34d5a484b5ca09247eb2fa04bca452 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-2012-5/+5192
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibcb5508d7f131cbeba0d047111177a8dff1e5f68
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-184-5/+53
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If12daffe4655f71d9aea39e0ed9e0db405a09fe7
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-5/+14
| | |\ | | | | | | | | | | | | Change-Id: I8b91bb58a96b1100d1a726b2a67297f2f46e16ab
| | | * Add missing entry in changes file for 5.9.4v5.9.4Andre Hartmann2018-01-151-5/+14
| | |/ | | | | | | | | | | | | Change-Id: I16fab529be29a1e358c3bda411e78dc5ba90e405 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Add changes file for Qt 5.9.4Antti Kokko2018-01-051-0/+28
| | | | | | | | | | | | | | | Change-Id: I9fa9f9817837c4a0e62aa87b05aba411a360e8aa Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * TinyCAN: Intermediate fix for availableDevices()Andre Hartmann2018-01-032-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Currently there is no way to detect the available devices * The existing code lead to compile errors with MSVC2013 * Also fix the documentation while at it [ChangeLog][QCanBus][Plugins] The function availableDevices() now returns an empty list for the TinyCAN plugin. The code was never functional and always returned a hardcoded example list. The function will be changed in later Qt versions to return the correct values once QTBUG-62958 is solved. Task-number: QTBUG-65474 Change-Id: Iebb4c8d4baf3b021d8890c6b3f252e9050856fce Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I556f75a11da8871f9a4416451b83f94c1ec706b1
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+40
| | |\ | | | | | | | | | | | | Change-Id: I2ebea06cfbaf46189df5eb5a8e3d9a0b07857521
| | * | SocketCAN: Compile with Kernels without CAN FD BRS/ESIAndre Hartmann2017-11-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][SocketCAN] Fixed compiling the SocketCAN plugin with older Kernels without support for CAN FD bitrate switch and error state indicator. Task-number: QTBUG-64406 Change-Id: I05a7869b7df64ae6c3c29aa69dbf423d886b610a Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | qtlite: Skip building examples when configured with no-feature-itemviewsRainer Keller2018-01-124-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-53141 Change-Id: I04c3627ca94de9277d7c09365b4de6a382187c62 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I336b1b53a050a5ee1b2bb87a87677517e3aaf051
| * | | Add binary compatibility file for QtSerialBus for 5.10Milla Pohjanheimo2017-12-141-0/+5038
| | | | | | | | | | | | | | | | | | | | | | | | | | | | File to test binary compatibility added for 5.10 Change-Id: I0d9d7fa85e02f3cc34c108e81ecc54ed27b8adbd Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | | Add missing include for struct timevalSamuli Piippo2017-12-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build failure with musl libc: socketcanbackend.h:88:38: error: 'timeval' was not declared in this scope Change-Id: I4089f5a906095c21b2790d35ad131d9a0713ff3b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+96
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I76483ff0ae381bb6e594385df324b9ce5fffb45f
| | * \ \ Merge "Merge remote-tracking branch 'origin/5.9.3' into 5.10.0" into ↵v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Lars Knoll2017-11-221-0/+40
| | |\ \ \ | | | | | | | | | | | | | | | | | | refs/staging/5.10.0
| | | * \ \ Merge remote-tracking branch 'origin/5.9.3' into 5.10.0Liang Qi2017-11-211-0/+40
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | Change-Id: I88af59c5da87bdeadc06a99cd666341c1b23bc3a
| | | | * | Add changes file for Qt 5.9.3v5.9.3Antti Kokko2017-11-081-0/+40
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2966b9f968835c190cefb99cbfd98ae0a033e6df Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| | * | / Fix typo in changes file for 5.10.0 versionAndre Hartmann2017-11-221-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | Change-Id: Ifddd3ed7cfd8c9bc4f950ea4735b7bc888bba742 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-203-6/+41
| | |\ \ | | |/ / | |/| | | | | | Change-Id: I39fdb7d6cb58785adabd993c78e8c1f7e46e26cf
| | * | Add changes file for Qt 5.10.0Antti Kokko2017-11-121-0/+56
| | | | | | | | | | | | | | | | | | | | Change-Id: I8c383954802b5d8f74a2c68e0e8cbf612d9025c2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Add more info to QCanBusDeviceInfoAndre Hartmann2018-01-1212-20/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Doc: Extend logging documentationAndre Hartmann2018-01-031-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add CAN bus logging description * Add links to QLoggingCategory * Add an example for Modbus Change-Id: I9ccca4a90560bc4feeecf1d8fbe5591a90c5e842 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Fix outdated FDL license headerLiang Qi2017-12-051-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I5ca582fcec809d8103df278001c468565ce2e606 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | | Add J2534 Pass-Thru CAN pluginDaniel Elstner2017-11-3012-1/+1578
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog] Add J2534 Pass-Thru CAN plugin SAE J2534 is a standard for communication between a computer and a vehicle. The "passthrucan" plugin adds support for communicating with a vehicle's CAN bus via the generic J2534 Pass-Thru API. The J2534 Pass-Thru API v04.04 is only specified for 32-bit Windows, but implementations for 64-bit Windows and other platforms do exist. Automatic device discovery is based on the Windows registry and thus supported on Windows only. However, this plugin alternatively allows users to specify the path to a J2534 vendor library to load. Any CAN interface adapters that ship with a compliant J2534 Pass-Thru interface library (v04.04) for the target platform should work with this plugin. It should be noted though that driver support for x64 is as of yet rare, thus a 32-bit Qt build may be required to make use of the passthrucan plugin. Change-Id: I55280d455828d9cf0ad03690224b924b39c17cf7 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Canbusutil: General cleanup and simplificationAndre Hartmann2017-11-285-81/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Order includes and use forward-declarations * Use member initialization and nullptr * Transfrom last connects to Qt5 style * Translate output messages * Name slots better * Discard frames with invalid frame ID or payload size * Simplified some error handling and error outputting Change-Id: Id4d4329afe909ba932e91ad1deeae411806fd77f Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Rolf Eike Beer <eb@emlix.com>
* | | | CAN: Cleanup and modernize testsAndre Hartmann2017-11-233-94/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adopt includes to common style * Use member inits * Use Qt5 connect style * Replace QVERIFY by QCOMPARE where applicaple and vice versa * Prettify comments * Replace QString::fromLatin1 with QStringLiteral Change-Id: I9d838d12062a8fa3312105f8f9110e1ba65616ee Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 03:21:58 +0000