Fixed TUDelft Airframes, module params become defines, subsystem para…

…ms become configure, finally no more confusion. Thanks Gautier
paparazzi · Dec 21, 2010 · 0719afb · 0719afb
1 parent 25fcb2c
commit 0719afb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/conf/airframes/TU_Delft/MicrojetBR.xml b/conf/airframes/TU_Delft/MicrojetBR.xml
@@ -229,8 +229,8 @@
 
   <modules>
     <load name="light.xml">
-      <param name="LIGHT_LED_STROBE" value="3"/>
-      <param name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
+      <define name="LIGHT_LED_STROBE" value="3"/>
+      <define name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
     </load>
   </modules>
 
@@ -253,7 +253,7 @@
 
     <!-- Communication -->
     <subsystem name="telemetry" 	type="transparent">
-      <param name="MODEM_BAUD" 		value="57600"/>
+      <configure name="MODEM_BAUD" 		value="57600"/>
     </subsystem>
 
     <!-- Sensors -->

diff --git a/conf/airframes/TU_Delft/MicrojetCDW.xml b/conf/airframes/TU_Delft/MicrojetCDW.xml
@@ -192,7 +192,7 @@
 
     <!-- Communication -->
     <subsystem name="telemetry" 	type="xbee_api">
-      <param name="MODEM_BAUD" 		value="B57600"/>
+      <configure name="MODEM_BAUD" 		value="B57600"/>
     </subsystem>
 
     <subsystem name="control"/>
@@ -212,8 +212,8 @@
 
   <modules>
     <load name="light.xml">
-      <param name="LIGHT_LED_STROBE" value="2"/>
-      <param name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
+      <define name="LIGHT_LED_STROBE" value="2"/>
+      <define name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
     </load>
   </modules>
 

diff --git a/conf/airframes/TU_Delft/yapa_xsens.xml b/conf/airframes/TU_Delft/yapa_xsens.xml
@@ -171,14 +171,14 @@
   <modules>
 <!--
     <load name="light.xml">
-      <param name="LIGHT_LED_STROBE" value="3"/>
-      <param name="LIGHT_LED_NAV" value="4"/>
-      <param name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
-      <param name="NAV_LIGHT_MODE_DEFAULT" value="0"/>
+      <define name="LIGHT_LED_STROBE" value="3"/>
+      <define name="LIGHT_LED_NAV" value="4"/>
+      <define name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
+      <define name="NAV_LIGHT_MODE_DEFAULT" value="0"/>
     </load>-->
     <load name="digital_cam_i2c.xml"/> 
 <!--    <load name="digital_cam.xml" >
-      <param name="DC_SHUTTER_LED" value="3"/>
+      <define name="DC_SHUTTER_LED" value="3"/>
     </load>
 -->  </modules>
 
@@ -193,7 +193,7 @@
 
     <!-- Communication -->
     <subsystem name="telemetry" type="xbee_api">
-      <param name="MODEM_BAUD" value="B9600"/>
+      <configure name="MODEM_BAUD" value="B9600"/>
     </subsystem>
 
     <!-- Actuators -->

diff --git a/conf/modules/light.xml b/conf/modules/light.xml
@@ -8,12 +8,12 @@
   <periodic fun="periodic_light()" period="0.05" autorun="TRUE"/>
   <makefile>
 
-<!-- these parameters should be set in the airframe file unless you want the defaults
-    <param name="LIGHT_LED_STROBE" value="3"/>
-    <param name="LIGHT_LED_NAV" value="4"/>
+<!-- these configureeters should be set in the airframe file unless you want the defaults
+    <configure name="LIGHT_LED_STROBE" value="3"/>
+    <configure name="LIGHT_LED_NAV" value="4"/>
 
-    <param name="STROBE_LIGHT_MODE_DEFAULT" value="5"/>
-    <param name="NAV_LIGHT_MODE_DEFAULT" value="4"/>
+    <configure name="STROBE_LIGHT_MODE_DEFAULT" value="5"/>
+    <configure name="NAV_LIGHT_MODE_DEFAULT" value="4"/>
 -->
 
     <file name="light.c"/>