summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix QModbusRtuSerialMaster wouldn't close5.8Konstantin Shtepa2017-03-301-3/+1
| | | | | | | | | | | | QModbusRtuSerialMaster wouldn't close on disconnect and would never release serial port because of patch in QTBUG-56009. Revert part of patch 6bed30d5ceef1463469e37173b3ebac2cfdc2352 which lead to this state. Task-number: QTBUG-59050 Change-Id: I8b3280a2889a416aa80e7f58264b5f9696b8c8b9 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Revert "QCanBusFactory: de-inline virtual destructor"André Hartmann2017-03-272-4/+4
| | | | | | | | | | | It turned out, that this change is not binary compatible as it was meant to be. Loading the plugins with QPluginLoader failed, so this patch needs to be reverted. This reverts commit b63a833346ed14baddbf598d48e005090b8bcb56. Change-Id: I32c7e3a46bdd5e2ea6217e6d2050a3878f53f1ff Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* modbus master example: fix nonsensical codeMarc Mutz2017-03-221-1/+1
| | | | | | | | | | | | Pointed out by GCC 7: writeregistermodel.cpp:117:48: warning: enum constant in boolean context [-Wint-in-bool-context] if (index.column() == HoldingColumn && Qt::EditRole) { // holding registers ^~~~~~~~ Change-Id: I5d0f19c0480b027109c6a751f69852114cb634b2 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: David Faure <david.faure@kdab.com>
* VectorCAN: Fix build with -no-feature-libraryAndre Hartmann2017-03-091-2/+1
| | | | | | | Amends commit 6803fbb01566e74df895326fb7805868696ce9c4 Change-Id: I97d06afa554df0c7528164f8accf9196c542e65c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix build with -no-feature-libraryUlf Hermann2017-03-063-2/+6
| | | | | | | | | Drop an unused include, don't try to set the library path if !QT_CONFIG(library) and don't build the peakcan and tinycan plugins as those use QLibrary to look up their symbols. Change-Id: Id8b1245c1cf69f7548e050d47d5956f53562477d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QCanBusFactory: de-inline virtual destructorAndre Hartmann2017-03-032-4/+4
| | | | | | | | As demanded in the API review. Change-Id: I640ab16a12ab9297270371550236eda903f26ea2 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* VectorCAN: Load vxlapi64.dll for 64 bit buildsAndre Hartmann2017-02-171-0/+4
| | | | | | | Task-number: QTBUG-58774 Change-Id: I9ac12dbb5ae267a063b3c60130ed86499bce22dc Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* VectorCAN: Fix receiving frames with extended IDAndre Hartmann2017-02-162-3/+3
| | | | | | | | | | | | | | | | | | | Beside the CAN ID, the bit XL_CAN_EXT_MSG_ID is stored in event.tagData.msg.id. This bit indicates, that the received frame has extended frame format. However, this bit must be masked before calling QCanBusFrame::setFrameId(), otherwise the frame is marked as invalid with the ID set to zero. Most likely this was broken by commit a54fd820916caed2fb13b1a38e57deb5d918f74f Task-number: QTBUG-58840 Change-Id: I1814f19fe3ba8a7d057c42e112b62228fabf4206 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Binary compatibility file and global.cfg for qtserialbus (5.8.0)Milla Pohjanheimo2017-02-062-0/+4685
| | | | | | | Added binary compatibility file and global.cfg for qtserialbus Change-Id: I43c27c5ce36718856a1b3fa7b8870c3de003d819 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Updated copyright headersAndre Hartmann2017-02-02108-118/+118
| | | | | Change-Id: I7d38491c7ee15a1de788375acf9144c59b507d2a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-262-1/+70
|\ | | | | | | Change-Id: I34693c3a4b342b1a5b30b5adc4af34f67fccb8b2
| * Prettify changes file for 5.8.0v5.8.0-rc1v5.8.0Andre Hartmann2016-12-121-6/+6
| | | | | | | | | | Change-Id: Ieb5bd937787c2f68f97c9ef505e6a0ca091806ac Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix ICC warning about conversion changing signThiago Macieira2016-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | error #68: integer conversion resulted in a change of sign QByteArray elements are char, not quint8. Change-Id: I73fa1e59a4844c43a109fffd148caecfb59c95cc Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
| * Add changes file for 5.8.0Alex Blasche2016-12-071-0/+69
| | | | | | | | | | Change-Id: I46a0970cefa87d2fd401b74638f80c3395ff2391 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | QCanBusFrame: Fix typo in toString() documentationAndre Hartmann2017-01-241-1/+1
| | | | | | | | | | Change-Id: I64b67d7958feabd9d372812343a5dcc50f11cb60 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Update .gitignoreAndre Hartmann2017-01-231-0/+3
| | | | | | | | | | Change-Id: Ife9d8520430b9e7484f93e97d40d2fbe798ca30d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | SocketCAN: Fix frame write error handlingAndre Hartmann2017-01-231-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part I If ConfigurationParameter::CanFdKey is not set, the SocketCAN driver is not forced to CAN FD mode. Therefore, writing CAN FD frames fails, even if the bus (virtual or real) is CAN FD capable. The existing error handling code already checked this, but only if the CAN FD frame payload was longer than eight data bytes. Now the error message also appears when trying to write CAN FD frames with payload size 0...8. Part II In line 348, QCanBusFrame::isValid() is called. This function returns false if the payload size exceeds the frame's maximum payload length. The function SocketCanBackend::writeFrame then early returns with false. The maximum size error handling code is therefore no longer reached and can be removed. Change-Id: I9962a90fabd0678fe9040166b7c19946fbf6fd78 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Rolf Eike Beer <eb@emlix.com>
* | TinyCAN: Add a note about Linux access rightsAndre Hartmann2017-01-211-0/+4
| | | | | | | | | | | | | | Change-Id: I11d01bc526e72a2849b80d72ab3e2626ab69d5da Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | SocketCAN: Set unused can{fd}_frame fields to zero when writingAndre Hartmann2017-01-101-0/+2
| | | | | | | | | | | | | | | | | | | | At the moment, this is most important for canfd_frame.flags. For other reserved fields this might be important later, too. Change-Id: I66013a5ddac1f2f21a03c28cdbe9ac6719a604ce Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | VectorCAN: Remove override from destructorAndre Hartmann2017-01-031-1/+1
| | | | | | | | | | Change-Id: I1448fbbe677b34c6e4eb9450ee42837c1d31442e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | Change-Id: I526d5c23d15141735221b9b3b7d5c730f4e109d4
* | QCanBusDevice::framesToWrite: Extend documentationAndre Hartmann2016-12-201-1/+6
| | | | | | | | | | | | | | | | | | [ChangeLog][QCanBusDevice] Add buffering details in QCanBusDevice::framesToWrite documentation. Task-number: QTBUG-57658 Change-Id: Iaa0d6616dbee3c192bcdc1ee45117cfd46c02188 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Modbus: Remove non-UTF-8 characters from private headerAndre Hartmann2016-12-201-10/+10
| | | | | | | | | | | | | | QtCreator refused to open the file writable. Change-Id: Ic43c8f6f10067c48c75007244a72ceedce59b9f8 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | tst_qmodbuspdu: Cast to charFriedemann Kleint2016-12-081-1/+1
| | | | | | | | | | | | | | Amends change 254d78c86343d178305b57ba58d7b53bff845542. Change-Id: I4662a460a10b3122b993e6de6b1e269c507c8fa0 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | tst_qmodbuspdu: Fix compiler warningFriedemann Kleint2016-12-021-1/+1
|/ | | | | | | | | tst_qmodbuspdu.cpp(859): warning C4309: 'argument': truncation of constant value Change-Id: I88d9dd3c65abb79a7d536e4b30a62273ab155398 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-261-0/+33
|\ | | | | | | Change-Id: I9bcd95cfd8420c02d2a591bad057fee6736a9ec5
| * Merge remote-tracking branch 'origin/5.7.1' into 5.75.7Liang Qi2016-11-241-0/+33
| |\ | | | | | | | | | Change-Id: I2a96957c3b4ea24a52c5690f3088c6679a7eedce
| | * Add changes file for 5.7.1v5.7.1Jani Heikkinen2016-10-281-0/+33
| | | | | | | | | | | | | | | Change-Id: I2b00f7692001d0d4a2dd56c3ba7f7e5980b328e4 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Don't print the socketcan warnings on non-Linux systemsAlex Blasche2016-11-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and a minor doc fix in the same file Task-number: QTBUG-57213 Change-Id: I4171882a8498cd865ad5c6fdf9e96e8db27c12d2 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | QCanBusDevice: Documentation improvementsAndre Hartmann2016-11-221-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use the term "frame" instead "message" * Remote request length clarification * Start sentences with uppercase * Remove \fn specifier for functions next to the documentation Change-Id: I6af57e6d60c6982a6896e28e2a04a39e08c36385 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Rolf Eike Beer <eb@emlix.com>
* | | QCanBusFrame::toString(): Minor optimizationAndre Hartmann2016-11-221-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: If7240fa84300e94c38662edb7e81a33469cb47b3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Rolf Eike Beer <eb@emlix.com>
* | | Update .gitignoreAndre Hartmann2016-11-191-0/+1
| | | | | | | | | | | | | | | Change-Id: Id16e592806e8b852bebebf06b1f7dfa4ec03a3ca Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Convert qtserialbus to the new configure systemAlex Blasche2016-11-168-148/+61
| | | | | | | | | | | | | | | | | | | | | The language test is obsolete since 5.8 fulfills the C++11 requirements. Change-Id: I05e6f7343c6cac8edefc98fcb6dc837d1507f04b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-169-16/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/canbus/peakcan/main.cpp src/plugins/canbus/tinycan/main.cpp src/serialbus/qcanbusframe.h Change-Id: I7a38350688086b5f5cd7072acccb3fa38af76f88
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-163-9/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qmodbuspdu/tst_qmodbuspdu.cpp Change-Id: Id97e8ef6a6c176add1eda3738888c69c33f5378c
| | * | remove dependencies from sync.profileOswald Buddenhagen2016-11-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: I528e92563d2a30c44d185811d40a133af7690e2d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| | * | Fix handling of byte count fieldsSamuel Gaist2016-11-042-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The various byte count fields are all unsigned byte however the incoming data are loaded in a QByteArray which returns signed char. This patch fixes this by converting the field value to quint8. [ChangeLog][Modbus] Fixed handling of packets with payloads longer than 127 bytes. Task-number: QTBUG-54834 Change-Id: I699c4cf0cea9933bef6c040c573d2d6e6a113920 Reviewed-by: André Hartmann <aha_1980@gmx.de>
| * | | Add missing QDataStream operator<< for QModbus{Request,Response}Thiago Macieira2016-11-041-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | We just stream the base class, so let's make it official. Change-Id: Ic46ff326a6ba46bc877cfffd14831e78f491b5c0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-013-5/+14
| |\| | | | | | | | | | Change-Id: Iba3271a050240b60f21e1696af320fdf82a7dd34
| | * QCanBusFrame: Init unused integer fields to zeroAndre Hartmann2016-09-261-2/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-51845 Change-Id: I2b6c4b9c55b43005a8bb153a3bb24d1e63ce5815 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | * Fixed QModbusRtuSerialMaster stack overflow on closeMichael Winkelmann2016-09-262-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSerialPort::aboutToClose calls q->close() which leads to an infinite recursion. Calling QModbusRtuSerialMaster::close() explicitly is not necessary because when the serial port is closed, QModbusRtuSerialMaster::close() has been invoked already in all cases. Moreover, QSerialPort::aboutToClose asserts that serial master is always in closing state. Task-number: QTBUG-56009 Change-Id: If0dce93bbaa22116328b467f26c289cb58efc93f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | CAN-Backends: Port qUtf8Printable to qUtf16PrintableAndre Hartmann2016-09-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Unify the \since base line version for qdocAlex Blasche2016-11-1614-34/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first stable API release is Qt 5.8. It makes no sense to document the changes before 5.8. Furthermore the meaning of \since 5.8 before this tag was rather unknown. It could have meant the function was changed or added. This double meaning disappears once a compatibility statement is in place. Change-Id: I047e15bdd92a8c1034947b9b6d03439a293af318 Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | QtSerialBus is no longer Tech Preview from 5.8 onwardsAlex Blasche2016-11-151-1/+0
| | | | | | | | | | | | | | | | | | Change-Id: I7c10f5b913448e9173cd498cb46cf70a21702c19 Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | skip some code entirely if frame is emptyRolf Eike Beer2016-11-151-5/+8
| | | | | | | | | | | | | | | | | | Change-Id: I3ecb7a35a859dfc63e0e2017b979fcb826df776c Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | use switch/case in QCanBusFrame::toString() instead of multiple if'sRolf Eike Beer2016-11-151-5/+7
| | | | | | | | | | | | | | | Change-Id: I5c2940a37aa6d4261eb34ca8c90199905ba45868 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | QCanBusFrame: add flag to identify CAN FD framesRolf Eike Beer2016-11-157-52/+134
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-49675 Task-number: QTBUG-56720 Change-Id: Id24783c6ee1b81317d2e6d0965a9ed37987b47ec Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | QCanBusFrame: move toString() implementation to C++ fileAndre Hartmann2016-11-152-38/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows easier modifications of this function later, e.g. optimizations. Change-Id: Ibb2000a49b10e20931201f5eb5c17d05605c52a9 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | CAN: Improve DocumentationAndre Hartmann2016-11-145-18/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * More description for some QCanBusDevice configuration parameters * Describe QCanBusDevice::framesReceived() better * Some small fixes Change-Id: I98e034c03f89495e7290f072d2b6d7582fac7209 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Rolf Eike Beer <eb@emlix.com>
* | | canbusutil: directly pass QCanBusFrame to parsePayloadField()Rolf Eike Beer2016-11-112-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes no sense to return all information in different variables and assemble the frame in the caller, just let this method put everything into the frame. While at it, give the method a more sensible name. Change-Id: If7e7d467ac4c43d2b2cf245c95e8fe99551aa242 Reviewed-by: Andreas Wilhelm <aw@emlix.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 15:08:45 +0000