From 88f5821fe2276a16bb42bd129cca14a0d44b0f16 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Wed, 1 Jun 2016 21:19:24 +0200 Subject: CanBusUtil: Allow transmitting frames with empty payload That's totally valid, compatible to cansend, and also stated in the help: '{payload} has 0..8 (0..64 CAN FD) ASCII hex-value pairs'. Syntax: canbusutil 123# Change-Id: I4bd3aade2041cd7b4b1eae9779747b0a0f9dc379 Reviewed-by: Denis Shienkov Reviewed-by: Alex Blasche --- src/tools/canbusutil/canbusutil.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/tools') diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp index 8f70f07..d462311 100644 --- a/src/tools/canbusutil/canbusutil.cpp +++ b/src/tools/canbusutil/canbusutil.cpp @@ -142,11 +142,7 @@ bool CanBusUtil::parseDataField(qint32 &id, QString &payload) id = data.left(hashMarkPos).toInt(); 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) { -- cgit v1.2.3