Merge branch 'experimental' of 128.168.1.167:/malife/qgroundcontrol into experimental

src/comm/MAVLinkSimulationLink.cc

@@ -559,14 +559,14 @@ void MAVLinkSimulationLink::mainloop()
 
 
         // Send controller states
-        uint8_t attControl = 1;
+//        uint8_t attControl = 1;
-        uint8_t posXYControl = 1;
+//        uint8_t posXYControl = 1;
-        uint8_t posZControl = 0;
+//        uint8_t posZControl = 0;
-        uint8_t posYawControl = 1;
+//        uint8_t posYawControl = 1;
 
         uint8_t gpsLock = 2;
         uint8_t visLock = 3;
-        uint8_t posLock = qMax(gpsLock, visLock);
+        //uint8_t posLock = qMax(gpsLock, visLock);
 
         #ifdef MAVLINK_ENABLED_PIXHAWK
         messageSize = mavlink_msg_control_status_pack(systemId, componentId, &msg, posLock, visLock, gpsLock, attControl, posXYControl, posZControl, posYawControl);

src/uas/PxQuadMAV.cc

@@ -168,5 +168,9 @@ void PxQuadMAV::sendProcessCommand(int watchdogId, int processId, unsigned int c
     mavlink_message_t msg;
     mavlink_msg_watchdog_command_encode(mavlink->getSystemId(), mavlink->getComponentId(), &msg, &payload);
     sendMessage(msg);
+#else
+    Q_UNUSED(watchdogId);
+    Q_UNUSED(processId);
+    Q_UNUSED(command);
 #endif
 }

src/ui/linechart/LinechartWidget.cc

@@ -352,8 +352,6 @@ QWidget* LinechartWidget::createCurveItem(QString curve)
     QLabel* label;
     QLabel* value;
     QLabel* mean;
-    QLabel* median;
-
     form->setAutoFillBackground(false);
     horizontalLayout = new QHBoxLayout(form);
     horizontalLayout->setSpacing(5);

src/ui/map3D/QOSGWidget.h

@@ -123,7 +123,7 @@ public:
         getCamera()->setGraphicsContext(getGraphicsWindow());
     }
 
-    virtual void paintEvent( QPaintEvent * event ) { frame(); }
+    virtual void paintEvent( QPaintEvent * event ) { Q_UNUSED(event); frame(); }
 
 protected: