Updated to MAVLink 1.0.6 release.

mavlink/VERSION

@@ -1 +0,0 @@
-1.0.5

mavlink/include/mavlink/config.h

@@ -1 +0,0 @@
-#define MAVLINK_VERSION "1.0.5"

mavlink/lib/pkgconfig/mavlink.pc

@@ -1,7 +0,0 @@
-prefix=/usr/local
-exec_prefix=/usr/local
-
-Name: mavlink
-Description: 
-Version: 
-Cflags: -I/usr/local/include/mavlink

qgroundcontrol.pro

@@ -51,7 +51,7 @@ MOC_DIR = $${BUILDDIR}/moc
 UI_DIR = $${BUILDDIR}/ui
 RCC_DIR = $${BUILDDIR}/rcc
 MAVLINK_CONF = ""
-MAVLINKPATH = $$BASEDIR/mavlink/include/v1.0
+MAVLINKPATH = $$BASEDIR/thirdParty/mavlink/include/mavlink/v1.0
 DEFINES += MAVLINK_NO_DATA
 
 win32 {

thirdParty/fetchUpstream

@@ -1,6 +1,6 @@
 #!/bin/bash
 QSERIAL_TAG=004e3de552fe25fee593dfcb03e2ffa82cb0b152
-MAVLINK_VERSION=1.0.0
+MAVLINK_VERSION=1.0.6
 
 libList="mavlink qserialport"
 
@@ -30,13 +30,14 @@ function processLib
             fetch_git qserialport git://gitorious.org/inbiza-labs/qserialport.git master $QSERIAL_TAG
 			;;
 		"mavlink") 
-            rm -rf mavlink
+            cd $topDir/mavlink
-            mavlinkName=mavlink-$MAVLINK_VERSION-Linux
+            rm -rf  VERSION mavlink* include lib share *.zip
-            wget https://github.com/downloads/mavlink/mavlink/$mavlinkName.tar.gz
+            wget https://github.com/downloads/mavlink/mavlink/mavlink-${MAVLINK_VERSION}.zip
-            tar -xzvf $mavlinkName.tar.gz
+            unzip mavlink-${MAVLINK_VERSION}.zip
-            mv  $mavlinkName/usr/local/include/mavlink mavlink
+            mv mavlink-${MAVLINK_VERSION}/* .
-            rm -rf $mavlinkName
+            rm -rf  mavlink*
-            rm -rf $mavlinkName.tar.gz
+            echo $MAVLINK_VERSION > VERSION
+            cd $topDir
 			;;
 		"all")
             for lib in $libList
@@ -52,6 +53,7 @@ function processLib
 			echo unknown lib, possiblities are: $libList
 			exit 1
 	esac
+    REPLY=
 }
 
 

thirdParty/mavlink/VERSION

@@ -0,0 +1 @@
+1.0.6

thirdParty/mavlink/include/mavlink/config.h

@@ -0,0 +1 @@
+#define MAVLINK_VERSION "1.0.6"

thirdParty/mavlink/include/mavlink/v0.9/ardupilotmega/version.h

@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Thu Apr 19 14:23:28 2012"
+#define MAVLINK_BUILD_DATE "Thu Apr 19 15:39:52 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101