diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2018-03-11 21:18:47 +0100 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2018-03-15 08:46:08 +0000 |
| commit | da6d6c5d0de869298ce2b5f35993df669dcaa572 (patch) | |
| tree | 373aa67b44a7517c05bc7c9b2788ecfac117ec98 /examples/serialbus | |
| parent | a21639682d0d28e0ebca0228e456e20180efd8b1 (diff) | |
CAN-Example: Show data bitrate in the status bar also
Change-Id: Ie3b357645c8beb4d6e048d309e04f6abbe02824d
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples/serialbus')
| -rw-r--r-- | examples/serialbus/can/mainwindow.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp index fd5861f..300bbde 100644 --- a/examples/serialbus/can/mainwindow.cpp +++ b/examples/serialbus/can/mainwindow.cpp @@ -151,11 +151,21 @@ void MainWindow::connectDevice() m_ui->sendFrameBox->setEnabled(true); - QVariant bitRate = m_canDevice->configurationParameter(QCanBusDevice::BitRateKey); + const QVariant bitRate = m_canDevice->configurationParameter(QCanBusDevice::BitRateKey); if (bitRate.isValid()) { - m_status->setText(tr("Plugin: %1, connected to %2 at %3 kBit/s") - .arg(p.pluginName).arg(p.deviceInterfaceName) - .arg(bitRate.toInt() / 1000)); + const bool isCanFd = + m_canDevice->configurationParameter(QCanBusDevice::CanFdKey).toBool(); + const QVariant dataBitRate = + m_canDevice->configurationParameter(QCanBusDevice::DataBitRateKey); + if (isCanFd && dataBitRate.isValid()) { + m_status->setText(tr("Plugin: %1, connected to %2 at %3 / %4 kBit/s") + .arg(p.pluginName).arg(p.deviceInterfaceName) + .arg(bitRate.toInt() / 1000).arg(dataBitRate.toInt() / 1000)); + } else { + m_status->setText(tr("Plugin: %1, connected to %2 at %3 kBit/s") + .arg(p.pluginName).arg(p.deviceInterfaceName) + .arg(bitRate.toInt() / 1000)); + } } else { m_status->setText(tr("Plugin: %1, connected to %2") .arg(p.pluginName).arg(p.deviceInterfaceName)); |