From bb5418a17ddef27d947070d2264b339e1f8a1af5 Mon Sep 17 00:00:00 2001
From: pixhawk <pixhawk@student.ethz.ch>
Date: Wed, 14 Jul 2010 07:11:31 +0200
Subject: [PATCH] Fixed compile errors and warnings

---
 src/uas/PxQuadMAV.cc                   |  4 ----
 src/ui/HSIDisplay.cc                   | 12 +++++++++---
 src/ui/watchdog/WatchdogProcessView.cc |  1 +
 src/ui/watchdog/WatchdogProcessView.h  |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/uas/PxQuadMAV.cc b/src/uas/PxQuadMAV.cc
index 695561b..bd83d2a 100644
--- a/src/uas/PxQuadMAV.cc
+++ b/src/uas/PxQuadMAV.cc
@@ -104,10 +104,6 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 emit valueChanged(uasId, "vis. x", pos.x, time);
                 emit valueChanged(uasId, "vis. y", pos.y, time);
                 emit valueChanged(uasId, "vis. z", pos.z, time);
-                emit valueChanged(uasId, "vis. vx", pos.vx, time);
-                emit valueChanged(uasId, "vis. vy", pos.vy, time);
-                emit valueChanged(uasId, "vis. vz", pos.vz, time);
-                emit valueChanged(uasId, "vis. vyaw", pos.vyaw, time);
             }
             break;
     case MAVLINK_MSG_ID_AUX_STATUS:
diff --git a/src/ui/HSIDisplay.cc b/src/ui/HSIDisplay.cc
index 913b913..b025feb 100644
--- a/src/ui/HSIDisplay.cc
+++ b/src/ui/HSIDisplay.cc
@@ -119,7 +119,7 @@ void HSIDisplay::paintDisplay()
     float bottomMargin = 3.0f;
 
     // Size of the ring instrument
-    const float margin = 0.1f;  // 10% margin of total width on each side
+    //const float margin = 0.1f;  // 10% margin of total width on each side
     float baseRadius = (vheight - topMargin - bottomMargin) / 2.0f - bottomMargin / 2.0f;
 
     // Draw instruments
@@ -294,6 +294,7 @@ void HSIDisplay::drawPositionLock(float x, float y, QString label, int status, Q
 
 void HSIDisplay::updatePositionLock(UASInterface* uas, bool lock)
 {
+    Q_UNUSED(uas);
     positionLock = lock;
 }
 
@@ -876,12 +877,17 @@ void visionLocalizationChanged(UASInterface* uas, int fix);
 
 void HSIDisplay::updateJoystick(double roll, double pitch, double yaw, double thrust, int xHat, int yHat)
 {
-
+    Q_UNUSED(roll);
+    Q_UNUSED(pitch);
+    Q_UNUSED(yaw);
+    Q_UNUSED(thrust);
+    Q_UNUSED(xHat);
+    Q_UNUSED(yHat);
 }
 
 void HSIDisplay::pressKey(int key)
 {
-
+    Q_UNUSED(key);
 }
 
 
diff --git a/src/ui/watchdog/WatchdogProcessView.cc b/src/ui/watchdog/WatchdogProcessView.cc
index 1a65ac6..f1fccbd 100644
--- a/src/ui/watchdog/WatchdogProcessView.cc
+++ b/src/ui/watchdog/WatchdogProcessView.cc
@@ -3,6 +3,7 @@
 
 WatchdogProcessView::WatchdogProcessView(int processid, QWidget *parent) :
     QWidget(parent),
+    processid(processid),
     m_ui(new Ui::WatchdogProcessView)
 {
     m_ui->setupUi(this);
diff --git a/src/ui/watchdog/WatchdogProcessView.h b/src/ui/watchdog/WatchdogProcessView.h
index fa014b3..59a7d89 100644
--- a/src/ui/watchdog/WatchdogProcessView.h
+++ b/src/ui/watchdog/WatchdogProcessView.h
@@ -16,6 +16,7 @@ public:
 
 protected:
     void changeEvent(QEvent *e);
+    int processid;
 
 private:
     Ui::WatchdogProcessView *m_ui;