diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-19 23:38:44 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-19 23:38:44 +0200 |
commit | 7845b1c59bde8e2ec8dc541b9f1c1897182e8d0f (patch) | |
tree | 0ac83501fd5f18bc8809817b046e698443748c35 /src/plugins/canbus | |
parent | b08292f3d5ff4d07b1649a365183b550729bd187 (diff) | |
parent | e13f9fe6a857995a3267f6b77ea11aadb0cb3c4a (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/canbus/peakcan/main.cpp
src/plugins/canbus/tinycan/main.cpp
Change-Id: Ia2dac20ddfc27ba96bb36cd70ba011e2d3764f2f
Diffstat (limited to 'src/plugins/canbus')
-rw-r--r-- | src/plugins/canbus/peakcan/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/canbus/peakcan/peakcanbackend.cpp | 8 | ||||
-rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 3 | ||||
-rw-r--r-- | src/plugins/canbus/tinycan/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.cpp | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/src/plugins/canbus/peakcan/main.cpp b/src/plugins/canbus/peakcan/main.cpp index 6606cc2..d4886a9 100644 --- a/src/plugins/canbus/peakcan/main.cpp +++ b/src/plugins/canbus/peakcan/main.cpp @@ -55,7 +55,7 @@ public: { QString errorReason; if (!PeakCanBackend::canCreate(&errorReason)) { - qWarning("%s", qPrintable(errorReason)); + qWarning("%s", qUtf8Printable(errorReason)); if (errorMessage) *errorMessage = errorReason; return nullptr; diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp index 7742622..09d4e34 100644 --- a/src/plugins/canbus/peakcan/peakcanbackend.cpp +++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp @@ -65,7 +65,7 @@ bool PeakCanBackend::canCreate(QString *errorReason) #else static bool symbolsResolved = resolveSymbols(pcanLibrary()); if (!symbolsResolved) { - *errorReason = tr("The PCAN runtime library is not found"); + *errorReason = pcanLibrary()->errorString(); return false; } return true; @@ -393,13 +393,15 @@ void PeakCanBackendPrivate::startRead() const TPCANStatus st = ::CAN_Read(channelIndex, &message, ×tamp); if (st != PCAN_ERROR_OK) { - if (st != PCAN_ERROR_XMTFULL) + if (st != PCAN_ERROR_QRCVEMPTY) q->setError(systemErrorString(st), QCanBusDevice::ReadError); break; } QCanBusFrame frame(message.ID, QByteArray(reinterpret_cast<const char *>(message.DATA), int(message.LEN))); - frame.setTimeStamp(QCanBusFrame::TimeStamp(timestamp.millis / 1000, timestamp.micros)); + const quint64 millis = timestamp.millis + Q_UINT64_C(0xFFFFFFFF) * timestamp.millis_overflow; + const quint64 micros = Q_UINT64_C(1000) * (millis % 1000) + timestamp.micros; + frame.setTimeStamp(QCanBusFrame::TimeStamp(millis / 1000, micros)); frame.setExtendedFrameFormat(message.MSGTYPE & PCAN_MESSAGE_EXTENDED); frame.setFrameType((message.MSGTYPE & PCAN_MESSAGE_RTR) ? QCanBusFrame::RemoteRequestFrame : QCanBusFrame::DataFrame); diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 8c3d9ee..c9781d1 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -35,7 +35,6 @@ ****************************************************************************/ #include "socketcanbackend.h" -#include <QtSerialBus/qcanbusdevice.h> #include <QtCore/qdebug.h> #include <QtCore/qdatastream.h> @@ -266,7 +265,7 @@ bool SocketCanBackend::connectSocket() return false; } - strcpy(interface.ifr_name, canSocketName.toLatin1().data()); + qstrncpy(interface.ifr_name, canSocketName.toLatin1().constData(), sizeof(interface.ifr_name)); if (ioctl(canSocket, SIOCGIFINDEX, &interface) < 0) { setError(qt_error_string(errno), QCanBusDevice::CanBusError::ConnectionError); diff --git a/src/plugins/canbus/tinycan/main.cpp b/src/plugins/canbus/tinycan/main.cpp index 65a4784..5bce912 100644 --- a/src/plugins/canbus/tinycan/main.cpp +++ b/src/plugins/canbus/tinycan/main.cpp @@ -55,7 +55,7 @@ public: { QString errorReason; if (!TinyCanBackend::canCreate(&errorReason)) { - qWarning("%s", qPrintable(errorReason)); + qWarning("%s", qUtf8Printable(errorReason)); if (errorMessage) *errorMessage = errorReason; return nullptr; diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp index 3f7f0fc..0961813 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.cpp +++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp @@ -61,7 +61,7 @@ bool TinyCanBackend::canCreate(QString *errorReason) #else static bool symbolsResolved = resolveSymbols(mhstcanLibrary()); if (!symbolsResolved) { - *errorReason = tr("The MHSTCAN runtime library is not found"); + *errorReason = mhstcanLibrary()->errorString(); return false; } return true; |