Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
81590ac9
Commit
81590ac9
authored
Jun 04, 2010
by
lm
Browse files
Added error counters
parent
09ebae05
Changes
2
Show whitespace changes
Inline
Side-by-side
src/ui/UASInfo.ui
View file @
81590ac9
...
...
@@ -66,7 +66,7 @@
</property>
</widget>
</item>
<item
row=
"0"
column=
"4"
colspan=
"
4
"
>
<item
row=
"0"
column=
"4"
colspan=
"
2
"
>
<widget
class=
"QProgressBar"
name=
"batteryBar"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"MinimumExpanding"
vsizetype=
"Fixed"
>
...
...
@@ -109,7 +109,7 @@
</property>
</widget>
</item>
<item
row=
"0"
column=
"
8
"
rowspan=
"6"
>
<item
row=
"0"
column=
"
6
"
rowspan=
"6"
>
<spacer
name=
"horizontalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
...
...
@@ -171,7 +171,7 @@
</property>
</widget>
</item>
<item
row=
"1"
column=
"4"
colspan=
"
4
"
>
<item
row=
"1"
column=
"4"
colspan=
"
2
"
>
<widget
class=
"QProgressBar"
name=
"receiveLossBar"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"MinimumExpanding"
vsizetype=
"Fixed"
>
...
...
@@ -257,7 +257,7 @@
</property>
</widget>
</item>
<item
row=
"2"
column=
"4"
colspan=
"
4
"
>
<item
row=
"2"
column=
"4"
colspan=
"
2
"
>
<widget
class=
"QProgressBar"
name=
"sendLossBar"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"MinimumExpanding"
vsizetype=
"Fixed"
>
...
...
@@ -343,7 +343,7 @@
</property>
</widget>
</item>
<item
row=
"3"
column=
"4"
colspan=
"
4
"
>
<item
row=
"3"
column=
"4"
colspan=
"
2
"
>
<widget
class=
"QProgressBar"
name=
"loadBar"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"MinimumExpanding"
vsizetype=
"Fixed"
>
...
...
@@ -380,56 +380,14 @@
</property>
</widget>
</item>
<item
row=
"4"
column=
"0"
colspan=
"
8
"
>
<item
row=
"4"
column=
"0"
colspan=
"
6
"
>
<widget
class=
"Line"
name=
"line"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
</widget>
</item>
<item
row=
"5"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_4"
>
<property
name=
"text"
>
<string>
I2C Errors
</string>
</property>
</widget>
</item>
<item
row=
"5"
column=
"1"
colspan=
"2"
>
<widget
class=
"QLabel"
name=
"i2cErrorLabel"
>
<property
name=
"text"
>
<string>
0
</string>
</property>
</widget>
</item>
<item
row=
"5"
column=
"4"
>
<widget
class=
"QLabel"
name=
"label_5"
>
<property
name=
"text"
>
<string>
SPI Errors
</string>
</property>
</widget>
</item>
<item
row=
"5"
column=
"5"
>
<widget
class=
"QLabel"
name=
"spiErrorLabel"
>
<property
name=
"text"
>
<string>
0
</string>
</property>
</widget>
</item>
<item
row=
"5"
column=
"6"
>
<widget
class=
"QLabel"
name=
"label_10"
>
<property
name=
"text"
>
<string>
UART Errors
</string>
</property>
</widget>
</item>
<item
row=
"5"
column=
"7"
>
<widget
class=
"QLabel"
name=
"uartErrorLabel"
>
<property
name=
"text"
>
<string>
0
</string>
</property>
</widget>
</item>
<item
row=
"6"
column=
"0"
colspan=
"9"
>
<item
row=
"6"
column=
"0"
colspan=
"7"
>
<spacer
name=
"verticalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
...
...
@@ -445,6 +403,13 @@
</property>
</spacer>
</item>
<item
row=
"5"
column=
"0"
colspan=
"6"
>
<widget
class=
"QLabel"
name=
"errorLabel"
>
<property
name=
"text"
>
<string>
No error status received yet
</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
...
...
src/ui/uas/UASInfoWidget.cc
View file @
81590ac9
...
...
@@ -110,7 +110,7 @@ void UASInfoWidget::updateBattery(UASInterface* uas, double voltage, double perc
void
UASInfoWidget
::
updateErrorCount
(
int
uasid
,
QString
component
,
QString
device
,
int
count
)
{
qDebug
()
<<
__FILE__
<<
__LINE__
<<
activeUAS
->
getUASID
()
<<
"="
<<
uasid
;
//
qDebug() << __FILE__ << __LINE__ << activeUAS->getUASID() << "=" << uasid;
if
(
activeUAS
->
getUASID
()
==
uasid
)
{
errors
.
remove
(
component
+
":"
+
device
);
...
...
@@ -182,5 +182,16 @@ void UASInfoWidget::refresh()
ui
.
sendLossLabel
->
setText
(
QString
::
number
(
sendLoss
,
'f'
,
2
));
QString
errorString
;
// ui.
QMapIterator
<
QString
,
int
>
i
(
errors
);
while
(
i
.
hasNext
())
{
i
.
next
();
errorString
+=
QString
(
i
.
key
()
+
": %1 "
).
arg
(
i
.
value
());
// FIXME
errorString
.
replace
(
"IMU:"
,
""
);
}
ui
.
errorLabel
->
setText
(
errorString
);
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment