summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.9.9v5.9.95.9Antti Kokko2019-12-021-0/+20
| | | | | | | + 5fd80b6268c7811d00c3ee3628eac71bd3661c75 Bump version Change-Id: Idb2f042f737eb0f34c997c21b63e3fa225cadc0f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | Change-Id: Ie0003d8aa9cdb2702e8779807df4f12d12f47ae5
* Merge remote-tracking branch 'origin/5.9.8' into 5.9Qt Forward Merge Bot2019-04-251-0/+20
|\ | | | | | | Change-Id: I230c64922bcbfa497463fbdb4e7a734d70358595
| * Add changes file for Qt 5.9.8v5.9.8Antti Kokko2019-03-271-0/+20
|/ | | | | | | + 947b679fd4c5f4cf1ffad1268dfeec20fec91854 Bump version Change-Id: Iac768adadb649aca2f7c852e2651d5f1aa77d36a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.9.7' into 5.9Qt Forward Merge Bot2018-10-231-0/+20
|\ | | | | | | Change-Id: I0a51b5ca33090960e89079069f2e27d4f8a8903a
| * Add changes file for Qt 5.9.7v5.9.7Antti Kokko2018-10-041-0/+20
| | | | | | | | | | | | | | | | | | + 45f17a7d69a2572c229e4e019c312b7315cdbe55 Bump version + 13dec714ecf9f96f265639c3207721d9b8d39e52 Doc: add missing since to enum QCanBusDevice::DataBitRateKey Change-Id: Ic2f7b486d77985f2d4625b495001873c900aa72a Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump versionOswald Buddenhagen2018-10-111-1/+1
|/ | | | Change-Id: I261549c3587a841ecfa23b5c456002542e231647
* Doc: add missing since to enum QCanBusDevice::DataBitRateKeyAndre Hartmann2018-08-071-0/+1
| | | | | | | | Introduced by d4bbdb83. Change-Id: I9af02b34f2c75eae8b7f43fb5ddb3dd310269657 (cherry picked from commit 609104101cd859013097831c393a7cf422b18e03) Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.9.6' into 5.9Qt Forward Merge Bot2018-06-131-0/+28
|\ | | | | | | Change-Id: Idc7b0a97f9f48678a3bc326df2020e0df8104e48
| * Add changes file for Qt 5.9.6v5.9.6Andre Hartmann2018-05-281-0/+28
| | | | | | | | | | Change-Id: Id08a15b9c9425fe0b7c49e6f73318afb8fc23ff8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump versionOswald Buddenhagen2018-05-311-1/+1
|/ | | | Change-Id: I5c0a5c3ad58874eba4150130de37aab76c65a768
* VectorCAN: Fix receiving frames with multiple open channelsAndre Hartmann2018-04-131-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 (cherry picked from commit 20cbe35dc3282b8e27278e3bd54d415cc8147d3c) Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Merge remote-tracking branch 'origin/5.9.5' into 5.9Qt Forward Merge Bot2018-04-111-0/+24
|\ | | | | | | Change-Id: Ieada734cc0fb602f7ec3cde09b67b7840fe55f8a
| * Fix typo in changes filev5.9.5Andre Hartmann2018-03-211-1/+1
| | | | | | | | | | Change-Id: I2eeb6b02c10ee1b819e28c88d8b965a656011913 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Add changes file for Qt 5.9.5Antti Kokko2018-03-191-0/+24
| | | | | | | | | | Change-Id: Ic8a343394048d5c267ab4aa50bb20ef722788f3c Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Bump versionOswald Buddenhagen2018-03-191-1/+1
|/ | | | Change-Id: Ibea64b5a8f1bb3e35a5ad22dfeb2198c359b8cfa
* Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | Change-Id: I49ad76debc9516151a632110e6b1680efaddd721
* 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
| * 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>
* | 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>
* QCanBus: Extend documentation for CAN device usageAndre Hartmann2017-11-031-2/+17
| | | | | | Change-Id: I16406e1d5c344daeb16856bacf1db857f1b820f7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* SystecCAN: Fix availableDevices() for more than one deviceAndre Hartmann2017-10-251-1/+2
| | | | | | | | | | | | | | initInfo->m_fTryNext is set to false when the callback is entered but must be set to true to continue with the next device. [ChangeLog][QCanBus][SystecCAN] Fixed that the function availableDevices() only returned the first device. Change-Id: I689564c2379a1db28cb7c623425aa261e44fdd4d Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* SystecCAN: Fix device number assignment in availableDevices()Andre Hartmann2017-10-231-3/+3
| | | | | | | | | | | | [ChangeLog][QCanBus][SystecCAN] The function availableDevices() returned the wrong device number in some cases. In turn, it was not possible to connect to the correct device afterwards. Task-number: QTBUG-63833 Change-Id: I37cc250d144596af00aec9f743f0016e5634abe7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Fix outdated BSD license headerKai Koehne2017-10-2027-54/+324
| | | | | | Change-Id: Ifdd8f08e12f471aee37f749b4ad911ab7b6adb2a Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix outdated FDL license headerKai Koehne2017-10-2013-63/+63
| | | | | | Change-Id: Ib7a43e822a32f7e0c77055baeef4f0fba33092a5 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+34
|\ | | | | | | Change-Id: I336ce25e7ff162077aba4d4334e93f7ad3cb8791
| * Add changes file for Qt 5.9.2v5.9.2Antti Kokko2017-09-221-0/+34
| | | | | | | | | | Change-Id: I74f650914c362f429d649de0ed6dd99e2f513f3a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | Change-Id: Idab2b2fb41ecdf3cf6292f722f0e776e4415634f
* | 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>
* QCanBusDevice: Improve connect/disconnect documentationAndre Hartmann2017-09-051-0/+7
| | | | | | | | | | | ... because I recently saw the following statement in user code: if (!m_device->connectDevice()) m_device->disconnectDevice(); Change-Id: Ifabd5e7416f5cc58d39c197abad3fc53d54e6ccc Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add changes file for Qt 5.6.3Alex Blasche2017-08-301-0/+37
| | | | | | Task-number: QTBUG-62708 Change-Id: I446d60a9d2f3313127f59a92fa7189ca6318334c Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Fix unxepected state in Modbus process queued elementKarsten Heimrich2017-08-141-0/+4
| | | | | | | | | | | | | Due to the nature of our serial bus device, a frame could already be send completely, but the bytes written did not report that yet. Then we received an answer before we reached the receive state, messing up the whole state logic. Now we process incoming frames only if we are in receive state, otherwise drop full frames. Task-number: QTBUG-62144 Task-number: QTBUG-62299 Change-Id: I88a4cf0b64a823409cbb277431a004a9d126cddc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QCanBusFrame: Fix Clang semantic warningAndre Hartmann2017-08-141-2/+2
| | | | | | | | | Semantic Issue -Wformat-nonliteral 391:37: warning: format string is not a string literal Change-Id: I0154e9db2c47fa5645f236197ee73c5309ef622d Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix address counter for received modbus register entriesAlex Blasche2017-08-101-1/+1
| | | | | | | | THis happens when the number of retrieved entries is larger than 1. Task-number: QTBUG-62421 Change-Id: I250d528914d887d0c9be34cd828763f87a5099e7 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Use QSharedPointer::create() moreMarc Mutz2017-07-241-1/+1
| | | | | | | | | | This is the result of running the (experimental) clang-tidy check qt-modernize-qsharedpointer-create Discarded changes: none. Change-Id: I4eca880aac30cf595b7f0667c755dcad1734abcb Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | Change-Id: I69eb6de3f3eb6d880884535f2a4564bbddc21630
* Add changes file for 5.9.1v5.9.1Alex Blasche2017-06-221-0/+30
| | | | | Change-Id: I40fa19b016ca5e8e8e831a909eb378545a026446 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Fix build with Clang 5.0: remove unused captureThiago Macieira2017-06-131-1/+1
| | | | | | | qmodbusrtuserialmaster_p.h:356:68: error: lambda capture 'this' is not used [-Werror,-Wunused-lambda-capture] Change-Id: Ia53158e207a94bf49489fffd14c7903c7e4655cb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-312-0/+63
|\ | | | | | | Change-Id: I9c93f053c5a6a7af04c79d6e2cc8ded76c906319
| * fix namespaced buildv5.9.0-rc2v5.9.0-rc1v5.9.0Oswald Buddenhagen2017-05-121-0/+2
| | | | | | | | | | Change-Id: I7daa9be5b0b21c0f94021b9a2eb139915c501049 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add changes file for 5.9.0Alex Blasche2017-05-101-0/+61
| | | | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: I2f3b131c319feb0e95d8d08e9a07b71078f52a57 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | CAN Example: Add menu entry to show online documentationAndre Hartmann2017-05-292-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | The different plugins have varying runtime requirements, that should be described in the plugins documentation. Allow the user to open the documentation easily. [ChangeLog][QCanBus] Added a menu to open plugins online documentation to the CAN Example. Change-Id: I2ae19b439f91042c6bcb09a7db079249fb34355c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | PeakCAN: Update supported channels documentationAndre Hartmann2017-05-231-2/+2
| | | | | | | | | | | | | | | | Amends commit 3f8eb3be91641f9dba597e4421f9bbf50c5c161e Change-Id: Ibc0a1019ac4a4e63044c43125826614983a604e4 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | CAN: Add requirements to plugin documentationAndre Hartmann2017-05-234-0/+12
| | | | | | | | | | | | Change-Id: I0dbbf10d8448c5d26f28bd7fa84cdeab21e6eb5c 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-05-02 16:36:18 +0000