Fixed TUDelft Airframes, module params become defines, subsystem params become configure, finally no more confusion. Thanks Gautier

This commit is contained in:
Christophe De Wagter
2010-12-21 21:51:19 +01:00
parent 25fcb2c026
commit 0719afb325
4 changed files with 17 additions and 17 deletions
+3 -3
View File
@@ -229,8 +229,8 @@
<modules> <modules>
<load name="light.xml"> <load name="light.xml">
<param name="LIGHT_LED_STROBE" value="3"/> <define name="LIGHT_LED_STROBE" value="3"/>
<param name="STROBE_LIGHT_MODE_DEFAULT" value="6"/> <define name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
</load> </load>
</modules> </modules>
@@ -253,7 +253,7 @@
<!-- Communication --> <!-- Communication -->
<subsystem name="telemetry" type="transparent"> <subsystem name="telemetry" type="transparent">
<param name="MODEM_BAUD" value="57600"/> <configure name="MODEM_BAUD" value="57600"/>
</subsystem> </subsystem>
<!-- Sensors --> <!-- Sensors -->
+3 -3
View File
@@ -192,7 +192,7 @@
<!-- Communication --> <!-- Communication -->
<subsystem name="telemetry" type="xbee_api"> <subsystem name="telemetry" type="xbee_api">
<param name="MODEM_BAUD" value="B57600"/> <configure name="MODEM_BAUD" value="B57600"/>
</subsystem> </subsystem>
<subsystem name="control"/> <subsystem name="control"/>
@@ -212,8 +212,8 @@
<modules> <modules>
<load name="light.xml"> <load name="light.xml">
<param name="LIGHT_LED_STROBE" value="2"/> <define name="LIGHT_LED_STROBE" value="2"/>
<param name="STROBE_LIGHT_MODE_DEFAULT" value="6"/> <define name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
</load> </load>
</modules> </modules>
+6 -6
View File
@@ -171,14 +171,14 @@
<modules> <modules>
<!-- <!--
<load name="light.xml"> <load name="light.xml">
<param name="LIGHT_LED_STROBE" value="3"/> <define name="LIGHT_LED_STROBE" value="3"/>
<param name="LIGHT_LED_NAV" value="4"/> <define name="LIGHT_LED_NAV" value="4"/>
<param name="STROBE_LIGHT_MODE_DEFAULT" value="6"/> <define name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
<param name="NAV_LIGHT_MODE_DEFAULT" value="0"/> <define name="NAV_LIGHT_MODE_DEFAULT" value="0"/>
</load>--> </load>-->
<load name="digital_cam_i2c.xml"/> <load name="digital_cam_i2c.xml"/>
<!-- <load name="digital_cam.xml" > <!-- <load name="digital_cam.xml" >
<param name="DC_SHUTTER_LED" value="3"/> <define name="DC_SHUTTER_LED" value="3"/>
</load> </load>
--> </modules> --> </modules>
@@ -193,7 +193,7 @@
<!-- Communication --> <!-- Communication -->
<subsystem name="telemetry" type="xbee_api"> <subsystem name="telemetry" type="xbee_api">
<param name="MODEM_BAUD" value="B9600"/> <configure name="MODEM_BAUD" value="B9600"/>
</subsystem> </subsystem>
<!-- Actuators --> <!-- Actuators -->
+5 -5
View File
@@ -8,12 +8,12 @@
<periodic fun="periodic_light()" period="0.05" autorun="TRUE"/> <periodic fun="periodic_light()" period="0.05" autorun="TRUE"/>
<makefile> <makefile>
<!-- these parameters should be set in the airframe file unless you want the defaults <!-- these configureeters should be set in the airframe file unless you want the defaults
<param name="LIGHT_LED_STROBE" value="3"/> <configure name="LIGHT_LED_STROBE" value="3"/>
<param name="LIGHT_LED_NAV" value="4"/> <configure name="LIGHT_LED_NAV" value="4"/>
<param name="STROBE_LIGHT_MODE_DEFAULT" value="5"/> <configure name="STROBE_LIGHT_MODE_DEFAULT" value="5"/>
<param name="NAV_LIGHT_MODE_DEFAULT" value="4"/> <configure name="NAV_LIGHT_MODE_DEFAULT" value="4"/>
--> -->
<file name="light.c"/> <file name="light.c"/>