summaryrefslogtreecommitdiffstats
path: root/src/plugins/canbus/socketcan
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2016-04-29 22:02:59 +0200
committerAndré Hartmann <aha_1980@gmx.de>2016-05-02 19:46:43 +0000
commitf183c72e5bd0bd253073783992d9bf860e0087ad (patch)
tree04f024896807b988a2b7335a561ffb04ad0c2870 /src/plugins/canbus/socketcan
parent788b3806a6f4a4d28c3d42d408ccee6ef20c9c2d (diff)
CAN: Correct spelling for "CAN" and "CAN FD"
... in comments, user and debug output, and documentation. Change-Id: I76ddf418bc1612a7310f80ee2ce596e8d6ab0721 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/plugins/canbus/socketcan')
-rw-r--r--src/plugins/canbus/socketcan/socketcanbackend.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index b672bf0..2579881 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -50,7 +50,7 @@
#include <sys/time.h>
#ifndef CANFD_MTU
-// CANFD support was added by Linux kernel 3.6
+// CAN FD support was added by Linux kernel 3.6
// For prior kernels we redefine the missing defines here
// they are taken from linux/can/raw.h & linux/can.h
@@ -336,7 +336,7 @@ void SocketCanBackend::setConfigurationParameter(int key, const QVariant &value)
QCanBusDevice::setConfigurationParameter(key, value);
- // we need to check canfd option a lot -> cache it and avoid QVector lookup
+ // we need to check CAN FD option a lot -> cache it and avoid QVector lookup
if (key == QCanBusDevice::CanFdKey)
canFdOptionEnabled = value.toBool();
}
@@ -370,7 +370,7 @@ bool SocketCanBackend::writeFrame(const QCanBusFrame &newData)
"maximal %2 bytes. Frame is discarded.").
arg(payloadSize).arg(canFdOptionEnabled ? CANFD_MAX_DLEN : CAN_MAX_DLEN);
if (!canFdOptionEnabled && payloadSize <= CANFD_MAX_DLEN)
- setError(tr("Sending CanFd frame although CanFd option not enabled."),
+ setError(tr("Sending CAN FD frame although CAN FD option not enabled."),
QCanBusDevice::WriteError);
else
setError(tr("Frame payload exceeds maximum CAN frame payload length."),
@@ -582,11 +582,11 @@ void SocketCanBackend::readSocket()
if (bytesReceived <= 0) {
break;
} else if (bytesReceived != CANFD_MTU && bytesReceived != CAN_MTU) {
- setError(tr("ERROR SocketCanBackend: incomplete can frame"),
+ setError(tr("ERROR SocketCanBackend: incomplete CAN frame"),
QCanBusDevice::CanBusError::ReadError);
continue;
} else if (frame.len > bytesReceived - offsetof(canfd_frame, data)) {
- setError(tr("ERROR SocketCanBackend: invalid can frame length"),
+ setError(tr("ERROR SocketCanBackend: invalid CAN frame length"),
QCanBusDevice::CanBusError::ReadError);
continue;
}