From 9b6a5c358ce702d1d07f5a2f5de7fbeb6746c285 Mon Sep 17 00:00:00 2001
From: lm <pixhawk@pixhawk02.(none)>
Date: Wed, 28 Apr 2010 19:16:31 +0200
Subject: [PATCH] Added display for comm errors

---
 src/uas/UAS.cc    |  2 +-
 src/ui/UASInfo.ui | 65 +++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index 2123f6b429..9e504be6e8 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -171,7 +171,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
                     emit modeChanged(this->getUASID(), mode, "");
                     modeAudio = " is now in " + mode;
                 }
-                currentVoltage = state.vbat;
+                currentVoltage = state.vbat/1000.0f;
                 lpVoltage = filterVoltage(currentVoltage);
                 if (startVoltage == 0) startVoltage = currentVoltage;
                 timeRemaining = calculateTimeRemaining();
diff --git a/src/ui/UASInfo.ui b/src/ui/UASInfo.ui
index a1ff996b16..9c7fb89a3e 100644
--- a/src/ui/UASInfo.ui
+++ b/src/ui/UASInfo.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>462</width>
-    <height>189</height>
+    <width>455</width>
+    <height>220</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -66,7 +66,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="4">
+   <item row="0" column="4" colspan="4">
     <widget class="QProgressBar" name="batteryBar">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -109,7 +109,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="5" rowspan="4">
+   <item row="0" column="8" rowspan="6">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -171,7 +171,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="4">
+   <item row="1" column="4" colspan="4">
     <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">
+   <item row="2" column="4" colspan="4">
     <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">
+   <item row="3" column="4" colspan="4">
     <widget class="QProgressBar" name="loadBar">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -380,7 +380,56 @@
      </property>
     </widget>
    </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">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
-- 
GitLab