| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
From the changelog [1] and private mail requests I got aware,
that the MacCAN library changed all "Long" data types back to
32 bit to be compatible to the PeakCAN library, as the 64 bit
data types were used by accident.
This partly reverts 187999b06ee355d482374a3ea4b417d6d8185983
[1] https://www.uv-software.de/files/downloads/MacCAN/PCANUSB/Library/
OS_X_Library_for_PCANUSB_v0.10.readme
[ChangeLog][PeakCAN] The PeakCAN plugin is now compatible to
the MacCAN library 0.9 or higher. On the other hand, older
MacCAN libraries are no longer supported.
Change-Id: Ibcd4a015ee2b0172c52ae68e4f6dc3a468ed86d0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-105718
Change-Id: Ibfa4f2f7788f83b7032406de634ca4fb635d2131
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
CMakeLists.txt and .cmake files of significant size
(more than 2 lines according to our check in tst_license.pl)
now have the copyright and license header.
Existing copyright statements remain intact
Task-number: QTBUG-88621
Change-Id: I4702aec49e940c3a480b94cf8622155b9b688b9e
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.
Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: Ie17b09db5a4aa7bb0d33906360f1125e9632425c
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Taken from PCANBasic_enu.chm included in the PCAN-Basic library:
| Calculation of total of microseconds :
| micros + 1000 * millis + 0x100000000 * 1000 * millis_overflow
So our overflow was off by one.
Pick-to: 6.2
Fixes: QTBUG-98800
Change-Id: I6569c7efae22be3e81d54df7e1fce1f68faf0970
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
| |
Remove usages of outdated LGPL3 header that references LICENSES.LGPLv3
instead of LICENSES.LGPL3.
Change-Id: I2dd25a1a7d6ad3e3cbb06753bbc839e26f4a7b26
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
* Local variable cannot be automatically moved due to constness.
Change-Id: I6d0a0ce624ada8affc8f98dbdfa11a1e2218e53d
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-95170
Pick-to: 6.2
Change-Id: I1d462fa520ab01ae41c54aa5c44e2ade716b050a
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* PasstruCAN: Untested
* PeakCAN: Tested on Windows with PCAN-USB Pro FD.
* SocketCAN: Tested on Linux with virtual and real hardware.
* SystecCAN: Tested on Windows with USBcanmodul2.
* TinyCAN: Untested
* VectorCAN: Tested with the virtual Vector interface.
* VirtualCAN: Tested on Windows and Linux.
Pick-to: 6.2
Change-Id: I3836a81a9cb1570a22b6264b34fca88ccc0ab57e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
|
|
|
|
|
| |
[ChangeLog][QCanBusDeviceInfo] Added the CAN bus
plugin name to QCanBusDeviceInfo.
Custom plugins must be adopted to the changed
QCanBusDevice::createDeviceInfo() method.
Pick-to: 6.2
Change-Id: I44d658aaa6f873eecce447dd9ee4539c9fbe2043
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is to ensure that the pre-existing QtNetwork library from the
b2qt SDK sysroot in the CI is not picked up.
This is likely a consequence of CMake not adding an -rpath-link flag
when linking. See QTBUG-86533 for details.
Task-number: QTBUG-86533
Pick-to: 6.2
Change-Id: Id05d49812f957c8a6c12c03f5ff633015bd63103
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This protected function is used from the CAN
plugins to create QCanBusDeviceInfo objects.
We want to add another parameter (plugin) to the
function in a follow-up commit, so let's first
remove unneeded overloads that were created during
Qt 5 times and only keep the very simple and the
all-embracing one.
While at it, remove the std::move calls as clang
gives performance warnings here:
socketcanbackend.cpp:149:23: error:
moving a temporary object prevents copy elision
socketcanbackend.cpp:149:23: note:
remove std::move call here
Pick-to: 6.2
Change-Id: Ie83db3cd3a9d6b40b2da4a9ce736861a0ee8359f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
They were not during Qt 5 times due to our
binary compatibility promise.
Pick-to: 6.2
Change-Id: Ia5ddb114db9dc552515df5ab4b22d0c962a0a341
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Overriding QWinEventNotifier::event seems unusual,
so let's use the documented way and connect to the
activated signal.
As this was broken after 5.15 and 6.2 is the first
Qt 6 release, no changelog is needed.
Pick-to: 6.2
Fixes: QTBUG-95040
Change-Id: I294aa398a2ccd99012db855ed74935a944b2e6d2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The old code did not take the size of the payload
QByteArray into account, so that for small payloads
read accesses outside the QByteArray data field
occurred.
While this should be no big problem in reality,
memory checkers like Address Sanitizer will report
such issues.
We now only copy the bytes the payload QByteArray
really provides. We can do this, as every derived
QCanBusDevice::writeFrame() method already does a
QCanBusFrame::isValid() check before enqueuing the
outgoing frames, so that the maximum length of the
payload field is always guaranteed, for CAN 2.0
as well as CAN FD.
[ChangeLog][CAN] Fixed potential read buffer
overflows when sending CAN frames in diverse CAN
backends which were detected by Address Sanitizer.
Pick-to: 6.2
Fixes: QTBUG-94695
Change-Id: I2e45f6c14ae0fe88ba83f52dd5db4ffe24dada58
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The pro2cmake.py conversion script faithfully reproduced the .pro files
for the plugins, which specified the libraries as public. But in CMake,
the implications of this are that public usage requirements should then
be propagated to consumers. We don't expect any consumers, since a
plugin is created as a MODULE library in CMake, so for Windows we don't
even have an import library to link with. The only exception to this is
for static builds where plugins are created as STATIC libraries
instead, but only in certain controlled situations do we then link to
plugins. Even then, usage requirements are not expected to propagate to
the consumers, so these relationships should always be specified as
private.
Pick-to: 6.2
Task-number: QTBUG-90819
Change-Id: Ia7a8f27d4eecf067055511577ec664ad857905cd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
| |
peakcanbackend.cpp(189): warning C4267: 'argument': conversion from 'size_t' to 'quint32', possible loss of data
Change-Id: I95b4042a7e7f1698ac419f85ff2392b21ff8daf1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
| |
Fixes: QTBUG-93403
Change-Id: I1b8f3952284e7ec722716fa11e701b96d80a85f1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use a dedicated type instead of quint32
to mark a CAN bus frame identifier as such.
For now it is just an alias to quint32, but
can be changed to some other type for Qt 7.
[ChangeLog][QCanBusFrame]
Introduced a specific type QCanBusFrame::FrameId
for the CAN bus frames identifier. The new type
is a typedef to quint32 and therefore should be
source compatible.
Change-Id: Ie26aa69cd48eb9cee4c11a0c8f8ba74efae24b4f
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
They only place where this might break user code,
is for custom plugins using custom configuration
parameters.
For most users however, this type safety makes the
API easier to use.
[ChangeLog][QCanBusDevice]
All functions dealing with configuration parameters
now take a QCanBusDevice::ConfigurationKey instead
an int.
Fixes: QTBUG-89839
Change-Id: I0a1de5fdcfc4292b23599d4770102740a2df1601
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-90399
Change-Id: I0521231e7d61809f38c44215b5cd923b292b9e02
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-84469
Change-Id: I3a3cd127fb9fed7b25d543a9c5af75c734397806
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
|
| |
Amends 99a3d35350c8c474
Change-Id: I249572b8713cef4a0207a331cbb36afdcc252544
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\
| |
| |
| | |
Change-Id: I2fdb4b8b60e0796c4468e41e0e77256c036f903f
|
| |
| |
| |
| |
| |
| |
| |
| | |
GetLastError() return DWORD aka unsigned long,
while qt_error_string takes an int.
Change-Id: Ie0c543645c149a9714cdedfdd2ec39b5959fedb8
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
So far only available for Windows, where the new code is much
faster. On my system, it takes 115 ms to enumerate both channels
of a PCAN USB Pro FD, instead of 901 ms withthe old method.
If no PCAN device is connected at all, it returns in 10 ms.
(Measured on Windows 7 Pro x64 in VirtualBox with Linux host).
On Linux, it has already been blazing fast with the old
enumeration code.
[ChangeLog][PeakCAN] QCanBusDevice::availableDevices() uses
PCAN_ATTACHED_CHANNELS on Windows now and gained a massive
speedup. The required PCAN-Basic-API is now 4.4.0 therefore.
Fixes: QTBUG-82115
Change-Id: Ic95b2f632110b0b1374b6eaa402cd228f278cdf2
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Can be useful to debug problems caused by old PCANBasic-DLLs.
Change-Id: I096611e2d7b7f36085a9784b91352245e161bf8e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I6ea56365fb2f4fb3d63d373861bce6c586938c39
|
| |
| |
| |
| |
| | |
Change-Id: I1efaf60109d17a370662ca2b57c20ac76a9fe523
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
[ChangeLog][QCanBusDeviceInfo] Added the function
alias() to query user-defineable identifiers
associated with a CAN bus interface.
Currently implemented for Peak CAN hardware on
Windows with PCAN-Basic >= 4.4.0: It returns the
PCAN_DEVICE_ID here, which can be set with PCAN-View.
Fixes: QTBUG-65195
Change-Id: I70480df956498015c3f876da7c12406be045aba6
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\
| |
| |
| | |
Change-Id: I49240ebad0b08b728783a4e5137f12799cb5080c
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QtSerialBus is already using QtSerialPort which has a WriteNotifier and
ReadNotifier class in place. Therefore it is possible that if these were
linked in together into one application that there would be multiple
instances of the same class name which caused problems as it would think
that the WriteNotifier in QtSerialPort was a QTimer and not a
QSocketNotifier. So keep the names unique to be on the safe side.
Change-Id: I8667e3d4230b316d47e266ad1b4319cf5e74444b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I35dad8a57ea003c7d70f03651aa0604141c8b2db
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Having the same function name in a global namespace
can lead the linker to pick an arbitrary one instead
the right one.
[ChangeLog] Fixed problems on static builds where
an arbitrary version of resolveSymbol() was used
instead the correct one.
Fixes: QTBUG-78546
Change-Id: I0ff9bc3e5905b3b9694dfe9d446b2a52700f213f
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The original terminology is Error active, Error warning,
Error Passive and Bus Off. We map them to GoodStatus,
WarningStatus, ErrorStatus and BusOffStatus here.
[ChangeLog][QCanBusDevice] Added the function busStatus()
to query the CAN bus status from the CAN bus device.
Fixes: QTBUG-70766
Change-Id: I22b99e2a02a6b22509005dd177796b861d536281
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently missing:
* VectorCAN: no information in the documentation found
* PassthroughCAN: no documentation
[ChangeLog][QCanBus][QCanBusDevice] Added the function
QCanBusDevice::resetController() to reset a CAN controller
from bus off state, as far as supported by the various
plugins.
Fixes: QTBUG-54943
Change-Id: Ic098054b012726c0c69970c0ae84f434c2b3964a
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: I80ce9909774c24834060dd37a5201ec413e37647
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some configuration parameters must be changed before
the device is opened, like bitrate and data bitrate.
Both bitrates are already set in PeakCanBackendPrivate::open(),
which is called some lines above. So skip the data bitrate
here, like already done for the (arbitration) bitrate.
Amends ac8509d992f4
Change-Id: Ib2ee99a8c969eeae96a8978401987c4fde273743
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
That should make it easier to debug problems and bug reports.
Change-Id: I31367a3a46df9dcca6dc8282cf1cb9c9e189e2ca
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is a PeakCAN "compatible" CAN library available for macOS:
http://www.mac-can.com/doxygen/html/index.html
The following changes need to be implemented to use this library:
- Use different library load name (PCBUSB rather than peakcanbasic)
- Use different types for data exchange with the library
[ChangeLog][PeakCAN] Added support for PCAN-USB devices on macOS
by using the MacCAN library (http://www.mac-can.com)
Change-Id: I6fcc62f5ddee32077ac007236ba78f834fc3f7f7
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
| |
there is no point in putting the owning module there.
Change-Id: I9bc49ae323a4bbc8cd35d10493c899466645bd44
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Introduced by e0e89f0719497d43fcbd14a2c8d17bcaaf595a78
which changed the constants PCAN_CHANNEL_AVAILABLE and
FEATURE_FD_CAPABLE to unsigned integers.
Change-Id: I0d9278d2842180230ac3d744595151762de77794
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
|
| |
Change-Id: I802c68d7ea6422640a83d7e5ea17c591a8e3d078
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Tested on Windows 7 with PCAN-USB Pro, both channels connected,
one side connected to PCAN-View, other side to CAN-Example.
The bitrate handling is done according the information in the
following threads:
https://www.peak-system.com/forum/viewtopic.php?f=41&t=1756
https://www.peak-system.com/forum/viewtopic.php?f=177&t=1257
[ChangeLog][QCanBus][Plugins] Added CAN FD functionality to
the PeakCAN plugin. Therefore the minimum required PCAN-Basic
version is now 4.0.0.
Task-number: QTBUG-62959
Change-Id: I76180d3e251969bfaa324708de6b7e39487b45f3
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added description, serial number and channel for SocketCAN, PeakCAN,
SystecCAN, and VectorCAN plugins. For now, not all plugins do support
all kind of information:
SocketCAN: description and channel
PeakCAN: description and channel (Windows PCANBasic >= 4.2.0)
SystecCAN: description, serial number, and channel
VectorCAN: description, serial number, and channel
[ChangeLog][QCanBusDeviceInfo] Added description, serial number
and channel to QCanBusDeviceInfo, as far as supported by the
various plugins.
Change-Id: Ib2292e06065eb91848f682ebf69a4cc968f4d4ba
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\
| |
| |
| | |
Change-Id: Ia04f54eee1264b659d8928b7f08d7221f587bc54
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: Icfbad81955ad8a7c4ddc49ac4ee952bcba6317ec
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
[ChangeLog][CanBus][PeakCAN] Peak CAN status frames are no longer
converted into QCanBusFrame::DataFrame, they are simply dropped
for now. In a later Qt version they might by converted into proper
QCanBusFrame::ErrorFrame, together with an interpretErrorFrame()
implementation.
Change-Id: I673ef2c8d312a96de192def831036ad10d5f2c01
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Marcell Varga <eandr2@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It was impossible to open a Peak CAN device under Linux, because
CAN_SetValue (which is needed for the Windows implementation)
always returned with error.
Task-number: QTBUG-63428
Change-Id: I353bf44a7bdea4a18ef84d8037a3a9fd86d47d89
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
| |/
| |
| |
| |
| |
| |
| |
| | |
Found by clazy.
Change-Id: Ie04fadd3adacde9739c5cba7f566caac78f1d696
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|