| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
androiddeployqt cannot work out that the plugins under
qtserialbus/tests/auto/plugins are required to pass this test.
Fixes: QTBUG-73621
Change-Id: Ib246ff186ec4c8688e1525fc9500d69fda4775a4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
|
|
|
|
|
|
|
| |
Binary compatibility file added.
Change-Id: I3f63fc11a7f5b8ab24f9334aaf2f71ac989fe303
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
|
|
|
|
|
|
|
|
|
|
| |
Prior to this change the startAddress of the current value mapping
was not taken into account. Therefore shifted reads and write
(with non-zero startAddresses) were accessing the wrong register
indexes.
Fixes: QTBUG-64843
Change-Id: Iaf1f91705586f45db059d6dd54b68a84d16926a0
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
As pointed out in the API review, this could lead to confusion
when reading statements like this:
if (device->clear(QCanBusDevice::Input)) {
// ...
}
Change-Id: Ic039d3ed32f9ef8e7c3fb8b5f0659b8c9afd8038
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|\
| |
| |
| | |
Change-Id: Ica7cd1da4c15676aceff65f061d20c43e8f5bf69
|
| |
| |
| |
| |
| |
| |
| | |
Binary compatibility file for bic test added.
Change-Id: I93a13cf30861a7f3e3e97811216c0c37a8158151
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I1e024cf6987c7f869b991dbcc14591fb4d382340
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add override to processResponse(), fixing:
\tst_qmodbusclient.cpp(70,10): warning: 'processResponse' overrides a member function but is not marked 'override'
[-Winconsistent-missing-override]
bool processResponse(const QModbusResponse &response, QModbusDataUnit *data)
Change-Id: Ie12af6914647c0a078189f85af1d3b037828eb6e
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I2f548dce2bba78a757355addb35ad80f072701c0
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Prior to this change, an unconnected device would transition into the Closing
state if disconnectDevice() was called. Since the transition to Unconnected is
bound to sockets being closed the already unconnected ModbusDevice would
forever hang in CLosing.
Task-number: QTBUG-66648
Change-Id: Ia439f6b63b7d4ab7f377a45fb09cb5f5b99627f7
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
|
|\|
| |
| |
| | |
Change-Id: If041fd380305b2fa40106998b036079a76b971d3
|
| |
| |
| |
| |
| |
| |
| | |
Amends 48325e7e0b1094d96d32c39ad4df6d1c816c5c1e
Change-Id: I328199bb0b34d5a484b5ca09247eb2fa04bca452
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|/
|
|
|
|
|
|
|
|
|
| |
[ChangeLog][QCanBusDevice] Added functions to read all frames
from the receive buffer and to clear the receive or transmit
buffer.
Task-number: QTBUG-66143
Change-Id: I0b2f9bd0044c688f6a3261ccce8c22b9e58dfea8
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ibcb5508d7f131cbeba0d047111177a8dff1e5f68
|
| |
| |
| |
| |
| |
| |
| | |
File to test binary compatibility added for 5.10
Change-Id: I0d9d7fa85e02f3cc34c108e81ecc54ed27b8adbd
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Adopt includes to common style
* Use member inits
* Use Qt5 connect style
* Replace QVERIFY by QCOMPARE where applicaple and vice versa
* Prettify comments
* Replace QString::fromLatin1 with QStringLiteral
Change-Id: I9d838d12062a8fa3312105f8f9110e1ba65616ee
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In contrast to CAN 2.0 which allows all payload
sizes between 0 and 8, CAN FD only has discrete
payload lengths: 0..8, 12, 16, 20, 24, 32, 48, and 64.
[ChangeLog][QCanBusFrame] QCanBusFrame::isValid() now
checks for invalid CAN FD payload lengths. E.g. 24 is
a valid CAN FD payload length, but 28 is not. Frames
with invalid data field size may therefore be discarded
by QCanBusDevice::writeFrame() as it is impossible to
transmit them on a real CAN bus.
Task-number: QTBUG-63294
Change-Id: I2598194061f7f8b15f4ee5eabbf41e3134b92d4f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|/
|
|
|
|
|
|
| |
We keep both available to test against the different versions
of QCanBusFactory. But they should be as similar as possible.
Change-Id: I94488bdddeecc405026b41a5ead15e1342839faa
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Inspiration for change after reading the SocketCAN mailing list thread:
https://marc.info/?l=linux-can&m=147438437202356&w=2
The main usage is, to verify at application stage, that and when a
frame was really sent on the bus. For architectures like SocketCAN,
where multiple applications can connect to one CAN bus on the same
system, this flag also indicates frames that are sent by an other
local running application (i.e. not coming from the real bus).
Implementations done for SystecCAN, VectorCAN and SocketCAN plugin.
PCAN Basic does not seem to have support for this flag.
For SocketCAN, see section "4.1.7 RAW socket returned message flags"
in https://www.kernel.org/doc/Documentation/networking/can.txt
for reference.
[ChangeLog][QCanBusFrame] Added local echo flag to mark all echo frames
that are generated by the hardware on successful transmission to CAN bus
as such.
Change-Id: I66d4ce1ec6dfd0a0b994a7b7a9de1a5f503fcb70
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
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>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/canbus/canbus.pro
src/plugins/canbus/vectorcan/vectorcanbackend.cpp
Change-Id: I3625693784e88204c93479806242ae70c7ec7ff3
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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: 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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added hasErrorStateIndicator and setErrorStateIndicator to QCanBusFrame.
* Setting QCanBusFrame::setErrorStateIndicator(true)
also sets QCanBusFrame::setFlexibleDataRateFormat(true)
* Setting QCanBusFrame::setFlexibleDataRateFormat(false)
also sets QCanBusFrame::setErrorStateIndicator(false)
[ChangeLog][QCanBusFrame] Added error state indicator flag
to QCanBusFrame and set it appropriate receiving CAN FD
frames with the SocketCAN plugin. Setting this flag for
testing purposes is also possible.
Change-Id: I406b693fc7b7cde8a0d6b2c34c1f313800f11203
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QCanBusFrame:
Added hasBitrateSwitch and setBitrateSwitch to QCanBusFrame
and therefore, increased the QCanBusFrame version number.
* Setting QCanBusFrame::setBitrateSwitch(true)
also sets QCanBusFrame::setFlexibleDataRateFormat(true)
* Setting QCanBusFrame::setFlexibleDataRateFormat(false)
also sets QCanBusFrame::setBitrateSwitch(false)
QCanBusDevice:
Reference implementation and documentation are done for
the SocketCAN plugin. The CAN Example allows to send
frames with Bitrate Switch enabled and visualize received
frames with Bitrate Switch set.
Unfortunately, the SocketCAN plugin does not allow to change
any bitrate yet, so the newly added data bitrate selection
box in ConnectDialog seems a bit useless. This box is
however needed once other plugins become CAN FD capable and
implement bitrate switching.
[ChangeLog][QCanBusFrame] Introduced flag to allow data
bitrate switching for CAN FD frames. Reference
implementation is done for the SocketCAN plugin.
Task-number: QTBUG-56720
Change-Id: Ieab04020f4750c8b0085624d2250ad7cd982cd96
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I4ec52799514b750c158e3cb8e6c38d1f1063c6c5
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Returns:
* a list of available devices for the chosen plugin
* if the device is virtual
* if the device is CAN FD capable
Use this list in the CAN Example for interface selection.
If information about virtual channels or CAN FD capabability is not
available, false is returned.
For SocketCAN, PeakCAN, VectorCAN and SystecCAN, the implementation is
completed. TinyCAN only return the list of possible interfaces for now.
This is can be changed later, but needs quite some refactoring of the
TinyCAN plugin.
[ChangeLog][QtCanBus] Added the new class QCanBusDeviceInfo
for enumeration of available CAN interfaces and more information
about them.
Task-number: QTBUG-54298
Change-Id: I851bcc3b9ee41aaaf1164c6b4a5aaf6503cd8746
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
| |
Amends change 254d78c86343d178305b57ba58d7b53bff845542.
Change-Id: I4662a460a10b3122b993e6de6b1e269c507c8fa0
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
|
|
| |
tst_qmodbuspdu.cpp(859): warning C4309: 'argument': truncation of constant value
Change-Id: I88d9dd3c65abb79a7d536e4b30a62273ab155398
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/canbus/peakcan/main.cpp
src/plugins/canbus/tinycan/main.cpp
src/serialbus/qcanbusframe.h
Change-Id: I7a38350688086b5f5cd7072acccb3fa38af76f88
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/qmodbuspdu/tst_qmodbuspdu.cpp
Change-Id: Id97e8ef6a6c176add1eda3738888c69c33f5378c
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The various byte count fields are all unsigned byte however the incoming
data are loaded in a QByteArray which returns signed char. This patch
fixes this by converting the field value to quint8.
[ChangeLog][Modbus] Fixed handling of packets with payloads longer than
127 bytes.
Task-number: QTBUG-54834
Change-Id: I699c4cf0cea9933bef6c040c573d2d6e6a113920
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-49675
Task-number: QTBUG-56720
Change-Id: Id24783c6ee1b81317d2e6d0965a9ed37987b47ec
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
All changes to canId have to go through setFrameId,
which marks frames with id >= 2^29 as invalid.
This can then be checked by isValid().
Change-Id: Ie9a80c35608cdb215d8d1ce3cb314bdc77924e05
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This limits the three fields CAN-ID, length and data better.
SocketCAN's candump does it this way and with this change
canbusutil get's more compatible to candump.
This function is new in 5.8, so there is no behavior change
for existing code outside Qt.
Change-Id: Ifc26cb7584a572d7aef91763242e7def909a6083
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Andreas Wilhelm <aw@emlix.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-51845
Change-Id: I5846b288d03b936fd1f3d3658a70c9ec5f7e6b46
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
These functions were not used outside the tests and are not useful
for the end user. So remove them now before our BC rules forbid it.
[ChangeLog][QtSerialBus][QCanBusFrame::TimeStamp] Removed the
setSeconds() and setMicroSeconds() functions to avoid confusion
about unnormalized time stamps.
Change-Id: Idf40bd5ce0bd949b7fb5dd992388688d52c80647
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The new function fromMicroSeconds() automatically converts overflow
microseconds to seconds.
[ChangeLog][QtSerialBus][QCanBusFrame::TimeStamp]
TimeStamp::fromMicroSeconds() creates time stamps with normalized
microseconds and the overflow added to seconds.
Change-Id: I55aab33c1bcf444c50b09415e038a3c8929caeab
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic428f1b9d1a95322a655f3d2b6d6cc658a7841d9
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic6f2540f3b13bfb5f5795c9ca2acae83c3af53b3
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qcanbusdevice.h is already included by dummybackend.h.
Change-Id: I4ad3cca1f874489e67265fc2668ab66147b86454
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ice496b6bc2210a36fe79197ee929a2400ffd04d9
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I78fdf3ebf0d5becd11a003596c0f3ec3aa556504
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
CAN 2.0 has a maximum data field length of 8 bytes,
and CAN FD can have up to 64 data bytes.
Insert an extra space for data field length < 10
to pretty align all the frames in a table.
Change-Id: Icc5db2cfa066848d47d107c82269c1cf26252924
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This allows to display CAN frames to the user and reduces a lot
of duplication.
[ChangeLog][QtSerialBus][QCanBusFrame] Added toString() to QCanBusFrame.
Task-number: QTBUG-53171
Change-Id: I56c4c8c41012f76e2db6e1c97307325b0c73b14a
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|