diff options
author | Andre Hartmann <aha_1980@gmx.de> | 2019-02-23 11:18:22 +0100 |
---|---|---|
committer | Andre Hartmann <aha_1980@gmx.de> | 2019-07-17 14:21:24 +0200 |
commit | f83587a9978bd212d7cd64a8d68330a8b97572db (patch) | |
tree | d6f3421d7dbaf6b5b732f975dde4b2903d2e3454 /examples/serialbus/can/mainwindow.ui | |
parent | 30df8839a1d0e81580fa570b9fa7d6c4217d8b25 (diff) |
Add QCanBusDevice::busStatus()
The original terminology is Error active, Error warning,
Error Passive and Bus Off. We map them to GoodStatus,
WarningStatus, ErrorStatus and BusOffStatus here.
[ChangeLog][QCanBusDevice] Added the function busStatus()
to query the CAN bus status from the CAN bus device.
Fixes: QTBUG-70766
Change-Id: I22b99e2a02a6b22509005dd177796b861d536281
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples/serialbus/can/mainwindow.ui')
-rw-r--r-- | examples/serialbus/can/mainwindow.ui | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/examples/serialbus/can/mainwindow.ui b/examples/serialbus/can/mainwindow.ui index 2f61336..f773ffb 100644 --- a/examples/serialbus/can/mainwindow.ui +++ b/examples/serialbus/can/mainwindow.ui @@ -66,6 +66,13 @@ </property> </widget> </item> + <item> + <widget class="QLabel" name="busStatus"> + <property name="text"> + <string/> + </property> + </widget> + </item> </layout> </widget> </item> @@ -77,7 +84,7 @@ <x>0</x> <y>0</y> <width>551</width> - <height>19</height> + <height>22</height> </rect> </property> <widget class="QMenu" name="menuCalls"> |