summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/serialbus/can/connectdialog.cpp6
-rw-r--r--examples/serialbus/can/mainwindow.cpp2
-rw-r--r--examples/serialbus/can/mainwindow.ui2
-rw-r--r--examples/serialbus/modbus/adueditor/modbustcpclient_p.h4
-rw-r--r--src/plugins/canbus/peakcan/peakcan_symbols_p.h15
-rw-r--r--src/plugins/canbus/peakcan/peakcanbackend.cpp32
-rw-r--r--src/plugins/canbus/socketcan/socketcanbackend.cpp5
-rw-r--r--src/plugins/canbus/tinycan/tinycan_symbols_p.h15
-rw-r--r--src/plugins/canbus/tinycan/tinycanbackend.cpp4
-rw-r--r--src/plugins/canbus/vectorcan/vectorcan_symbols_p.h17
-rw-r--r--src/plugins/canbus/vectorcan/vectorcanbackend.cpp7
-rw-r--r--src/serialbus/doc/src/peakcan.qdoc8
-rw-r--r--src/serialbus/doc/src/tinycan.qdoc5
-rw-r--r--src/serialbus/doc/src/vectorcan.qdoc13
-rw-r--r--tests/auto/plugins/genericcanbus/dummybackend.cpp10
-rw-r--r--tests/auto/plugins/genericcanbus/dummybackend.h3
16 files changed, 57 insertions, 91 deletions
diff --git a/examples/serialbus/can/connectdialog.cpp b/examples/serialbus/can/connectdialog.cpp
index ba6d060..43ded1d 100644
--- a/examples/serialbus/can/connectdialog.cpp
+++ b/examples/serialbus/can/connectdialog.cpp
@@ -108,13 +108,13 @@ void ConnectDialog::backendChanged(const QString &backend)
if (backend == QStringLiteral("generic"))
m_ui->interfaceNameEdit->setPlaceholderText(QStringLiteral("can0"));
else if (backend == QStringLiteral("peakcan"))
- m_ui->interfaceNameEdit->setPlaceholderText(QStringLiteral("usbbus1"));
+ m_ui->interfaceNameEdit->setPlaceholderText(QStringLiteral("usb0"));
else if (backend == QStringLiteral("socketcan"))
m_ui->interfaceNameEdit->setPlaceholderText(QStringLiteral("can0"));
else if (backend == QStringLiteral("tinycan"))
- m_ui->interfaceNameEdit->setPlaceholderText(QStringLiteral("channela"));
+ m_ui->interfaceNameEdit->setPlaceholderText(QStringLiteral("can0.0"));
else if (backend == QStringLiteral("vectorcan"))
- m_ui->interfaceNameEdit->setPlaceholderText(QStringLiteral("channel0"));
+ m_ui->interfaceNameEdit->setPlaceholderText(QStringLiteral("can0"));
}
void ConnectDialog::ok()
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp
index 198ee33..19d3d27 100644
--- a/examples/serialbus/can/mainwindow.cpp
+++ b/examples/serialbus/can/mainwindow.cpp
@@ -201,7 +201,7 @@ void MainWindow::checkMessages()
view = frame.toString();
const QString time = QString::fromLatin1("%1.%2 ")
- .arg(frame.timeStamp().seconds(), 6, 10, QLatin1Char(' '))
+ .arg(frame.timeStamp().seconds(), 10, 10, QLatin1Char(' '))
.arg(frame.timeStamp().microSeconds() / 100, 4, 10, QLatin1Char('0'));
m_ui->receivedMessagesEdit->append(time + view);
diff --git a/examples/serialbus/can/mainwindow.ui b/examples/serialbus/can/mainwindow.ui
index adacbd7..4a3fcf9 100644
--- a/examples/serialbus/can/mainwindow.ui
+++ b/examples/serialbus/can/mainwindow.ui
@@ -143,7 +143,7 @@ Otherwise, the standard format with 11 bit idenfier is used.</string>
<enum>QFrame::StyledPanel</enum>
</property>
<property name="text">
- <string>Timestamp CAN-ID DLC Data</string>
+ <string>Timestamp CAN-ID DLC Data</string>
</property>
</widget>
</item>
diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
index 50bcc04..5161487 100644
--- a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
+++ b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
@@ -85,7 +85,9 @@ public:
m_responseTimeoutDuration };
m_transactionStore.insert(m_tId, element);
- q->connect(q, &QModbusClient::timeoutChanged, element.timer.data(), &QTimer::setInterval);
+ using TypeId = void (QTimer::*)(int);
+ q->connect(q, &QModbusClient::timeoutChanged,
+ element.timer.data(), static_cast<TypeId>(&QTimer::setInterval));
QObject::connect(element.timer.data(), &QTimer::timeout, [this, writeToSocket]() {
if (!m_transactionStore.contains(m_tId))
return;
diff --git a/src/plugins/canbus/peakcan/peakcan_symbols_p.h b/src/plugins/canbus/peakcan/peakcan_symbols_p.h
index cb90599..456be17 100644
--- a/src/plugins/canbus/peakcan/peakcan_symbols_p.h
+++ b/src/plugins/canbus/peakcan/peakcan_symbols_p.h
@@ -258,7 +258,7 @@ typedef struct tagTPCANTimestamp
static fp_##symbolName symbolName;
#define RESOLVE_SYMBOL(symbolName) \
- symbolName = (fp_##symbolName)resolveSymbol(pcanLibrary, #symbolName); \
+ symbolName = (fp_##symbolName)pcanLibrary->resolve(#symbolName); \
if (!symbolName) \
return false;
@@ -273,23 +273,12 @@ GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_GetValue, TPCANHandle, TPCANParameter,
GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_SetValue, TPCANHandle, TPCANParameter, void *, quint32)
GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_GetErrorText, TPCANStatus, quint16, char *)
-inline QFunctionPointer resolveSymbol(QLibrary *pcanLibrary, const char *symbolName)
-{
- QFunctionPointer symbolFunctionPointer = pcanLibrary->resolve(symbolName);
- if (!symbolFunctionPointer)
- qWarning("Failed to resolve the pcanbasic symbol: %s", symbolName);
-
- return symbolFunctionPointer;
-}
-
inline bool resolveSymbols(QLibrary *pcanLibrary)
{
if (!pcanLibrary->isLoaded()) {
pcanLibrary->setFileName(QStringLiteral("pcanbasic"));
- if (!pcanLibrary->load()) {
- qWarning("Failed to load the library: %s", qPrintable(pcanLibrary->fileName()));
+ if (!pcanLibrary->load())
return false;
- }
}
RESOLVE_SYMBOL(CAN_Initialize)
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp
index 06a2d4b..eb2d4b9 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.cpp
+++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp
@@ -288,37 +288,37 @@ bool PeakCanBackendPrivate::setConfigurationParameter(int key, const QVariant &v
static int channelIndexFromName(const QString &interfaceName)
{
- if (interfaceName == QStringLiteral("usbbus1"))
+ if (interfaceName == QStringLiteral("usb0"))
return PCAN_USBBUS1;
- else if (interfaceName == QStringLiteral("usbbus2"))
+ else if (interfaceName == QStringLiteral("usb1"))
return PCAN_USBBUS2;
- else if (interfaceName == QStringLiteral("usbbus3"))
+ else if (interfaceName == QStringLiteral("usb2"))
return PCAN_USBBUS3;
- else if (interfaceName == QStringLiteral("usbbus4"))
+ else if (interfaceName == QStringLiteral("usb3"))
return PCAN_USBBUS4;
- else if (interfaceName == QStringLiteral("usbbus5"))
+ else if (interfaceName == QStringLiteral("usb4"))
return PCAN_USBBUS5;
- else if (interfaceName == QStringLiteral("usbbus6"))
+ else if (interfaceName == QStringLiteral("usb5"))
return PCAN_USBBUS6;
- else if (interfaceName == QStringLiteral("usbbus7"))
+ else if (interfaceName == QStringLiteral("usb6"))
return PCAN_USBBUS7;
- else if (interfaceName == QStringLiteral("usbbus8"))
+ else if (interfaceName == QStringLiteral("usb7"))
return PCAN_USBBUS8;
- else if (interfaceName == QStringLiteral("pcibus1"))
+ else if (interfaceName == QStringLiteral("pci0"))
return PCAN_PCIBUS1;
- else if (interfaceName == QStringLiteral("pcibus2"))
+ else if (interfaceName == QStringLiteral("pci1"))
return PCAN_PCIBUS2;
- else if (interfaceName == QStringLiteral("pcibus3"))
+ else if (interfaceName == QStringLiteral("pci2"))
return PCAN_PCIBUS3;
- else if (interfaceName == QStringLiteral("pcibus4"))
+ else if (interfaceName == QStringLiteral("pci3"))
return PCAN_PCIBUS4;
- else if (interfaceName == QStringLiteral("pcibus5"))
+ else if (interfaceName == QStringLiteral("pci4"))
return PCAN_PCIBUS5;
- else if (interfaceName == QStringLiteral("pcibus6"))
+ else if (interfaceName == QStringLiteral("pci5"))
return PCAN_PCIBUS6;
- else if (interfaceName == QStringLiteral("pcibus7"))
+ else if (interfaceName == QStringLiteral("pci6"))
return PCAN_PCIBUS7;
- else if (interfaceName == QStringLiteral("pcibus8"))
+ else if (interfaceName == QStringLiteral("pci7"))
return PCAN_PCIBUS8;
else // TODO: Add other indexes here
return PCAN_NONEBUS;
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index 87c466e..7580c60 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -599,10 +599,7 @@ void SocketCanBackend::readSocket()
timeStamp.tv_usec = 0;
}
- QCanBusFrame::TimeStamp stamp;
- stamp.setSeconds(timeStamp.tv_sec);
- stamp.setMicroSeconds(timeStamp.tv_usec);
-
+ const QCanBusFrame::TimeStamp stamp(timeStamp.tv_sec, timeStamp.tv_usec);
QCanBusFrame bufferedFrame;
bufferedFrame.setTimeStamp(stamp);
diff --git a/src/plugins/canbus/tinycan/tinycan_symbols_p.h b/src/plugins/canbus/tinycan/tinycan_symbols_p.h
index 5ad149c..6e05b92 100644
--- a/src/plugins/canbus/tinycan/tinycan_symbols_p.h
+++ b/src/plugins/canbus/tinycan/tinycan_symbols_p.h
@@ -285,7 +285,7 @@ typedef void (DRV_CALLBACK_TYPE *CanRxEventCallback)(
static fp_##symbolName symbolName;
#define RESOLVE_SYMBOL(symbolName) \
- symbolName = (fp_##symbolName)resolveSymbol(mhstcanLibrary, #symbolName); \
+ symbolName = (fp_##symbolName)mhstcanLibrary->resolve(#symbolName); \
if (!symbolName) \
return false;
@@ -317,23 +317,12 @@ GENERATE_SYMBOL_VARIABLE(void, CanSetRxEventCallback, CanRxEventCallback)
GENERATE_SYMBOL_VARIABLE(void, CanSetEvents, quint16)
GENERATE_SYMBOL_VARIABLE(quint32, CanEventStatus, void)
-inline QFunctionPointer resolveSymbol(QLibrary *mhstcanLibrary, const char *symbolName)
-{
- QFunctionPointer symbolFunctionPointer = mhstcanLibrary->resolve(symbolName);
- if (!symbolFunctionPointer)
- qWarning("Failed to resolve the mhstcan symbol: %s", symbolName);
-
- return symbolFunctionPointer;
-}
-
inline bool resolveSymbols(QLibrary *mhstcanLibrary)
{
if (!mhstcanLibrary->isLoaded()) {
mhstcanLibrary->setFileName(QStringLiteral("mhstcan"));
- if (!mhstcanLibrary->load()) {
- qWarning("Failed to load the library: %s", qPrintable(mhstcanLibrary->fileName()));
+ if (!mhstcanLibrary->load())
return false;
- }
}
RESOLVE_SYMBOL(CanInitDriver)
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp
index 2f9c191..ee2b347 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.cpp
+++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp
@@ -305,9 +305,9 @@ QString TinyCanBackendPrivate::systemErrorString(int errorCode)
static int channelIndexFromName(const QString &interfaceName)
{
- if (interfaceName == QStringLiteral("channela"))
+ if (interfaceName == QStringLiteral("can0.0"))
return INDEX_CAN_KANAL_A;
- else if (interfaceName == QStringLiteral("channelb"))
+ else if (interfaceName == QStringLiteral("can0.1"))
return INDEX_CAN_KANAL_B;
else
return INDEX_INVALID;
diff --git a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h
index 6f548b0..429f50e 100644
--- a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h
+++ b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h
@@ -438,9 +438,9 @@ typedef struct _XLacceptance {
static fp_##symbolName symbolName;
#define RESOLVE_SYMBOL(symbolName) \
- symbolName = (fp_##symbolName)resolveSymbol(vectorcanLibrary, #symbolName); \
+ symbolName = (fp_##symbolName)vectorcanLibrary->resolve(#symbolName); \
if (!symbolName) \
- return false;
+ return false;
GENERATE_SYMBOL_VARIABLE(XLstatus, xlOpenDriver, void)
GENERATE_SYMBOL_VARIABLE(XLstatus, xlCloseDriver, void)
@@ -455,23 +455,12 @@ GENERATE_SYMBOL_VARIABLE(XLstatus, xlReceive, XLportHandle, quint32 *, XLevent *
GENERATE_SYMBOL_VARIABLE(XLstatus, xlSetNotification, XLportHandle, XLhandle *, int)
GENERATE_SYMBOL_VARIABLE(char *, xlGetErrorString, XLstatus)
-inline QFunctionPointer resolveSymbol(QLibrary *vectorcanLibrary, const char *symbolName)
-{
- QFunctionPointer symbolFunctionPointer = vectorcanLibrary->resolve(symbolName);
- if (!symbolFunctionPointer)
- qWarning("Failed to resolve the vxlapi symbol: %s", symbolName);
-
- return symbolFunctionPointer;
-}
-
inline bool resolveSymbols(QLibrary *vectorcanLibrary)
{
if (!vectorcanLibrary->isLoaded()) {
vectorcanLibrary->setFileName(QStringLiteral("vxlapi"));
- if (!vectorcanLibrary->load()) {
- qWarning("Failed to load the library: %s", qPrintable(vectorcanLibrary->fileName()));
+ if (!vectorcanLibrary->load())
return false;
- }
}
RESOLVE_SYMBOL(xlOpenDriver)
diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp
index 78cf22f..c178b50 100644
--- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp
+++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp
@@ -224,8 +224,8 @@ bool VectorCanBackendPrivate::setConfigurationParameter(int key, const QVariant
void VectorCanBackendPrivate::setupChannel(const QString &interfaceName)
{
- if (interfaceName.startsWith(QStringLiteral("channel"))) {
- const QStringRef ref = interfaceName.midRef(7);
+ if (interfaceName.startsWith(QStringLiteral("can"))) {
+ const QStringRef ref = interfaceName.midRef(3);
bool ok = false;
const int channelIndex = ref.toInt(&ok);
if (ok && (channelIndex >= 0 && channelIndex < XL_CONFIG_MAX_CHANNELS)) {
@@ -324,7 +324,8 @@ void VectorCanBackendPrivate::startRead()
QCanBusFrame frame(msg.id, QByteArray(reinterpret_cast<const char *>(msg.data),
int(msg.dlc)));
- frame.setTimeStamp(QCanBusFrame::TimeStamp(0, event.timeStamp));
+ const quint64 usecs = event.timeStamp / 1000;
+ frame.setTimeStamp(QCanBusFrame::TimeStamp(usecs / 1000000, usecs % 1000000));
frame.setExtendedFrameFormat(msg.id & XL_CAN_EXT_MSG_ID);
frame.setFrameType((msg.flags & XL_CAN_MSG_FLAG_REMOTE_FRAME)
? QCanBusFrame::RemoteRequestFrame
diff --git a/src/serialbus/doc/src/peakcan.qdoc b/src/serialbus/doc/src/peakcan.qdoc
index 8a973cb..ce612fb 100644
--- a/src/serialbus/doc/src/peakcan.qdoc
+++ b/src/serialbus/doc/src/peakcan.qdoc
@@ -49,13 +49,13 @@
\code
QCanBusDevice *device = QCanBus::instance()->createDevice(
- QStringLiteral("peakcan"), QStringLiteral("usbbus1"));
+ QStringLiteral("peakcan"), QStringLiteral("usb0"));
device->connectDevice();
\endcode
- Where \e usbbus1 is the active CAN interface name. The PeakCAN backend supports
- eight USB interfaces from \e usbbus1 to \e usbbus8 and eight PCI interfaces from
- \e pcibus1 to \e pcibus8.
+ Where \e usb0 is the active CAN interface name. The PeakCAN backend supports
+ eight USB interfaces from \e usb0 to \e usb7 and eight PCI interfaces from
+ \e pci0 to \e pci7.
\note Only the USB and PCI adapters are currently supported by this backend.
diff --git a/src/serialbus/doc/src/tinycan.qdoc b/src/serialbus/doc/src/tinycan.qdoc
index 4ca4e53..6637c0d 100644
--- a/src/serialbus/doc/src/tinycan.qdoc
+++ b/src/serialbus/doc/src/tinycan.qdoc
@@ -53,8 +53,9 @@
device->connectDevice();
\endcode
- Where \e channela is the active CAN interface name. The TinyCAN backend
- provides two interfaces, \e channela and \e channelb.
+ Where \e can0.0 is the active CAN interface name. TinyCAN provides the
+ interfaces \e can0.0 and \e can0.1, which maps to INDEX_CAN_KANAL_A resp.
+ INDEX_CAN_KANAL_B in the TinyCAN backend.
\note Only the USB adapters are currently supported by this backend.
diff --git a/src/serialbus/doc/src/vectorcan.qdoc b/src/serialbus/doc/src/vectorcan.qdoc
index 8125c5a..f34d0f2 100644
--- a/src/serialbus/doc/src/vectorcan.qdoc
+++ b/src/serialbus/doc/src/vectorcan.qdoc
@@ -49,15 +49,16 @@
\code
QCanBusDevice *device = QCanBus::instance()->createDevice(
- QStringLiteral("vectorcan"), QStringLiteral("channel0"));
+ QStringLiteral("vectorcan"), QStringLiteral("can0"));
device->connectDevice();
\endcode
- Where \e channel0 is the active CAN channel name. The VectorCAN backend provides
- 64 channels from \e channel0 to \e channel63. Some of these channels can be virtual,
- and therefore can be used without actual CAN hardware. To find out the virtual
- channels, the program "Vector Hardware Config" (vcanconf.exe) can be used,
- which is included in Vector's driver package.
+ Where \e can0 is the active CAN channel name. The VectorCAN backend provides
+ 64 channels (defined by XL_CONFIG_MAX_CHANNELS in the Vector API) from \e can0
+ to \e can63. Some of these channels can be virtual, and therefore can be used
+ without actual CAN hardware. To find out the virtual channels, the program
+ "Vector Hardware Config" (vcanconf.exe) can be used, which is included in
+ Vector's driver package.
The device is now open for writing and reading CAN frames:
diff --git a/tests/auto/plugins/genericcanbus/dummybackend.cpp b/tests/auto/plugins/genericcanbus/dummybackend.cpp
index 73edddb..acfa520 100644
--- a/tests/auto/plugins/genericcanbus/dummybackend.cpp
+++ b/tests/auto/plugins/genericcanbus/dummybackend.cpp
@@ -36,20 +36,18 @@
#include "dummybackend.h"
+#include <QtCore/qdatetime.h>
#include <QtCore/qdebug.h>
#include <QtCore/qtimer.h>
-#include <QtSerialBus/qcanbusdevice.h>
-
QT_BEGIN_NAMESPACE
DummyBackend::DummyBackend() :
- sendTimer(new QTimer(this)),
- byteArray("abc")
+ sendTimer(new QTimer(this))
{
sendTimer->setInterval(1000);
sendTimer->setSingleShot(false);
- connect(sendTimer, SIGNAL(timeout()), this, SLOT(sendMessage()));
+ connect(sendTimer, &QTimer::timeout, this, &DummyBackend::sendMessage);
sendTimer->start();
}
@@ -66,9 +64,11 @@ void DummyBackend::close()
void DummyBackend::sendMessage()
{
+ quint64 timeStamp = QDateTime::currentDateTime().toMSecsSinceEpoch();
QCanBusFrame dummyFrame;
dummyFrame.setFrameId(12);
dummyFrame.setPayload(QByteArray("def"));
+ dummyFrame.setTimeStamp(QCanBusFrame::TimeStamp(timeStamp / 1000, (timeStamp % 1000) * 1000));
enqueueReceivedFrames(QVector<QCanBusFrame>() << dummyFrame);
}
diff --git a/tests/auto/plugins/genericcanbus/dummybackend.h b/tests/auto/plugins/genericcanbus/dummybackend.h
index 1c708b3..3142181 100644
--- a/tests/auto/plugins/genericcanbus/dummybackend.h
+++ b/tests/auto/plugins/genericcanbus/dummybackend.h
@@ -39,8 +39,6 @@
#include <QtSerialBus/qcanbusdevice.h>
-#include <QtCore/qbytearray.h>
-
QT_BEGIN_NAMESPACE
class QTimer;
@@ -63,7 +61,6 @@ public Q_SLOTS:
private:
QTimer *sendTimer;
- QByteArray byteArray;
};
QT_END_NAMESPACE
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 22:32:27 +0000