diff options
| -rw-r--r-- | examples/serialbus/can/sendframebox.cpp | 2 | ||||
| -rw-r--r-- | src/serialbus/qmodbusclient.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qmodbusclient/tst_qmodbusclient.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/serialbus/can/sendframebox.cpp b/examples/serialbus/can/sendframebox.cpp index 117ff10..13042d0 100644 --- a/examples/serialbus/can/sendframebox.cpp +++ b/examples/serialbus/can/sendframebox.cpp @@ -72,7 +72,7 @@ QValidator::State HexIntegerValidator::validate(QString &input, int &) const bool ok; uint value = input.toUInt(&ok, 16); - if (!value) + if (input.isEmpty()) return Intermediate; if (!ok || value > m_maximum) 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 } |