summaryrefslogtreecommitdiffstats
path: root/src/plugins/canbus
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2019-07-15 14:43:07 +0200
committerAndre Hartmann <aha_1980@gmx.de>2019-07-16 14:54:16 +0200
commit02b4619fca6848b87d898f34f3bc062541cf9ee9 (patch)
tree22cb95c0c569a5455542788b768babc66156e74c /src/plugins/canbus
parent624bceb6a0345528fac32a05be978c710d75e4a6 (diff)
Systec: Fix some compiler and code model cast warnings
Change-Id: If47df4e9d62b5ca95ce14ddf8b4346ef14e4cf42 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/canbus')
-rw-r--r--src/plugins/canbus/systeccan/systeccan_symbols_p.h4
-rw-r--r--src/plugins/canbus/systeccan/systeccanbackend.cpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/canbus/systeccan/systeccan_symbols_p.h b/src/plugins/canbus/systeccan/systeccan_symbols_p.h
index 8a36327..7fe98ad 100644
--- a/src/plugins/canbus/systeccan/systeccan_symbols_p.h
+++ b/src/plugins/canbus/systeccan/systeccan_symbols_p.h
@@ -88,8 +88,8 @@ typedef void (DRV_CALLBACK_TYPE *tCallbackFktEx) (tUcanHandle handle, quint32 ev
#define kUcanModeHighResTimer 0x08 // high resolution time stamps in received CAN messages (only available with STM derivates)
// ABR and ACR for mode "receive all CAN messages"
-#define USBCAN_AMR_ALL (quint32) 0xffffffff
-#define USBCAN_ACR_ALL (quint32) 0x00000000
+#define USBCAN_AMR_ALL 0xffffffffU
+#define USBCAN_ACR_ALL 0x00000000U
#define USBCAN_OCR_DEFAULT 0x1A // default OCR for standard GW-002
#define USBCAN_OCR_RS485_ISOLATED 0x1E // OCR for RS485 interface and galvanic isolation
diff --git a/src/plugins/canbus/systeccan/systeccanbackend.cpp b/src/plugins/canbus/systeccan/systeccanbackend.cpp
index 54666d0..69689a3 100644
--- a/src/plugins/canbus/systeccan/systeccanbackend.cpp
+++ b/src/plugins/canbus/systeccan/systeccanbackend.cpp
@@ -114,7 +114,7 @@ QList<QCanBusDeviceInfo> SystecCanBackend::interfaces()
{
QList<QCanBusDeviceInfo> result;
- ::UcanEnumerateHardware(&ucanEnumCallback, &result, false, 0, ~0, 0, ~0, 0, ~0);
+ ::UcanEnumerateHardware(&ucanEnumCallback, &result, false, 0, quint8(~0), 0, quint32(~0), 0, quint32(~0));
return result;
}
@@ -281,8 +281,8 @@ bool SystecCanBackendPrivate::setupChannel(const QString &interfaceName)
const QRegularExpressionMatch match = re.match(interfaceName);
if (Q_LIKELY(match.hasMatch())) {
- device = match.captured(1).toInt();
- channel = match.captured(2).toInt();
+ device = quint8(match.captured(1).toUShort());
+ channel = quint8(match.captured(2).toUShort());
} else {
q->setError(SystecCanBackend::tr("Invalid interface '%1'.")
.arg(interfaceName), QCanBusDevice::ConnectionError);
@@ -377,7 +377,7 @@ void SystecCanBackendPrivate::startWrite()
::memset(&message, 0, sizeof(message));
message.m_dwID = frame.frameId();
- message.m_bDLC = payload.size();
+ message.m_bDLC = quint8(payload.size());
message.m_bFF = frame.hasExtendedFrameFormat() ? USBCAN_MSG_FF_EXT : USBCAN_MSG_FF_STD;