Major MAVLink cleanup

qgroundcontrol.pro

@@ -200,7 +200,8 @@ HEADERS += src/MG.h \
     src/ui/map3D/TextureCache.h \
     src/ui/map3D/WebImage.h \
     src/ui/map3D/WebImageCache.h \
-    src/ui/map3D/Imagery.h
+    src/ui/map3D/Imagery.h \
+    src/comm/QGCMAVlink.h
 SOURCES += src/main.cc \
     src/Core.cc \
     src/uas/UASManager.cc \

src/comm/MAVLinkLightProtocol.h

@@ -2,7 +2,7 @@
 
 QGroundControl Open Source Ground Control Station
 
-(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+(c) 2009 - 2011 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
 
 This file is part of the QGROUNDCONTROL project
 

src/comm/MAVLinkProtocol.cc

@@ -45,7 +45,7 @@ This file is part of the QGROUNDCONTROL project
 #include "ArduPilotMAV.h"
 #include "configuration.h"
 #include "LinkManager.h"
-#include <mavlink.h>
+#include <QGCMAVLink.h>
 #include "QGC.h"
 
 /**

src/comm/MAVLinkProtocol.h

@@ -40,7 +40,7 @@ This file is part of the QGROUNDCONTROL project
 #include "ProtocolInterface.h"
 #include "LinkInterface.h"
 #include "protocol.h"
-#include "mavlink.h"
+#include "QGCMAVlink.h"
 
 /**
  * @brief MAVLink micro air vehicle protocol reference implementation.

src/comm/MAVLinkSimulationLink.cc

@@ -41,7 +41,7 @@ This file is part of the QGROUNDCONTROL project
 #include "MAVLinkProtocol.h"
 #include "MAVLinkSimulationLink.h"
 // MAVLINK includes
-#include <mavlink.h>
+#include <QGCMAVLink.h>
 #include "QGC.h"
 
 /**

src/comm/MAVLinkSimulationLink.h

@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QMutex>
 #include <QMap>
 #include <inttypes.h>
-#include <mavlink.h>
+#include "QGCMAVLink.h"
 
 #include "LinkInterface.h"
 

src/comm/OpalLink.h

@@ -43,8 +43,7 @@ This file is part of the QGROUNDCONTROL project
 #include "LinkInterface.h"
 #include "LinkManager.h"
 #include "MG.h"
-#include "mavlink.h"
-#include "mavlink_types.h"
+#include "QGCMAVLink.h"
 #include "configuration.h"
 #include "OpalRT.h"
 #include "ParameterList.h"

src/comm/QGCMAVlink.h

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009 - 2011 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+/**
+ * @file
+ *   @brief MAVLink header file for QGroundControl
+ *   @author Lorenz Meier <pixhawk@switched.com>
+ */
+
+#ifndef QGCMAVLINK_H
+#define QGCMAVLINK_H
+
+#include <mavlink_types.h>
+
+#ifdef QGC_USE_PIXHAWK_MESSAGES
+#include <pixhawk.h>
+#endif
+
+#ifdef QGC_USE_SLUGS_MESSAGES
+#include <slugs.h>
+#endif
+
+#ifdef QGC_USE_UALBERTA_MESSAGES
+#include <ualberta.h>
+#endif
+
+#ifdef QGC_USE_ARDUPILOT_MESSAGES
+#include <ardupilot.h>
+#endif
+
+#endif // QGCMAVLINK_H

src/comm/QGCParamID.h

@@ -2,7 +2,7 @@
 
 QGroundControl Open Source Ground Control Station
 
-(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+(c) 2009 - 2011 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
 
 This file is part of the QGROUNDCONTROL project
 

src/comm/SerialLink.h

 /*=====================================================================
- 
-PIXHAWK Micro Air Vehicle Flying Robotics Toolkit
- 
-(c) 2009 PIXHAWK PROJECT  <http://pixhawk.ethz.ch>
- 
-This file is part of the PIXHAWK project
- 
-    PIXHAWK is free software: you can redistribute it and/or modify
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009 - 2011 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
- 
-    PIXHAWK is distributed in the hope that it will be useful,
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
- 
+
     You should have received a copy of the GNU General Public License
-    along with PIXHAWK. If not, see <http://www.gnu.org/licenses/>.
- 
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
 ======================================================================*/
  
 /**

src/comm/SerialLinkInterface.h

 /*=====================================================================
- 
-PIXHAWK Micro Air Vehicle Flying Robotics Toolkit
- 
-(c) 2009 PIXHAWK PROJECT  <http://pixhawk.ethz.ch>
- 
-This file is part of the PIXHAWK project
- 
-    PIXHAWK is free software: you can redistribute it and/or modify
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009 - 2011 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
- 
-    PIXHAWK is distributed in the hope that it will be useful,
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
- 
+
     You should have received a copy of the GNU General Public License
-    along with PIXHAWK. If not, see <http://www.gnu.org/licenses/>.
- 
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
 ======================================================================*/
  
 /**

src/comm/SerialSimulationLink.h

 /*=====================================================================
- 
-PIXHAWK Micro Air Vehicle Flying Robotics Toolkit
- 
-(c) 2009 PIXHAWK PROJECT  <http://pixhawk.ethz.ch>
- 
-This file is part of the PIXHAWK project
- 
-    PIXHAWK is free software: you can redistribute it and/or modify
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009 - 2011 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
- 
-    PIXHAWK is distributed in the hope that it will be useful,
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
- 
+
     You should have received a copy of the GNU General Public License
-    along with PIXHAWK. If not, see <http://www.gnu.org/licenses/>.
- 
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
 ======================================================================*/
  
 /**

src/comm/UDPLink.h

 /*=====================================================================
 
-PIXHAWK Micro Air Vehicle Flying Robotics Toolkit
+QGroundControl Open Source Ground Control Station
 
-(c) 2009 PIXHAWK PROJECT  <http://pixhawk.ethz.ch>
+(c) 2009 - 2011 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
 
-This file is part of the PIXHAWK project
+This file is part of the QGROUNDCONTROL project
 
-    PIXHAWK is free software: you can redistribute it and/or modify
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    PIXHAWK is distributed in the hope that it will be useful,
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with PIXHAWK. If not, see <http://www.gnu.org/licenses/>.
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
 
 ======================================================================*/
 

src/uas/UAS.cc

@@ -42,7 +42,7 @@ This file is part of the QGROUNDCONTROL project
 #include "QGC.h"
 #include "GAudioOutput.h"
 #include "MAVLinkProtocol.h"
-#include <mavlink.h>
+#include "QGCMAVLink.h"
 
 UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(),
         uasId(id),

src/uas/UAS.h

@@ -35,7 +35,7 @@ This file is part of the QGROUNDCONTROL project
 #include "UASInterface.h"
 #include "MG.h"
 #include <MAVLinkProtocol.h>
-#include <mavlink.h>
+#include "QGCMAVLink.h"
 
 /**
  * @brief A generic MAVLINK-connected MAV/UAV

src/uas/UASWaypointManager.h

@@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QVector>
 #include <QTimer>
 #include "Waypoint.h"
-#include <mavlink.h>
+#include "QGCMAVLink.h"
 class UAS;
 
 /**

src/ui/map3D/QMap3DWidget.cc

@@ -273,7 +273,6 @@ QMap3DWidget::displayHandler(void)
               5,
               &painter);
     painter.end();
-    repaint();
 }
 
 void QMap3DWidget::drawWaypoints(void) const

src/ui/uas/UASControlWidget.cc

@@ -41,7 +41,6 @@ This file is part of the PIXHAWK project
 #include "UASControlWidget.h"
 #include <UASManager.h>
 #include <UAS.h>
-//#include <mavlink.h>
 
 #define CONTROL_MODE_LOCKED "MODE LOCKED"
 #define CONTROL_MODE_MANUAL "MODE MANUAL"

user_config.pri.dist

@@ -27,7 +27,18 @@
 # Several message sets can be also enabled in parallel, as long as function names
 # and message ids do not conflict.
 
-INCLUDEPATH += $$BASEDIR/../mavlink/include/pixhawk
-#INCLUDEPATH += $$BASEDIR/../mavlink/include/slugs
-#INCLUDEPATH += $$BASEDIR/../mavlink/include/ualberta
+# Remove the default set - it is included anyway
 INCLUDEPATH -= $$BASEDIR/../mavlink/include/common
+
+# PIXHAWK SPECIAL MESSAGES
+INCLUDEPATH += $$BASEDIR/../mavlink/include/pixhawk
+DEFINES += QGC_USE_PIXHAWK_MESSAGES
+
+# SLUGS SPECIAL MESSAGES
+INCLUDEPATH += $$BASEDIR/../mavlink/include/slugs
+DEFINES += QGC_USE_SLUGS_MESSAGES
+
+# UALBERTA SPECIAL MESSAGES
+INCLUDEPATH += $$BASEDIR/../mavlink/include/ualberta
+DEFINES += QGC_USE_UALBERTA_MESSAGES
+