Merge branch 'master' of git@pixhawk.ethz.ch:groundcontrol

qgroundcontrol.pri

@@ -97,6 +97,7 @@ linux-g++ {
         DESTDIR = $$BASEDIR
     }
     INCLUDEPATH += /usr/include \
+                   /usr/include/qt4/phonon
               # $$BASEDIR/lib/flite/include \
               # $$BASEDIR/lib/flite/lang
 

src/GAudioOutput.h

@@ -40,10 +40,12 @@ This file is part of the PIXHAWK project
 #endif
 #ifdef Q_OS_LINUX
 //#include <flite/flite.h>
-#include <phonon>
+#include <Phonon/MediaObject>
+#include <Phonon/AudioOutput>
 #endif
 #ifdef Q_OS_WIN
-#include <Phonon>
+#include <Phonon/MediaObject>
+#include <Phonon/AudioOutput>
 #endif
 
 /* For Snow leopard and later

src/uas/UAS.h

@@ -86,6 +86,7 @@ protected:
     CommStatus commStatus;        ///< Communication status
     QString name;                 ///< Human-friendly name of the vehicle, e.g. bravo
     QList<LinkInterface*>* links; ///< List of links this UAS can be reached by
+        QList<int> unknownPackets;  ///< Packet IDs which are unknown and have been received
     MAVLinkProtocol* mavlink;     ///< Reference to the MAVLink instance
     BatteryType batteryType;      ///< The battery type
     int cells;                    ///< Number of cells
@@ -95,7 +96,6 @@ protected:
 
     QList<double> motorValues;
     QList<QString> motorNames;
-    QList<int> unknownPackets;  ///< Packet IDs which are unknown and have been received
 
     double thrustSum;           ///< Sum of forward/up thrust of all thrust actuators, in Newtons
     double thrustMax;           ///< Maximum forward/up thrust of this vehicle, in Newtons

src/ui/ParameterInterface.cc

@@ -15,6 +15,9 @@ ParameterInterface::ParameterInterface(QWidget *parent) :
         m_ui(new Ui::parameterWidget)
 {
     m_ui->setupUi(this);
+    // Make sure the combo box is empty
+    // because else indices get messed up
+    m_ui->vehicleComboBox->clear();
 
     // Setup UI connections
     connect(m_ui->vehicleComboBox, SIGNAL(activated(int)), this, SLOT(selectUAS(int)));
@@ -54,7 +57,7 @@ void ParameterInterface::addUAS(UASInterface* uas)
     // Set widgets as default
     if (curr == -1)
     {
-        m_ui->sensorSettings->setCurrentWidget(param);
+        m_ui->sensorSettings->setCurrentWidget(sensor);
         m_ui->stackedWidget->setCurrentWidget(param);
         curr = uas->getUASID();
     }

src/ui/QGCSensorSettingsWidget.ui

@@ -14,6 +14,9 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_4">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">