Merge remote branch 'paparazzi/master' into dev

This commit is contained in:
Felix Ruess
2011-04-22 16:57:40 +02:00
45 changed files with 2961 additions and 537 deletions
+22
View File
@@ -0,0 +1,22 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="cartography">
<header>
<file name="cartography.h"/>
</header>
<init fun="init_carto()"/>
<periodic fun="periodic_1Hz_carto()" freq="1." start="start_carto()" stop="stop_carto()" autorun="TRUE"/>
<periodic fun="periodic_10Hz_carto()" period="0.1" start="start_carto()" stop="stop_carto()" autorun="FALSE"/>
<makefile>
<raw>
#Exemple of RAW makefile part
</raw>
<define name="DEMO_MODULE_LED" value="2"/>
<file name="cartography.c"/>
</makefile>
<makefile target="sim">
<define name="SOME_FLAG"/>
<configure name="SOME_DEFINE" value="bla"/>
</makefile>
</module>
+2 -2
View File
@@ -6,13 +6,13 @@
</header>
<init fun="ArduIMU_init()"/>
<periodic fun="ArduIMU_periodic()" freq="60"/>
<periodic fun="ArduIMU_periodicGPS()" freq="8"/>
<periodic fun="ArduIMU_periodicGPS()" freq="4"/>
<event fun="ArduIMU_event()"/>
<makefile target="ap">
<file name="ins_arduimu_basic.c"/>
</makefile>
<makefile target="sim">
<file_arch name="ins_arduimu.c"/>
<file_arch name="ins_arduimu_basic.c"/>
</makefile>
</module>