| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I40fa19b016ca5e8e8e831a909eb378545a026446
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
| |
qmodbusrtuserialmaster_p.h:356:68: error: lambda capture 'this' is not used [-Werror,-Wunused-lambda-capture]
Change-Id: Ia53158e207a94bf49489fffd14c7903c7e4655cb
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\
| |
| |
| | |
Change-Id: I9c93f053c5a6a7af04c79d6e2cc8ded76c906319
|
| |
| |
| |
| |
| | |
Change-Id: I7daa9be5b0b21c0f94021b9a2eb139915c501049
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Listing important changes and bug-fixes.
Change-Id: I2f3b131c319feb0e95d8d08e9a07b71078f52a57
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The different plugins have varying runtime requirements,
that should be described in the plugins documentation.
Allow the user to open the documentation easily.
[ChangeLog][QCanBus] Added a menu to open plugins online
documentation to the CAN Example.
Change-Id: I2ae19b439f91042c6bcb09a7db079249fb34355c
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Amends commit 3f8eb3be91641f9dba597e4421f9bbf50c5c161e
Change-Id: Ibc0a1019ac4a4e63044c43125826614983a604e4
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I0dbbf10d8448c5d26f28bd7fa84cdeab21e6eb5c
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|/
|
|
| |
Change-Id: I65aebb9442ff23158f29068e6f4a789217af99be
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
xlOpenPort() fails to open "can0" when the Vector
vxlapi.dll is available, but no Vector device driver
is installed. Calling xlClosePort() afterwards crashes.
Before this patch, xlDeactivateChannel() and
xlClosePort() were called unconditionally as
part of VectorCanBackendPrivate::close() when
any VectorCanBackendPrivate::open() step failed.
Now xlClosePort() is only called when xlOpenPort()
succeeded. Also guard xlDeactivateChannel() for
consistence (doesn't make sense to call it on a
closed device), even if this never crashed for me.
Change-Id: Iad480f7e02ca8f45b8cc4d1d8930640b2d8cbeb2
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
| |
Change-Id: Ie939d23f1de0956fa34c74f52180775af8d38524
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
| |
Looks like a relict from a former implementation.
Change-Id: Ic8c1c81151bc7877a991d35d410680f9bc29448a
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
| |
Change-Id: I9f5c41a5c3cd0c83f3835d29de22b76ac367cdbb
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
| |
All lines are still shorter than 100 chars and even
shorter as the longest line in this file.
Change-Id: I227b13f78b3b7628287729f40ffec7bfa06231db
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
| |
Change-Id: Ic3dce0c8b91e9994c31763725de48f4900fd9bef
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
As pointed out in the 5.9 API review.
Deleted the standard constructor to not assign memory.
The only way to construct QCanBusDeviceInfo is now by
using the return value of QCanBus::availableDevices():
const auto infos = QCanBus::instance()->availableDevices(backend);
for (const QCanBusDeviceInfo &info : infos)
// do something with info
Change-Id: I3382d8a8fffadd18e4f2f87d4ede94e7c2e442f2
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
| |
Amends commit 19d4d81e8dd7ccb9831bea725989d2a08d258207
Change-Id: Icd9e64c0b480b627e22b3d4fce4fff68a87ab410
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
|
|
|
|
|
| |
Change-Id: Ib3f7925f0f063c12bea487c73f8cb1c5817c2492
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/canbus/canbus.pro
src/plugins/canbus/vectorcan/vectorcanbackend.cpp
Change-Id: I3625693784e88204c93479806242ae70c7ec7ff3
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QModbusRtuSerialMaster wouldn't close on disconnect and would never
release serial port because of patch in QTBUG-56009. Revert part of
patch 6bed30d5ceef1463469e37173b3ebac2cfdc2352 which lead to this
state.
Task-number: QTBUG-59050
Change-Id: I8b3280a2889a416aa80e7f58264b5f9696b8c8b9
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It turned out, that this change is not binary compatible
as it was meant to be. Loading the plugins with
QPluginLoader failed, so this patch needs to be reverted.
This reverts commit b63a833346ed14baddbf598d48e005090b8bcb56.
Change-Id: I32c7e3a46bdd5e2ea6217e6d2050a3878f53f1ff
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Pointed out by GCC 7:
writeregistermodel.cpp:117:48: warning: enum constant in boolean context [-Wint-in-bool-context]
if (index.column() == HoldingColumn && Qt::EditRole) { // holding registers
^~~~~~~~
Change-Id: I5d0f19c0480b027109c6a751f69852114cb634b2
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: David Faure <david.faure@kdab.com>
|
| |
| |
| |
| |
| |
| |
| | |
Amends commit 6803fbb01566e74df895326fb7805868696ce9c4
Change-Id: I97d06afa554df0c7528164f8accf9196c542e65c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Drop an unused include, don't try to set the library path if
!QT_CONFIG(library) and don't build the peakcan and tinycan plugins
as those use QLibrary to look up their symbols.
Change-Id: Id8b1245c1cf69f7548e050d47d5956f53562477d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
As demanded in the API review.
Change-Id: I640ab16a12ab9297270371550236eda903f26ea2
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-58774
Change-Id: I9ac12dbb5ae267a063b3c60130ed86499bce22dc
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Beside the CAN ID, the bit XL_CAN_EXT_MSG_ID
is stored in event.tagData.msg.id. This bit
indicates, that the received frame has
extended frame format.
However, this bit must be masked before calling
QCanBusFrame::setFrameId(), otherwise the frame
is marked as invalid with the ID set to zero.
Most likely this was broken by commit
a54fd820916caed2fb13b1a38e57deb5d918f74f
Task-number: QTBUG-58840
Change-Id: I1814f19fe3ba8a7d057c42e112b62228fabf4206
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Added binary compatibility file and global.cfg for qtserialbus
Change-Id: I43c27c5ce36718856a1b3fa7b8870c3de003d819
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
| |
| |
| |
| |
| | |
Change-Id: I7d38491c7ee15a1de788375acf9144c59b507d2a
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |\
| | |
| | |
| | | |
Change-Id: I34693c3a4b342b1a5b30b5adc4af34f67fccb8b2
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ieb5bd937787c2f68f97c9ef505e6a0ca091806ac
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
error #68: integer conversion resulted in a change of sign
QByteArray elements are char, not quint8.
Change-Id: I73fa1e59a4844c43a109fffd148caecfb59c95cc
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I46a0970cefa87d2fd401b74638f80c3395ff2391
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I1a63fc5ceef54e2c8fb3d853990d8e0370f940b5
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The overload was introduced in Qt 5.7.
Change-Id: I99ae1bd0ef896213b6c5a85277ff0dfb1da1602a
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I72d2dd90137c3be2e07311d1dc4f83dfa4c15a18
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Print two spaces after the info to separate the CAN ID,
print no space before the info as the timestamp already
ends with two spaces.
Example output:
1490815444.0159 - - 12345678 [04] 00 11 22 33
1490815444.0171 B - 12345678 [04] 00 11 22 33
1490815444.0186 - E 12345678 [04] 00 11 22 33
1490815444.0200 B E 12345678 [04] 00 11 22 33
This example output was generated with the following
small script:
for i in 0 1 2 3
do
cansend vcan0 12345678##${i}00112233
done
Change-Id: I579f72383ebb92a979251bd41fe3a6fa58f33f04
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
At the moment, only CAN FD flags are shown, but this is very
likely to be extended to TX/RX printing soon.
Change-Id: Ibdf6014645fdc5a4d3791ab12ce298f4e2a4b3c6
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add a plugin that implements the now deprecated
QCanBusFactory to assure this still works.
Change-Id: Idd0e121ebdd324bacc01c1805ab43749a85c7a84
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added a new QCanBusFactoryV2 to load plugins with the
new virtual function availableDevices().
To be able to still load plugins compiled against Qt 5.8,
both factories have to be considered when loading plugins
and creating devices.
Change-Id: I843cdd0b82193e391699daa298454c8b9522e860
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I608b890166deea40e20cc3790790479960aba6b2
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* For receiving, force the CAN plugin into CAN FD mode
and show the CAN FD flags like the CAN Example
* For sending, check if an odd number of data bytes is
given and interpret the first data char as CAN FD flags
Task-number: QTBUG-56464
Change-Id: I235827ea59d58744c34d5259e5637ad9c3326112
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I23fefe9f8db3656fccb08c3968d6174a91d82412
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Amends commit bb77953d24bd633eb87caf80df1fbaa3d8cf6da5
Change-Id: Idc52125a043294c0f9c5eedb9d4883373d924cb9
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Mihai Baneu <bdmihai@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Otherwise the sorting depends on the directory
structure in /sys/class/net/
Change-Id: I95cc3d5f5d88f16c3511a9594eb4c466f807ef71
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I118d1a5e2ec4fff583476a1a643a37764ce2b49b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
GenericBusPlugin is just used for internal testing.
It does not need special handling, it can just behave
like the other plugins.
Change-Id: I55cb1133b51cb5f6ab3ca49484d3ba795867c2bb
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Amends the introducing commit
55d405697c79c4ca23535140e60915e89b4054e3
as well as the API improvement in commit
15d3834f6dbe319827abdbdb92383846dd7cac3c
Change-Id: Ie1da751cf3cbe743bc2d159bb1515af6b3d23fe0
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic47e936f6b6320e06da8d999cffad729e2f273b8
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes issues pointed out in the API review.
Change-Id: Ia335440e7df48ee93b3243cf5686e23a3859febc
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|