Merge branch 'master' into airspeed_test_fix

Tools/check_submodules.sh

@@ -2,12 +2,19 @@
 
 if [ -d NuttX/nuttx ];
 	then
-	STATUSRETVAL=$(git status --porcelain | grep -i "NuttX")
+	STATUSRETVAL=$(git submodule summary | grep -A20 -i "NuttX" | grep "<")
 	if [ -z "$STATUSRETVAL" ]; then
 		echo "Checked NuttX submodule, correct version found"
 	else
-		echo "NuttX sub repo not at correct version. Try 'make updatesubmodules'"
+		echo ""
+		echo ""
+		echo "NuttX sub repo not at correct version. Try 'git submodule update'"
 		echo "or follow instructions on http://pixhawk.org/dev/git/submodules"
+		echo ""
+		echo ""
+		echo "New commits required:"
+		echo "$(git submodule summary)"
+		echo ""
 		exit 1
 	fi
 else
@@ -18,12 +25,19 @@ fi
 
 if [ -d mavlink/include/mavlink/v1.0 ];
 	then
-	STATUSRETVAL=$(git status --porcelain | grep -i "mavlink/include/mavlink/v1.0")
+	STATUSRETVAL=$(git submodule summary | grep -A20 -i "mavlink/include/mavlink/v1.0" | grep "<")
 	if [ -z "$STATUSRETVAL" ]; then
 		echo "Checked mavlink submodule, correct version found"
 	else
-		echo "mavlink sub repo not at correct version. Try 'make updatesubmodules'"
+		echo ""
+		echo ""
+		echo "mavlink sub repo not at correct version. Try 'git submodule update'"
 		echo "or follow instructions on http://pixhawk.org/dev/git/submodules"
+		echo ""
+		echo ""
+		echo "New commits required:"
+		echo "$(git submodule summary)"
+		echo ""
 		exit 1
 	fi
 else