diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:28:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:28:07 +0200 |
| commit | 8a29b5e5b5a0310626e69a903d7074bbc58a2939 (patch) | |
| tree | eb94e2668d33fff8905bc57d3ad65928c5422efd | |
| parent | a7a49d057613e88aba3ca98a0d8e52805f7d5bcf (diff) | |
| parent | 1b4fa1d598b31cb0cec46ebb1271f5b232e4f61b (diff) | |
Merge dev into 5.10
Change-Id: Ife81adba53282f1d67b4d6890a325bf9fd2684ef
| -rw-r--r-- | examples/serialbus/can/mainwindow.cpp | 1 | ||||
| -rw-r--r-- | src/tools/canbusutil/canbusutil.cpp | 8 | ||||
| -rw-r--r-- | src/tools/canbusutil/canbusutil.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp index 1cfd414..dd03da8 100644 --- a/examples/serialbus/can/mainwindow.cpp +++ b/examples/serialbus/can/mainwindow.cpp @@ -100,6 +100,7 @@ void MainWindow::processErrors(QCanBusDevice::CanBusError error) const case QCanBusDevice::ConfigurationError: case QCanBusDevice::UnknownError: m_status->setText(m_canDevice->errorString()); + break; default: break; } diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp index 0a0a6df..e319f44 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.left(hashMarkPos).toUInt(nullptr, 16); payload = m_data.right(m_data.length() - hashMarkPos - 1); return true; @@ -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; } diff --git a/src/tools/canbusutil/canbusutil.h b/src/tools/canbusutil/canbusutil.h index e9e7d2b..356b3df 100644 --- a/src/tools/canbusutil/canbusutil.h +++ b/src/tools/canbusutil/canbusutil.h @@ -63,7 +63,7 @@ public: int printDevices(const QString &pluginName); private: - bool parseDataField(qint32 &id, QString &payload); + bool parseDataField(quint32 &id, QString &payload); bool setFrameFromPayload(QString payload, QCanBusFrame *frame); bool connectCanDevice(); bool sendData(); |