diff --git a/qgcunittest.pro b/qgcunittest.pro index 5a648a4647bb4583a89f2dc6a24404b864b308d2..ca3326926e6e291b6a1ae67f21d68123e2d46d93 100644 --- a/qgcunittest.pro +++ b/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 \ diff --git a/src/comm/QGCMAVLink.h b/src/comm/QGCMAVLink.h index ac2249e3c34908b7d95455d0a9bfd73e453d9d82..e47c067225a200daafe1894db946bea6843fa06e 100644 --- a/src/comm/QGCMAVLink.h +++ b/src/comm/QGCMAVLink.h @@ -30,8 +30,8 @@ This file is part of the QGROUNDCONTROL project #ifndef QGCMAVLINK_H #define QGCMAVLINK_H -#include -#include +#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) diff --git a/src/uas/SlugsMAV.h b/src/uas/SlugsMAV.h index d3e7ae8c79478f71ecd68aa5a3ffc52340c1bff7..510c59a7d464b0fce8854d46f975db47cf67dc08 100644 --- a/src/uas/SlugsMAV.h +++ b/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 #define SLUGS_UPDATE_RATE 200 // in ms diff --git a/src/uas/UASWaypointManager.cc b/src/uas/UASWaypointManager.cc index a173b3ec02238f3daa50a12d8530e3489d3d446e..e3179bee9cc599cd2d19f0aea0327ef60d493885 100644 --- a/src/uas/UASWaypointManager.cc +++ b/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 diff --git a/src/uas/senseSoarMAV.h b/src/uas/senseSoarMAV.h index 78434f16167f8d6d697a0974b80fdf5a852d87bb..01930d370ca62f1d6ddb6aba2e87144b62e85783 100644 --- a/src/uas/senseSoarMAV.h +++ b/src/uas/senseSoarMAV.h @@ -4,7 +4,7 @@ #include "UAS.h" -#include "mavlink.h" +#include "../../mavlink/include/mavlink/v1.0/common/mavlink.h" #include @@ -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_ diff --git a/src/ui/DebugConsole.cc b/src/ui/DebugConsole.cc index 471c0bd9a0853aa8862116dcb63722cd9f5f7c12..da0b8881d919044c825323bde1299fa1a21b9e37 100644 --- a/src/ui/DebugConsole.cc +++ b/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 diff --git a/src/ui/RadioCalibration/RadioCalibrationWindow.h b/src/ui/RadioCalibration/RadioCalibrationWindow.h index ebd6a94c9b64046a96c2737931a7d454afc890bc..855540132b97aeb115e709c0b4ddd18ee23117c8 100644 --- a/src/ui/RadioCalibration/RadioCalibrationWindow.h +++ b/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" diff --git a/src/ui/SlugsDataSensorView.h b/src/ui/SlugsDataSensorView.h index 628f6e29c756c43ca885155e4cbca6b752a451db..999b0b814db2c3074728c9f7065c4bf4e25492ed 100644 --- a/src/ui/SlugsDataSensorView.h +++ b/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 diff --git a/src/ui/WaypointEditableView.cc b/src/ui/WaypointEditableView.cc index e0d4d456557be769f0bfbe93d174bbe643ffbbcd..b0b0934cad3bdcd56324892fb298a0b48862570d 100644 --- a/src/ui/WaypointEditableView.cc +++ b/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) :