diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2016-06-01 21:19:24 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2016-06-02 12:35:03 +0000 |
| commit | 88f5821fe2276a16bb42bd129cca14a0d44b0f16 (patch) | |
| tree | aab71ec12d3bed2f75dc4d708e1d3a2e607c989c /src/tools | |
| parent | c285612874e877c9a02e6eb0b6291280ed865571 (diff) | |
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 <plugin> <device> 123#
Change-Id: I4bd3aade2041cd7b4b1eae9779747b0a0f9dc379
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/canbusutil/canbusutil.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
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) { |