Merge pull request #236 from enacuavlab/imav_merge

Imav merge
paparazzi · Jul 12, 2012 · 6b875f4 · 6b875f4
2 parents 07deb14 + b4cb78d
commit 6b875f4
Show file tree

Hide file tree

Showing 71 changed files with 1,187 additions and 4,521 deletions.
diff --git a/conf/airframes/CDW/debug_i2c.xml b/conf/airframes/CDW/debug_i2c.xml
@@ -232,6 +232,7 @@
     <!--subsystem name="ahrs"          type="int_cmpl_euler"/-->
     <subsystem name="stabilization"   type="euler"/>
     <subsystem name="ahrs"          type="int_cmpl_quat"/>
+    <subsystem name="ins"/>
     <subsystem name="ins"           type="hff"/>
   </firmware>
 

diff --git a/conf/airframes/ENAC/fixed-wing/funjet2.xml b/conf/airframes/ENAC/fixed-wing/funjet2.xml