diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 11:14:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 07:34:45 +0200 |
| commit | eba0e3f243da949789871c3884c0ba158a3f6948 (patch) | |
| tree | e43188227c7f82c579a15ae7c1029940a79a7e18 /src/tools | |
| parent | e704a83b4a1a1eb69b62ee2cb029c549d99959ed (diff) | |
| parent | 94c64856be9af05d8459ad9fc16e6c95baa2c737 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/serialbus/qmodbusrtuserialmaster_p.h
Change-Id: Ib7b6b93816942837203d922992ee4b55f27bfec5
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/canbusutil/canbusutil.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp index 8f70f07..8421caf 100644 --- a/src/tools/canbusutil/canbusutil.cpp +++ b/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) { |