From 4a0bdbfb757d98b7c95ce7a0c299ab19866529e6 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 3 Mar 2020 15:10:32 +0200 Subject: Add changes file for Qt 5.14.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + ab6f188bf00a9572804baa7b788536247ce88626 Bump version + 245f9f299a3503fa9acc54517fa9bd541366d7cc Generic(V1): Fix emitting framesReceived when disconnected + b63877157c2c9681ced1efbfefe1d2d1debf812e CAN-Example: Fix two issues with the status timer Change-Id: Ibf4ccb7070c14577e242ca13c4b254c415c665ba Reviewed-by: André Hartmann --- dist/changes-5.14.2 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 dist/changes-5.14.2 diff --git a/dist/changes-5.14.2 b/dist/changes-5.14.2 new file mode 100644 index 0000000..85c9b09 --- /dev/null +++ b/dist/changes-5.14.2 @@ -0,0 +1,24 @@ +Qt 5.14.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.14.0 through 5.14.1. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.14.2 Changes * +**************************************************************************** + + - Fixed a crash in CAN-Example when opening the CAN bus device failed. -- cgit v1.2.3 From 16817cba8720797f20c6d8e638614356d909529b Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Thu, 12 Mar 2020 18:33:24 +0100 Subject: SocketCAN: Fix compile with old Linux Kernels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h:91:5: error: ‘canfd_frame’ does not name a type That was already fixed earlier in 96d291cb, but broken again by e23f4ced. Fixes: QTBUG-82814 Change-Id: I8bfc4168165cf8e266b89e8327f88f862cf1b348 Reviewed-by: Denis Shienkov Reviewed-by: Rolf Eike Beer Reviewed-by: Alex Blasche --- src/plugins/canbus/socketcan/socketcanbackend.cpp | 24 ----------------------- src/plugins/canbus/socketcan/socketcanbackend.h | 24 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index e38e187..d91c4fc 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -56,30 +56,6 @@ #include #include -#ifndef CANFD_MTU -// 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 - -enum { - CAN_RAW_FD_FRAMES = 5 -}; - -#define CAN_MAX_DLEN 8 -#define CANFD_MAX_DLEN 64 -struct canfd_frame { - canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ - __u8 len; /* frame payload length in byte */ - __u8 flags; /* additional flags for CAN FD */ - __u8 __res0; /* reserved / padding */ - __u8 __res1; /* reserved / padding */ - __u8 data[CANFD_MAX_DLEN] __attribute__((aligned(8))); -}; -#define CAN_MTU (sizeof(struct can_frame)) -#define CANFD_MTU (sizeof(struct canfd_frame)) - -#endif - #ifndef CANFD_BRS # define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */ #endif diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h index 0497244..b6cb5ef 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.h +++ b/src/plugins/canbus/socketcan/socketcanbackend.h @@ -54,6 +54,30 @@ #include +#ifndef CANFD_MTU +// 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 + +enum { + CAN_RAW_FD_FRAMES = 5 +}; + +#define CAN_MAX_DLEN 8 +#define CANFD_MAX_DLEN 64 +struct canfd_frame { + canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ + __u8 len; /* frame payload length in byte */ + __u8 flags; /* additional flags for CAN FD */ + __u8 __res0; /* reserved / padding */ + __u8 __res1; /* reserved / padding */ + __u8 data[CANFD_MAX_DLEN] __attribute__((aligned(8))); +}; +#define CAN_MTU (sizeof(struct can_frame)) +#define CANFD_MTU (sizeof(struct canfd_frame)) + +#endif + QT_BEGIN_NAMESPACE class LibSocketCan; -- cgit v1.2.3 From 1a893e24a96d9a276b68f6ae9baee9f86f885d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Mon, 23 Mar 2020 13:58:35 +0100 Subject: QAbstractSocket: Fix warnings from deprecated error signal Task-number: QTBUG-82605 Change-Id: I89d1a08451127c8dc1522c91a5b4e992b4ca5878 Reviewed-by: Timur Pocheptsov --- src/serialbus/qmodbustcpclient_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/serialbus/qmodbustcpclient_p.h b/src/serialbus/qmodbustcpclient_p.h index 649b48e..4c574a1 100644 --- a/src/serialbus/qmodbustcpclient_p.h +++ b/src/serialbus/qmodbustcpclient_p.h @@ -87,7 +87,7 @@ public: }); QObject::connect(m_socket, - QOverload::of(&QAbstractSocket::error), q, + &QAbstractSocket::errorOccurred, q, [this](QAbstractSocket::SocketError /*error*/) { Q_Q(QModbusTcpClient); -- cgit v1.2.3 From 42da962b67b4af36a9930b447e0bbef417a646a0 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Wed, 25 Mar 2020 20:54:57 +0100 Subject: VirtualCAN: Add missing framesWritten() emission [ChangeLog][VirtualCAN] Added the missing emission of the framesWritten() signal to writeFrame(). Fixes: QTBUG-83044 Change-Id: I3f278519f8076a9bf638bed5565464a92b97abf7 Reviewed-by: Denis Shienkov Reviewed-by: Alex Blasche --- src/plugins/canbus/virtualcan/virtualcanbackend.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp index a7e23ff..ce1ca3e 100644 --- a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp +++ b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp @@ -290,6 +290,7 @@ bool VirtualCanBackend::writeFrame(const QCanBusFrame &frame) enqueueReceivedFrames({echoFrame}); } + emit framesWritten(qint64(1)); return true; } -- cgit v1.2.3 From 153d66980c45a69398e0d6ef5f7736c5c1e3490c Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Sun, 1 Mar 2020 16:37:48 +0100 Subject: SocketCAN: Virtual CAN devices don't have bus status At least libsocketcan does not provide a bus status for those. This patch prevents that CAN Example requests the status every two seconds. [ChangeLog][SocketCAN] QCanBusDevice::hasBusStatus() now returns false for virtual CAN devices. Change-Id: I214dfb320c999bb00c8ae93ddc9253efbe721969 Reviewed-by: Denis Shienkov Reviewed-by: Alex Blasche --- src/plugins/canbus/socketcan/socketcanbackend.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index d91c4fc..572fef8 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -752,6 +752,9 @@ void SocketCanBackend::resetController() bool SocketCanBackend::hasBusStatus() const { + if (isVirtual(canSocketName.toLatin1())) + return false; + return libSocketCan->hasBusStatus(); } -- cgit v1.2.3 From 067280f8f162f92ca8f690788c4b52c6a64a1992 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Fri, 17 Apr 2020 10:05:39 +0300 Subject: Add changes file for Qt 5.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + d59e2a4b72154b64e1d26fd1068933b8a25da77b Bump version + 2eb972216c649296f8e0afbc055e94f8240ad770 CAN Example: Remove now outdated comment + 421dad73cc993f2af4573a709607690feb28729b VectorCAN: Add support for using CAN FD + a3aa54e27094b80feae4e42c5f7e22c3d4022b49 PeakCAN: Init API structs without memset + 25ca4c9aba7f3bcc8c59b622990d1becc9293ac8 Init API structs without memset + 6e275b20911fc3e5af2a1b972ec3550235250157 PeakCAN: Fix Clang warning on Windows + 16817cba8720797f20c6d8e638614356d909529b SocketCAN: Fix compile with old Linux Kernels + 1a893e24a96d9a276b68f6ae9baee9f86f885d2c QAbstractSocket: Fix warnings from deprecated error signal + 42da962b67b4af36a9930b447e0bbef417a646a0 VirtualCAN: Add missing framesWritten() emission + 153d66980c45a69398e0d6ef5f7736c5c1e3490c SocketCAN: Virtual CAN devices don't have bus status Change-Id: I736d8324865f28fe88c681e20709adab35869112 Reviewed-by: André Hartmann --- dist/changes-5.15.0 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 dist/changes-5.15.0 diff --git a/dist/changes-5.15.0 b/dist/changes-5.15.0 new file mode 100644 index 0000000..e034ded --- /dev/null +++ b/dist/changes-5.15.0 @@ -0,0 +1,36 @@ +Qt 5.15 introduces many new features and improvements as well as bugfixes +over the 5.14.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.15 series is binary compatible with the 5.14.x series. +Applications compiled for 5.14 will continue to run with 5.15. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* SocketCAN * +**************************************************************************** + + - QCanBusDevice::hasBusStatus() now returns false for virtual CAN devices. + - [QTBUG-82814] Fixed compiliation with old Linux Kernels. + +**************************************************************************** +* VectorCAN * +**************************************************************************** + + - Added CAN FD support to the VectorCAN plugin. + +**************************************************************************** +* VirtualCAN * +**************************************************************************** + + - Added the missing emission of the framesWritten() signal to + writeFrame(). -- cgit v1.2.3