From 291f62015aea595bffd753481faf79b48e8ce452 Mon Sep 17 00:00:00 2001
From: dewagter <dewagter@gmail.com>
Date: Mon, 14 Apr 2014 14:29:23 +0200
Subject: [PATCH] [ardrone_vision] Vision Submodule

---
 .gitignore                      | 3 ---
 .gitmodules                     | 3 +++
 conf/airframes/ardrone2_raw.xml | 1 +
 sw/ext/ardrone2_vision          | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 160000 sw/ext/ardrone2_vision

diff --git a/.gitignore b/.gitignore
index de78b4a36c..2a3a4c6861 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,9 +56,6 @@
 /doc/pprz_algebra/headfile.log
 /doc/pprz_algebra/headfile.toc
 
-# /sw/ext/
-/sw/ext/ardrone2_vision
-
 # /sw/ground_segment/cockpit/
 /sw/ground_segment/cockpit/gtk_save_settings.ml
 /sw/ground_segment/cockpit/gtk_setting_time.ml
diff --git a/.gitmodules b/.gitmodules
index 4677a5fbf4..08e8ed60b6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "sw/ext/fatfs"]
 	path = sw/ext/fatfs
 	url = https://github.com/enacuavlab/fatfs.git
+[submodule "sw/ext/ardrone2_vision"]
+	path = sw/ext/ardrone2_vision
+	url = https://github.com/tudelft/ardrone2_vision.git
diff --git a/conf/airframes/ardrone2_raw.xml b/conf/airframes/ardrone2_raw.xml
index cb981ffef3..416b5fd6e1 100644
--- a/conf/airframes/ardrone2_raw.xml
+++ b/conf/airframes/ardrone2_raw.xml
@@ -28,6 +28,7 @@
   <modules main_freq="512">
     <load name="gps_ubx_ucenter.xml"/>
     <load name="send_imu_mag_current.xml"/>
+    <!--  load name="../../sw/ext/ardrone2_vision/modules/Mjpeg/ViewVideo.xml"/-->
   </modules>
 
   <commands>
diff --git a/sw/ext/ardrone2_vision b/sw/ext/ardrone2_vision
new file mode 160000
index 0000000000..2563e95725
--- /dev/null
+++ b/sw/ext/ardrone2_vision
@@ -0,0 +1 @@
+Subproject commit 2563e957251899e03a5206ff437a56c2fe1c12a3