summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-04-061-0/+6
|\ | | | | | | Change-Id: I193713443518859b2e3bf088ddebcafe1badd7cf
| * QModbusReply: Add some more documentation cross linksAndre Hartmann2019-03-281-0/+6
| | | | | | | | | | Change-Id: I9f7d2bd5724266463af473d714b452de5390349e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Implement handling for sending Modbus RTU broadcast requestsKarsten Heimrich2019-04-016-11/+53
| | | | | | | | | | | | | | | | | | | | Introduces some methods to set the turnaround delay between a Modbus broadcast message and a following Modbus message. More details can be found in the Modbus_over_serial_line_V1.pdf spec at page 10. Change-Id: Iddeb7247566663facb79032135c1e4cc2434ca4f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add context information to QObject::connect(...) callsKarsten Heimrich2019-04-014-16/+17
| | | | | | | | | | Change-Id: I3888da16e5152c479deeb3e5bfbb8d0dd587cea8 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Rewrite RTU master state machineKarsten Heimrich2019-04-014-140/+139
| | | | | | | | | | | | | | Task-number: QTBUG-73965 Task-number: QTBUG-73230 Change-Id: I4e4b201b172d32802ce934f111631279dc7157e1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Move lambda code into separate functionsKarsten Heimrich2019-04-011-132/+155
| | | | | | | | | | Change-Id: I259175817d5767c7cf24c6f04f4faae190f773ed Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-274-13/+13
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iddf3becef6ac9cd7978fcbe80457f85fbc80df52
| * VirtualCAN: Slightly adopt debug outputAndre Hartmann2019-03-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the colons from a few places to make their output similar to the debug output in other lines. Example (omitting qt.canbus.plugins.virtualcan prefix): Server [0x7f19684903c0] constructed. Server [0x7f19684903c0] could not be started, port 35468 is already in use. Client [0x5586262ecaa0] socket created. Client [0x5586262ecaa0] socket connected. Client [0x5586262ecaa0] received: '0##f9ffad71e96cb5ee'. Client [0x5586262ecaa0] socket disconnected. Client [0x5586262ecaa0] socket destructed. Server [0x7f19684903c0] destructed. Change-Id: I6d91282a262c58e2c983ee6db5c030698197c9f6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix typosKarsten Heimrich2019-03-212-2/+2
| | | | | | | | | | | | Change-Id: Ic7f032217e641bf573f66f1231987828ea078709 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: I4ad88b67f6d0f8dad35654ab8188fdddb19f55a1
| * Correct typos in qmodbuspdu.cpp's docThibaut Cuvelier2019-03-201-7/+7
| | | | | | | | | | Change-Id: I8bbb3baaa568c1331d8945df158d062d68d2eed4 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
|\| | | | | | | Change-Id: I7e4c7244d4b43b2291a7f9b467ce32d6202da8f1
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| |\ | | | | | | | | | Change-Id: I0bd39a0ea587d0ef049dca6d67cdc8c254ad60bd
| | * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-211-0/+20
| |/ | | | | | | | | | | | | | | + 59f4eed65ab9730162ddf5b1d5c1ac260024a361 Bump version Change-Id: I3c9590b2baabd431ac889f5748cb518bfe9d62f5 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1v5.13.0-alpha1Qt Forward Merge Bot2019-02-022-0/+5123
|\| | | | | | | Change-Id: Iafab50612db47a99c06b30b77b51dc71f665577f
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-0/+5123
| |\ | | | | | | | | | Change-Id: I5c76688d19540eb521fcc10824dbe460bcc04add
| | * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-131-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + df3487b7609fdbe55fff9d116f95d68567f11393 remove pointless PLUGIN_EXTENDS stanzas + 200822ca61732693cc97802b953cd846654eb319 Bump version + afb7f76efafcb04e430168416d9d74113bde13bc Make pduFromStream work on big endian + fb7a0ef5b31cba52a745006bf9dca61101229de8 Improve QModbusDevice connect/open documentation + 857ed94b55b59859f41c55076c51e92f163cb9f7 Add changes file for Qt 5.11.3 + bbbda19310890c8ae27d0e72547d612d1d1ac0ad Add binary compatibility file for QtSerialBus for Qt 5.12 + 2b51f76ab712690cc263516d628a4f8cbb723ba8 Bump version Change-Id: I21d4ddaea6058ddf0e3d6187e186d2ec037f87f7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-083-3/+30
| | |\ | | | | | | | | | | | | Change-Id: Iad701a48d7f8039dc3b8f3ba9dcda661c38bbfd1
| | * | Add binary compatibility file for QtSerialBus for Qt 5.12Milla Pohjanheimo2018-12-181-0/+5103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Binary compatibility file added. Change-Id: I3f63fc11a7f5b8ab24f9334aaf2f71ac989fe303 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I919bdc9279b711fe2daf2786bff9ff2f5f1d5edd
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
| | |/ | |/| | | | | | | Change-Id: I85cd0abf4b38965ccafcf86e4303f8b4782d6bcf
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I82cf948853713d0ebaef2a2890224f32e476922f
| * | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | | | | | Change-Id: I11c9d4a25e159e8d1b9b2a8639610966f0cf122d
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-152-2/+29
|\| | | | | | | | | | | Change-Id: I65234fbfd7d1b691789336f733d638234e922c54
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-112-2/+29
| |\ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia0da4c27d820778cb156a73cbad4fe79f0694267
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+26
| | |\ | | | | | | | | | | | | Change-Id: Ic03591a029dd226384be896a0b305f8f21a94ffe
| | | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-191-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + b5c415eb612d05f7fe690eff361a616d0cabbc7e Modbus: Fix documentation for QModbusClient::timeoutChanged() + 864e4a8ab514ddcd7f79106a6b447f7a1d5b5d4e Fix case of accessing deleted memory + 200822ca61732693cc97802b953cd846654eb319 Bump version Change-Id: I1e021cc737ff28957a9787eb24582587b7231435 Reviewed-by: André Hartmann <aha_1980@gmx.de>
| | * | Make pduFromStream work on big endianDmitry Shachnev2018-11-111-2/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (char *) (&code) is pointing to the correct byte on little endian systems, but on big endian it is pointing to the wrong byte. This caused tst_QModbusPdu::testQModbusResponseStreamOperator to fail on big endian. Change-Id: Icf374ed71429154b362fb074fbeb5501ea6095e0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
| | * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | Change-Id: I0ccefaa4bcccfd565e1415b864b04a6e5c419a50
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-081-0/+54
|\| | | | | | | | | | | Change-Id: Icfa5aedf2f7ed205ec63305a5fd4e8b1b82af37d
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+54
| |\ \ | | | | | | | | | | | | Change-Id: I6e097e70f394220438332d8a71c7672c57e1268f
| | * | Fix changes file for 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Andre Hartmann2018-11-061-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removed stray asterisk characters and trailing empty line * Removed the Q_DECLARE_OPERATORS_FOR_FLAGS entry. It was added during the API review as fixup for the newly introduced QCanBusDevice::clear() function Amends 54262ed8861dcf7ea15f89591c07b414b74c85f0 Change-Id: Ic757193e33de358fd716cd8bdcd25e7ac73fcf04 Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | Add changes file for Qt 5.12.0v5.12.0-beta4Alex Blasche2018-11-051-0/+56
| | | | | | | | | | | | | | | | | | | | Change-Id: I15f832a92542d19e81d725f3dfef97eda193febc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Compile-fix (g++ 8): move #include of mocs outside namespaceEdward Welbourne2018-11-302-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I392926b7352fc8a72231a8fee34839c99d76ccbe Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-171-5/+11
|\| | | | | | | | | | | | | | | Change-Id: I54dfaf402e6182c563f8baafbe53a8f70c33ced7
| * | | Improve QModbusDevice connect/open documentationAlex Blasche2018-11-141-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QModbusDevice::open() & connectDevice() can cover asynchronous and synchronous connect behavior. This was not very obvious in the documentation. This patch fixes this uncertainty. Fixes: QTBUG-71282 Change-Id: I554ea7a8073f9b72027208f5deac4ac3ecc4ccee Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-107-7/+0
|\| | | | | | | | | | | | | | | Change-Id: I3b0f7e3ef4d3201f3ffcac458fc691296dabf12a
| * | | remove pointless PLUGIN_EXTENDS stanzasOswald Buddenhagen2018-11-077-7/+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>
* | | Remove hard QtSerialPort dependency from QtSerialBusAlex Blasche2018-11-0718-15/+95
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-70360 Change-Id: I511e368e227a46f9eba178612c8b106f5930ee49 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-031-2/+8
|\| | | | | | | | | | | Change-Id: I2060b7d74a0bfeecff06eb37db20261bfffa6666
| * | Ensure QModbusReply::finished() is emitted after disconnect from serialAlex Blasche2018-10-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user or remote end closed the serial connection while a QModbusReply is currently pending the reply was never concluded by emitting the finished() or error() signal. QModbusReply::setError() emits both signals. Fixes: QTBUG-68543 Change-Id: Ic93194b0bf28b7147934452889de8c9aa55ff983 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devAlex Blasche2018-10-294-8/+110
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/serialbus/qmodbusrtuserialslave_p.h Change-Id: I97217954a0bc539d08365e965909771c4032eca9
| * | Fix incorrect reading and writing of QModbusServer registersAlex Blasche2018-10-242-5/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change the startAddress of the current value mapping was not taken into account. Therefore shifted reads and write (with non-zero startAddresses) were accessing the wrong register indexes. Fixes: QTBUG-64843 Change-Id: Iaf1f91705586f45db059d6dd54b68a84d16926a0 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | Fix RTU Master ignoring responses due to being in Send stateAlex Blasche2018-10-241-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for QTBUG-62299 limits the processing of serial responses in RTU serial master to cases when the state machine is in receive mode only. So far the Receive state was triggered by the sendTimer. However modern kernels accept serial packages faster then the sendTimer can fire. This patches addresses the problem by setting the Receive state even before sendTimer fires. If the bytesWritten() callback detects that the entire PDU/ADU was written it stops sendTimer and immediately progresses the state machine to the Receive state. Fixes: QTBUG-69188 Change-Id: I1657973ef99f1b3e4008e887029b30890d825d59 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | Permit dropping of RTU slave request buffer under certain scenariosAlex Blasche2018-10-231-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is a wrong character in between individual modbus PDUs the request buffer becomes longer and longer w/o ever being cleared. As a consequence the only possible way to recover is to reset the RTU slave. The patch ensures that request buffer processing waits for chunked PDUs (due to low baud rates) while at the same time does not block if it contains garbage. The timer is based on the modbus spec which specifies that every modbus package is separated by at least 3.5 chars. Using the current baud rate of the serial port permits the exact caluclation of the implied delay/timeout. For baud rates above 19200 the timeout drops below 2 ms which is not measurable by Qt anymore. Furthermore the modbus spec specifies a minimal delay of 1.75 ms as well. Hence the timeout is bound to at least 2ms. Fixes: QTBUG-59286 Change-Id: Ie43ff3f5819519abe2081757150d367820d50020 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-231-1/+3
| |\| | | | | | | | | | Change-Id: I0e27751095de662c15633dae25b71b76f1ab97e2
| | * Fix case of accessing deleted memoryAlex Blasche2018-10-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the current QModbusRtuSerialMaster instance is deleted, the interFrameDelay timer may still be active and trigger the associated lambda. Since the lambda calls back into the deleted class instance, a crash may occur. Adding the public class instance as context to the singleshot connect ensures that the lambda is not called if the class instance was deleted already. Fixes: QTBUG-65684 Change-Id: Ic7d90ba68a1533e6de50c61117f5de8dc5e048b4 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | Deprecate qserialbusglobal.h in favor of qtserialbusglobal.hAlex Blasche2018-10-2411-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Apart from being in line with general Qt policy this is required for upcoming feature detection inside QtSerialBus. Change-Id: Ia62341e09d99fc4468b13c55fe3572fda40ddb02 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | Fix implicit conversion loss warnings due to int precisionAlex Blasche2018-10-243-4/+4
| | | | | | | | | | | | | | | Change-Id: I3de8fb0ba3455376c7e04cb506b7cdc95868392e Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Add ability to monitor and reject incoming TCP modbus connectionsAlex Blasche2018-10-233-0/+90
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-69622 Change-Id: Ieb8caba75df67e2ca8ee94c7da156e788cc85b51 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 04:58:37 +0000