From 6814ddccffd6f9f5a208ad87ffb5aa4045ba8543 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Tue, 8 Jul 2014 20:19:17 +0400
Subject: [PATCH] UAVCAN as a submodule

---
 .gitignore                |  1 -
 .gitmodules               |  3 +++
 Makefile                  |  3 +++
 Tools/check_submodules.sh | 16 ++++++++++++++++
 uavcan                    |  1 +
 5 files changed, 23 insertions(+), 1 deletion(-)
 create mode 160000 uavcan

diff --git a/.gitignore b/.gitignore
index d0c624543f..8b09e4783f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,5 @@ mavlink/include/mavlink/v0.9/
 tags
 .tags_sorted_by_file
 .pydevproject
-/uavcan
 .ropeproject
 *.orig
diff --git a/.gitmodules b/.gitmodules
index 8436b398e0..4b84afac2a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "NuttX"]
 	path = NuttX
 	url = git://github.com/PX4/NuttX.git
+[submodule "uavcan"]
+	path = uavcan
+	url = git://github.com/pavel-kirienko/uavcan.git
diff --git a/Makefile b/Makefile
index 8bf96ca230..e2d50e8fc8 100644
--- a/Makefile
+++ b/Makefile
@@ -212,6 +212,9 @@ endif
 $(NUTTX_SRC):
 	$(Q) (./Tools/check_submodules.sh)
 
+$(UAVCAN_DIR):
+	$(Q) (./Tools/check_submodules.sh)
+
 .PHONY: checksubmodules
 checksubmodules:
 	$(Q) (./Tools/check_submodules.sh)
diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh
index fb180ef47e..a178b4a387 100755
--- a/Tools/check_submodules.sh
+++ b/Tools/check_submodules.sh
@@ -31,4 +31,20 @@ else
 	git submodule update;
 fi
 
+
+if [ -d uavcan/libuavcan_drivers ];
+then
+	STATUSRETVAL=$(git status --porcelain | grep -i uavcan)
+	if [ "$STATUSRETVAL" == "" ]; then
+		echo "Checked uavcan submodule, correct version found"
+	else
+		echo "uavcan sub repo not at correct version. Try 'make updatesubmodules'"
+		echo "or follow instructions on http://pixhawk.org/dev/git/submodules"
+		exit 1
+	fi
+else
+	git submodule init
+	git submodule update
+fi
+
 exit 0
diff --git a/uavcan b/uavcan
new file mode 160000
index 0000000000..f66c1a7de3
--- /dev/null
+++ b/uavcan
@@ -0,0 +1 @@
+Subproject commit f66c1a7de3076ff956bdf159dc3a166cbffe6089