diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-01-11 22:03:34 +0100 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-01-17 14:26:38 +0000 |
| commit | d4bbdb83b26f8219b6c64bcff3967aa15db07d9c (patch) | |
| tree | cd95d46d532298757ac6b3620953cb3a2e792c4d /examples/serialbus/can/connectdialog.ui | |
| parent | 52967158da2c02efceea610e83786bbd6b5a888a (diff) | |
CAN: Introduce CAN FD Bitrate Switch (BRS)
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>
Diffstat (limited to 'examples/serialbus/can/connectdialog.ui')
| -rw-r--r-- | examples/serialbus/can/connectdialog.ui | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/examples/serialbus/can/connectdialog.ui b/examples/serialbus/can/connectdialog.ui index 345ff64..aad6bef 100644 --- a/examples/serialbus/can/connectdialog.ui +++ b/examples/serialbus/can/connectdialog.ui @@ -146,6 +146,16 @@ <item row="5" column="1"> <widget class="QComboBox" name="canFdBox"/> </item> + <item row="6" column="0"> + <widget class="QLabel" name="dataBitrateLabel"> + <property name="text"> + <string>Data Bitrate</string> + </property> + </widget> + </item> + <item row="6" column="1"> + <widget class="BitRateBox" name="dataBitrateBox"/> + </item> </layout> </widget> </item> |