qgcunittest.pro now compiles and runs as long as run in terminal in...

qgcunittest.pro now compiles and runs as long as run in terminal in projcts->Run Settings is unchecked.

qgcunittest.pro

@@ -233,14 +233,21 @@ FORMS += src/ui/MainWindow.ui \
     src/ui/designer/QGCCommandButton.ui \
     src/ui/QGCMAVLinkLogPlayer.ui \
     src/ui/QGCWaypointListMulti.ui \
-    src/ui/mission/QGCCustomWaypointAction.ui \
     src/ui/QGCUDPLinkConfiguration.ui \
     src/ui/QGCSettingsWidget.ui \
     src/ui/UASControlParameters.ui \
-    src/ui/mission/QGCMissionDoWidget.ui \
-    src/ui/mission/QGCMissionConditionWidget.ui \
     src/ui/map/QGCMapTool.ui \
     src/ui/map/QGCMapToolBar.ui \
+    src/ui/mission/QGCMissionOther.ui \
+    src/ui/mission/QGCMissionConditionDelay.ui \
+    src/ui/mission/QGCMissionDoJump.ui \
+    src/ui/mission/QGCMissionNavReturnToLaunch.ui \
+    src/ui/mission/QGCMissionNavLoiterUnlim.ui \
+    src/ui/mission/QGCMissionNavLoiterTurns.ui \
+    src/ui/mission/QGCMissionNavTakeoff.ui \
+    src/ui/mission/QGCMissionNavLand.ui \
+    src/ui/mission/QGCMissionNavWaypoint.ui \
+    src/ui/mission/QGCMissionNavLoiterTime.ui \
     src/ui/QGCMAVLinkInspector.ui \
     src/ui/WaypointViewOnlyView.ui \    
     src/ui/WaypointEditableView.ui \    
@@ -330,6 +337,7 @@ HEADERS += src/MG.h \
     src/comm/QGCMAVLink.h \
     src/ui/QGCWebView.h \
     src/ui/map3D/QGCWebPage.h \
+    src/ui/map3D/PixhawkCheetahNode.cc \
     src/ui/SlugsDataSensorView.h \
     src/ui/SlugsHilSim.h \
     src/ui/SlugsPadCameraControl.h \
@@ -348,14 +356,22 @@ HEADERS += src/MG.h \
     src/ui/QGCUDPLinkConfiguration.h \
     src/ui/QGCSettingsWidget.h \
     src/ui/uas/UASControlParameters.h \
-    src/ui/mission/QGCMissionDoWidget.h \
-    src/ui/mission/QGCMissionConditionWidget.h \
     src/uas/QGCUASParamManager.h \
     src/ui/map/QGCMapWidget.h \
     src/ui/map/MAV2DIcon.h \
     src/ui/map/Waypoint2DIcon.h \
     src/ui/map/QGCMapTool.h \
     src/ui/map/QGCMapToolBar.h \
+    src/ui/mission/QGCMissionOther.h \
+    src/ui/mission/QGCMissionConditionDelay.h \
+    src/ui/mission/QGCMissionDoJump.h \
+    src/ui/mission/QGCMissionNavReturnToLaunch.h \
+    src/ui/mission/QGCMissionNavLoiterUnlim.h \
+    src/ui/mission/QGCMissionNavLoiterTurns.h \
+    src/ui/mission/QGCMissionNavTakeoff.h \
+    src/ui/mission/QGCMissionNavLand.h \
+    src/ui/mission/QGCMissionNavWaypoint.h \
+    src/ui/mission/QGCMissionNavLoiterTime.h \
     src/libs/qextserialport/qextserialenumerator.h \
     src/QGCGeo.h \
     src/ui/QGCToolBar.h \
@@ -497,14 +513,22 @@ SOURCES += src/QGCCore.cc \
     src/ui/QGCUDPLinkConfiguration.cc \
     src/ui/QGCSettingsWidget.cc \
     src/ui/uas/UASControlParameters.cpp \
-    src/ui/mission/QGCMissionDoWidget.cc \
-    src/ui/mission/QGCMissionConditionWidget.cc \
     src/uas/QGCUASParamManager.cc \
     src/ui/map/QGCMapWidget.cc \
     src/ui/map/MAV2DIcon.cc \
     src/ui/map/Waypoint2DIcon.cc \
     src/ui/map/QGCMapTool.cc \
     src/ui/map/QGCMapToolBar.cc \
+    src/ui/mission/QGCMissionOther.cc \
+    src/ui/mission/QGCMissionConditionDelay.cc \
+    src/ui/mission/QGCMissionDoJump.cc \
+    src/ui/mission/QGCMissionNavReturnToLaunch.cc \
+    src/ui/mission/QGCMissionNavLoiterUnlim.cc \
+    src/ui/mission/QGCMissionNavLoiterTurns.cc \
+    src/ui/mission/QGCMissionNavTakeoff.cc \
+    src/ui/mission/QGCMissionNavLand.cc \
+    src/ui/mission/QGCMissionNavWaypoint.cc \
+    src/ui/mission/QGCMissionNavLoiterTime.cc \
     src/ui/QGCToolBar.cc \
     src/ui/QGCMAVLinkInspector.cc \
     src/ui/MAVLinkDecoder.cc \
@@ -537,7 +561,7 @@ contains(DEPENDENCIES_PRESENT, osg) {
         src/ui/map3D/Q3DWidget.cc \
         src/ui/map3D/ImageWindowGeode.cc \
         src/ui/map3D/GCManipulator.cc \
-        src/ui/map3D/PixhawkCheetahGeode.cc \
+        src/ui/map3D/PixhawkCheetahNode.cc \
         src/ui/map3D/Pixhawk3DWidget.cc \
         src/ui/map3D/Q3DWidgetFactory.cc \
         src/ui/map3D/WebImageCache.cc \

src/comm/QGCMAVLink.h

@@ -30,8 +30,8 @@ This file is part of the QGROUNDCONTROL project
 #ifndef QGCMAVLINK_H
 #define QGCMAVLINK_H
 
-#include <mavlink_types.h>
-#include <mavlink.h>
+#include <../../mavlink/include/mavlink/v1.0/mavlink_types.h>
+#include <../../mavlink/include/mavlink/v1.0/common/mavlink.h>
 
 #ifdef MAVLINK_CONF
 #define MY_MACRO(x) <x>

src/uas/SlugsMAV.h

@@ -25,7 +25,7 @@ This file is part of the QGROUNDCONTROL project
 #define SLUGSMAV_H
 
 #include "UAS.h"
-#include "mavlink.h"
+#include "../../mavlink/include/mavlink/v1.0/common/mavlink.h"
 #include <QTimer>
 
 #define SLUGS_UPDATE_RATE   200   // in ms

src/uas/UASWaypointManager.cc

@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
 
 #include "UASWaypointManager.h"
 #include "UAS.h"
-#include "mavlink_types.h"
+#include "../../mavlink/include/mavlink/v1.0/mavlink_types.h"
 
 #define PROTOCOL_TIMEOUT_MS 2000    ///< maximum time to wait for pending messages until timeout
 #define PROTOCOL_DELAY_MS 20        ///< minimum delay between sent messages

src/uas/senseSoarMAV.h

@@ -4,7 +4,7 @@
 
 
 #include "UAS.h"
-#include "mavlink.h"
+#include "../../mavlink/include/mavlink/v1.0/common/mavlink.h"
 #include <QTimer>
 
 
@@ -26,4 +26,4 @@ private:
 	void quat2euler(const double *quat, double &roll, double &pitch, double &yaw); 
 };
 
-#endif // _SENSESOARMAV_H_
\ No newline at end of file
+#endif // _SENSESOARMAV_H_

src/ui/DebugConsole.cc

@@ -35,7 +35,7 @@ This file is part of the QGROUNDCONTROL project
 #include "ui_DebugConsole.h"
 #include "LinkManager.h"
 #include "UASManager.h"
-#include "protocol.h"
+#include "../../mavlink/include/mavlink/v1.0/protocol.h"
 #include "QGC.h"
 
 #include <QDebug>

src/ui/RadioCalibration/RadioCalibrationWindow.h

@@ -50,8 +50,8 @@ This file is part of the QGROUNDCONTROL project
 #include "SwitchCalibrator.h"
 #include "CurveCalibrator.h"
 
-#include "mavlink.h"
-#include "mavlink_types.h"
+#include "../../../mavlink/include/mavlink/v1.0/common/mavlink.h"
+#include "../../../mavlink/include/mavlink/v1.0/mavlink_types.h"
 #include "UAS.h"
 #include "UASManager.h"
 #include "RadioCalibrationData.h"

src/ui/SlugsDataSensorView.h

@@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project
 
 #include "UASInterface.h"
 #include "SlugsMAV.h"
-#include "mavlink.h"
+#include "../../mavlink/include/mavlink/v1.0/common/mavlink.h"
 
 
 namespace Ui

src/ui/WaypointEditableView.cc

@@ -21,19 +21,19 @@
 #include "ui_WaypointEditableView.h"
 
 
-#include "QGCMissionNavWaypoint.h"
-#include "QGCMissionNavLoiterUnlim.h"
-#include "QGCMissionNavLoiterTurns.h"
-#include "QGCMissionNavLoiterTime.h"
-#include "QGCMissionNavReturnToLaunch.h"
-#include "QGCMissionNavLand.h"
-#include "QGCMissionNavTakeoff.h"
-#include "QGCMissionNavSweep.h"
-#include "QGCMissionConditionDelay.h"
-#include "QGCMissionDoJump.h"
-#include "QGCMissionDoStartSearch.h"
-#include "QGCMissionDoFinishSearch.h"
-#include "QGCMissionOther.h"
+#include "mission/QGCMissionNavWaypoint.h"
+#include "mission/QGCMissionNavLoiterUnlim.h"
+#include "mission/QGCMissionNavLoiterTurns.h"
+#include "mission/QGCMissionNavLoiterTime.h"
+#include "mission/QGCMissionNavReturnToLaunch.h"
+#include "mission/QGCMissionNavLand.h"
+#include "mission/QGCMissionNavTakeoff.h"
+#include "mission/QGCMissionNavSweep.h"
+#include "mission/QGCMissionConditionDelay.h"
+#include "mission/QGCMissionDoJump.h"
+#include "mission/QGCMissionDoStartSearch.h"
+#include "mission/QGCMissionDoFinishSearch.h"
+#include "mission/QGCMissionOther.h"
 
 
 WaypointEditableView::WaypointEditableView(Waypoint* wp, QWidget* parent) :