examples/serialbus/modbus/adueditor/plaintextedit.h

@@ -72,7 +72,9 @@ public:
     {
         QMenu menu(this);
         menu.addAction(QStringLiteral("Clear"), this, &QPlainTextEdit::clear);
+#ifndef QT_NO_CLIPBOARD
         menu.addAction(QStringLiteral("Copy"), this, &QPlainTextEdit::copy, QKeySequence::Copy);
+#endif
         menu.addSeparator();
         menu.addAction(QStringLiteral("Select All"), this, &QPlainTextEdit::selectAll,
             QKeySequence::SelectAll);

src/serialbus/qcanbus.cpp

@@ -120,7 +120,7 @@ QList<QByteArray> QCanBus::plugins() const
     method. \a interfaceName is the CAN bus interface name.
 
     Ownership of the returned backend is transferred to the caller.
-    Returns \c null if no suitable device can be found.
+    Returns \c nullptr if no suitable device can be found.
 */
 QCanBusDevice *QCanBus::createDevice(const QByteArray &plugin,
                                      const QString &interfaceName) const

src/serialbus/qmodbusrtuserialmaster_p.h

@@ -282,9 +282,7 @@ public:
             m_current.bytesWritten = 0;
             m_current.numberOfRetries--;
             m_serialPort->write(m_current.adu);
-            // Example: 9600 baud, 11 bit per packet -> 872 char/sec
-            // so: 1000 ms / 872 char = 1.147 ms/char * 3.5 character
-            m_sendTimer.start((1000. / (qreal(m_baudRate) / 11.)) * m_current.adu.size());
+            m_sendTimer.start(m_timeoutThreeDotFiveMs);
 
             qCDebug(QT_MODBUS) << "(RTU client) Sent Serial PDU:" << m_current.requestPdu;
             qCDebug(QT_MODBUS_LOW).noquote() << "(RTU client) Sent Serial ADU: 0x" + m_current.adu

src/tools/canbusutil/canbusutil.cpp

@@ -140,13 +140,9 @@ bool CanBusUtil::parseDataField(qint32 &id, QString &payload)
         return false;
     }
 
-    id = data.left(hashMarkPos).toInt();
+    id = data.left(hashMarkPos).toInt(nullptr, 16);
     payload = data.right(data.length() - hashMarkPos - 1);
-    if (payload.size() == 0) {
-        output << "Payload size zero!" << endl;
-        printDataUsage();
-        return false;
-    }
+
     return true;
 }
 
@@ -156,7 +152,10 @@ bool CanBusUtil::parsePayloadField(QString payload, bool &rtrFrame,
     fdFrame = false;
     rtrFrame = false;
 
-    if (payload[0].toUpper() == 'R') {
+     if (payload.size() == 0)
+        return true;
+
+     if (payload[0].toUpper() == 'R') {
         rtrFrame = true;
         bool validPayloadLength = false;
         if (payload.size() > 1) {