Browse Source

Added display for comm errors

QGC4.4
lm 15 years ago
parent
commit
9b6a5c358c
  1. 2
      src/uas/UAS.cc
  2. 65
      src/ui/UASInfo.ui

2
src/uas/UAS.cc

@ -171,7 +171,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
emit modeChanged(this->getUASID(), mode, ""); emit modeChanged(this->getUASID(), mode, "");
modeAudio = " is now in " + mode; modeAudio = " is now in " + mode;
} }
currentVoltage = state.vbat; currentVoltage = state.vbat/1000.0f;
lpVoltage = filterVoltage(currentVoltage); lpVoltage = filterVoltage(currentVoltage);
if (startVoltage == 0) startVoltage = currentVoltage; if (startVoltage == 0) startVoltage = currentVoltage;
timeRemaining = calculateTimeRemaining(); timeRemaining = calculateTimeRemaining();

65
src/ui/UASInfo.ui

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>462</width> <width>455</width>
<height>189</height> <height>220</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -66,7 +66,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4"> <item row="0" column="4" colspan="4">
<widget class="QProgressBar" name="batteryBar"> <widget class="QProgressBar" name="batteryBar">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@ -109,7 +109,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="5" rowspan="4"> <item row="0" column="8" rowspan="6">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -171,7 +171,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="4"> <item row="1" column="4" colspan="4">
<widget class="QProgressBar" name="receiveLossBar"> <widget class="QProgressBar" name="receiveLossBar">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@ -257,7 +257,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="4"> <item row="2" column="4" colspan="4">
<widget class="QProgressBar" name="sendLossBar"> <widget class="QProgressBar" name="sendLossBar">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@ -343,7 +343,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="4"> <item row="3" column="4" colspan="4">
<widget class="QProgressBar" name="loadBar"> <widget class="QProgressBar" name="loadBar">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@ -380,7 +380,56 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="6"> <item row="4" column="0" colspan="8">
<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">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>

Loading…
Cancel
Save