From 78f5f68a04efefafb5bde3a22d92ed290bc9fc29 Mon Sep 17 00:00:00 2001
From: pixhawk <mavteam@student.ethz.ch>
Date: Mon, 30 Aug 2010 19:10:49 +0200
Subject: [PATCH] MODES fixed

---
 src/uas/PxQuadMAV.cc           |  1 -
 src/ui/QGCParamWidget.cc       |  5 +----
 src/ui/uas/UASControlWidget.cc | 14 +++++++-------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/uas/PxQuadMAV.cc b/src/uas/PxQuadMAV.cc
index 422244c..5e67351 100644
--- a/src/uas/PxQuadMAV.cc
+++ b/src/uas/PxQuadMAV.cc
@@ -139,7 +139,6 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 emit errCountChanged(uasId, "IMU", "SPI0", status.spi0_err_count);
                 emit errCountChanged(uasId, "IMU", "SPI1", status.spi1_err_count);
                 emit errCountChanged(uasId, "IMU", "UART", status.uart_total_err_count);
-                qDebug() << "System Load:" << status.load;
                 emit UAS::valueChanged(this, "Load", ((float)status.load)/1000.0f, MG::TIME::getGroundTimeNow());
             }
             break;
diff --git a/src/ui/QGCParamWidget.cc b/src/ui/QGCParamWidget.cc
index f46be42..ef4ad51 100644
--- a/src/ui/QGCParamWidget.cc
+++ b/src/ui/QGCParamWidget.cc
@@ -2,9 +2,7 @@
 
 QGroundControl Open Source Ground Control Station
 
-(c) 2009, 2010 QGROUNDCONTROL/PIXHAWK PROJECT
-<http://www.qgroundcontrol.org>
-<http://pixhawk.ethz.ch>
+(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
 
 This file is part of the QGROUNDCONTROL project
 
@@ -22,7 +20,6 @@ This file is part of the QGROUNDCONTROL project
     along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
 
 ======================================================================*/
-
 /**
  * @file
  *   @brief Implementation of class QGCParamWidget
diff --git a/src/ui/uas/UASControlWidget.cc b/src/ui/uas/UASControlWidget.cc
index c01fbed..22fd7b5 100644
--- a/src/ui/uas/UASControlWidget.cc
+++ b/src/ui/uas/UASControlWidget.cc
@@ -51,13 +51,13 @@ This file is part of the PIXHAWK project
 #define CONTROL_MODE_TEST2  "MODE TEST2"
 #define CONTROL_MODE_TEST3  "MODE TEST3"
 
-#define CONTROL_MODE_LOCKED_INDEX 2
-#define CONTROL_MODE_MANUAL_INDEX 3
-#define CONTROL_MODE_GUIDED_INDEX 4
-#define CONTROL_MODE_AUTO_INDEX   5
-#define CONTROL_MODE_TEST1_INDEX  6
-#define CONTROL_MODE_TEST2_INDEX  7
-#define CONTROL_MODE_TEST3_INDEX  8
+#define CONTROL_MODE_LOCKED_INDEX 1
+#define CONTROL_MODE_MANUAL_INDEX 2
+#define CONTROL_MODE_GUIDED_INDEX 3
+#define CONTROL_MODE_AUTO_INDEX   4
+#define CONTROL_MODE_TEST1_INDEX  5
+#define CONTROL_MODE_TEST2_INDEX  6
+#define CONTROL_MODE_TEST3_INDEX  7
 
 UASControlWidget::UASControlWidget(QWidget *parent) : QWidget(parent),
 uas(0),