summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2019-04-29 09:05:23 +0200
committerAlex Blasche <alexander.blasche@qt.io>2019-04-30 11:44:18 +0000
commit562113342f2b232d38a3ea05e84b8d2584799218 (patch)
tree47b03ec25a90ef1cd24ff593f39dbeea775fa1cf
parent5e8cd8ce5985501d9b220760f7f63901417b9299 (diff)
Reduce minimal Modbus response timeout to 10ms
Fixes: QTBUG-75461 Change-Id: Id5aed512cc9f163dc719cae0b121b9c65e0f232a Reviewed-by: André Hartmann <aha_1980@gmx.de>
-rw-r--r--src/serialbus/qmodbusclient.cpp4
-rw-r--r--tests/auto/qmodbusclient/tst_qmodbusclient.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/serialbus/qmodbusclient.cpp b/src/serialbus/qmodbusclient.cpp
index d273a3a..56a1ab5 100644
--- a/src/serialbus/qmodbusclient.cpp
+++ b/src/serialbus/qmodbusclient.cpp
@@ -165,7 +165,7 @@ int QModbusClient::timeout() const
/*!
Sets the \a newTimeout for this QModbusClient instance. The minimum timeout
- is 50 ms.
+ is 10 ms.
The timeout is used by the client to determine how long it waits for
a response from the server. If the response is not received within the
@@ -178,7 +178,7 @@ int QModbusClient::timeout() const
*/
void QModbusClient::setTimeout(int newTimeout)
{
- if (newTimeout < 50)
+ if (newTimeout < 10)
return;
Q_D(QModbusClient);
diff --git a/tests/auto/qmodbusclient/tst_qmodbusclient.cpp b/tests/auto/qmodbusclient/tst_qmodbusclient.cpp
index 5e4a729..3ffd9c3 100644
--- a/tests/auto/qmodbusclient/tst_qmodbusclient.cpp
+++ b/tests/auto/qmodbusclient/tst_qmodbusclient.cpp
@@ -90,8 +90,8 @@ private slots:
QCOMPARE(spy.isEmpty(), false); // we expect the signal
spy.clear();
- client.setTimeout(49); // everything below 50 fails
- QVERIFY(client.timeout() >= 50);
+ client.setTimeout(9); // everything below 10 fails
+ QVERIFY(client.timeout() >= 10);
QCOMPARE(spy.isEmpty(), true); // and the signal should not fire
}