diff options
Diffstat (limited to 'src/tools/canbusutil/canbusutil.cpp')
| -rw-r--r-- | src/tools/canbusutil/canbusutil.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp index 0a0a6df..c553c52 100644 --- a/src/tools/canbusutil/canbusutil.cpp +++ b/src/tools/canbusutil/canbusutil.cpp @@ -104,7 +104,7 @@ int CanBusUtil::printDevices(const QString &pluginName) return 0; } -bool CanBusUtil::parseDataField(qint32 &id, QString &payload) +bool CanBusUtil::parseDataField(quint32 &id, QString &payload) { int hashMarkPos = m_data.indexOf('#'); if (hashMarkPos < 0) { @@ -112,7 +112,7 @@ bool CanBusUtil::parseDataField(qint32 &id, QString &payload) return false; } - id = m_data.left(hashMarkPos).toInt(nullptr, 16); + id = m_data.leftRef(hashMarkPos).toUInt(nullptr, 16); payload = m_data.right(m_data.length() - hashMarkPos - 1); return true; @@ -158,7 +158,7 @@ bool CanBusUtil::setFrameFromPayload(QString payload, QCanBusFrame *frame) if (payload.size() % 2 != 0) { if (frame->hasFlexibleDataRateFormat()) { enum { BitrateSwitchFlag = 1, ErrorStateIndicatorFlag = 2 }; - const int flags = payload.left(1).toInt(nullptr, 16); + const int flags = payload.leftRef(1).toInt(nullptr, 16); frame->setBitrateSwitch(flags & BitrateSwitchFlag); frame->setErrorStateIndicator(flags & ErrorStateIndicatorFlag); payload.remove(0, 1); @@ -206,7 +206,7 @@ bool CanBusUtil::connectCanDevice() bool CanBusUtil::sendData() { - qint32 id; + quint32 id; QString payload; QCanBusFrame frame; @@ -216,7 +216,7 @@ bool CanBusUtil::sendData() if (setFrameFromPayload(payload, &frame) == false) return false; - if (id < 0 || id > 0x1FFFFFFF) { // 29 bits + if (id > 0x1FFFFFFF) { // 29 bits id = 0x1FFFFFFF; m_output << "Warning! Id does not fit into Extended Frame Format, setting id to: " << id << endl; } |