Merge branch 'master' into dev

This commit is contained in:
Felix Ruess
2011-07-07 23:37:37 +02:00
27 changed files with 765 additions and 424 deletions
+1
View File
@@ -14,6 +14,7 @@
<define name="USE_SPI" />
<define name="INS_LINK" value="SpiSlave"/>
<define name="USE_USB_HIGH_PCLK" />
<file name="ins_chimu_spi.c"/>
<file name="imu_chimu.c"/>
</makefile>
+6
View File
@@ -1,5 +1,11 @@
<!DOCTYPE module SYSTEM "module.dtd">
<!--
For older CHIMU v1.0 you should define CHIMU_BIG_ENDIAN
-->
<module name="ins">
<!-- <depend conflict="ins" -->
<header>
@@ -0,0 +1,16 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="cartography">
<header>
<file name="photogrammetry_calculator.h"/>
</header>
<init fun="init_photogrammetry_calculator()"/>
<!--
<periodic fun="periodic_1Hz_demo()" freq="1." start="start_demo()" stop="stop_demo()" autorun="TRUE"/>
-->
<makefile>
<define name="photogrammetry_calculator_LED" value="2"/>
<file name="photogrammetry_calculator.c"/>
</makefile>
</module>