diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2018-10-02 11:41:16 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2019-05-02 11:15:05 +0000 |
| commit | a88ecda86028228174a1ec4e53df235ebac33dcc (patch) | |
| tree | 9a39dfe2e0e85310c0450fef9be15120f9dd7ba1 /examples/serialbus | |
| parent | 4a7f051247b05e1e298ffabc00e8ce3dc3e216a0 (diff) | |
Add QCanBusDevice::resetController() for CAN controller reset
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>
Diffstat (limited to 'examples/serialbus')
| -rw-r--r-- | examples/serialbus/can/mainwindow.cpp | 3 | ||||
| -rw-r--r-- | examples/serialbus/can/mainwindow.ui | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp index 300bbde..b2bae6d 100644 --- a/examples/serialbus/can/mainwindow.cpp +++ b/examples/serialbus/can/mainwindow.cpp @@ -93,6 +93,9 @@ void MainWindow::initActionsConnections() connect(m_ui->actionConnect, &QAction::triggered, m_connectDialog, &ConnectDialog::show); connect(m_connectDialog, &QDialog::accepted, this, &MainWindow::connectDevice); connect(m_ui->actionDisconnect, &QAction::triggered, this, &MainWindow::disconnectDevice); + connect(m_ui->actionResetController, &QAction::triggered, this, [this]() { + m_canDevice->resetController(); + }); connect(m_ui->actionQuit, &QAction::triggered, this, &QWidget::close); connect(m_ui->actionAboutQt, &QAction::triggered, qApp, &QApplication::aboutQt); connect(m_ui->actionClearLog, &QAction::triggered, m_ui->receivedMessagesEdit, &QTextEdit::clear); diff --git a/examples/serialbus/can/mainwindow.ui b/examples/serialbus/can/mainwindow.ui index 1d5a657..2f61336 100644 --- a/examples/serialbus/can/mainwindow.ui +++ b/examples/serialbus/can/mainwindow.ui @@ -87,6 +87,8 @@ <addaction name="actionConnect"/> <addaction name="actionDisconnect"/> <addaction name="separator"/> + <addaction name="actionResetController"/> + <addaction name="separator"/> <addaction name="actionClearLog"/> <addaction name="separator"/> <addaction name="actionQuit"/> @@ -163,6 +165,14 @@ <string>Open plugin documentation in Webbrowser</string> </property> </action> + <action name="actionResetController"> + <property name="text"> + <string>&Reset CAN Controller</string> + </property> + <property name="toolTip"> + <string>Reset CAN Controller</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> <customwidgets> |