[paparazzi-commits] [5658] Light With Parameters

[Christophe De Wagter]

Revision: 5658
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5658
Author:   dewagter
Date:     2010-08-24 15:21:19 +0000 (Tue, 24 Aug 2010)
Log Message:
-----------
Light With Parameters

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/AirborneCodeReorg/LisaFw.xml
    paparazzi3/trunk/conf/modules/light.xml

Added Paths:
-----------
    paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_lisa.makefile

Modified: paparazzi3/trunk/conf/airframes/AirborneCodeReorg/LisaFw.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/AirborneCodeReorg/LisaFw.xml        
2010-08-24 14:12:51 UTC (rev 5657)
+++ paparazzi3/trunk/conf/airframes/AirborneCodeReorg/LisaFw.xml        
2010-08-24 15:21:19 UTC (rev 5658)
@@ -160,7 +160,12 @@
   </section>
 
   <modules>
-    <load name="light.xml"/>
+    <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"/>
+    </load>
   </modules>
 
   <firmware name="fixedwing">

Added: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_lisa.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_lisa.makefile    
                            (rev 0)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_lisa.makefile    
    2010-08-24 15:21:19 UTC (rev 5658)
@@ -0,0 +1,5 @@
+# for lisa_l
+
+#ap.CFLAGS += -DACTUATORS=\"servos_4017_hw.h\" -DSERVOS_4017
+#ap.srcs += $(SRC_FIXEDWING_ARCH)/servos_4017_hw.c $(SRC_FIXEDWING)/actuators.c
+

Modified: paparazzi3/trunk/conf/modules/light.xml
===================================================================
--- paparazzi3/trunk/conf/modules/light.xml     2010-08-24 14:12:51 UTC (rev 
5657)
+++ paparazzi3/trunk/conf/modules/light.xml     2010-08-24 15:21:19 UTC (rev 
5658)
@@ -7,12 +7,15 @@
   <init fun="init_light()"/>
   <periodic fun="periodic_light()" period="0.05" autorun="TRUE"/>
   <makefile>
-    <flag name="LIGHT_LED_STROBE" value="3"/>
-    <flag name="LIGHT_LED_NAV" value="4"/>
 
-    <flag name="STROBE_LIGHT_MODE_DEFAULT" value="5"/>
-    <flag name="NAV_LIGHT_MODE_DEFAULT" value="4"/>
+<!-- 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"/>
 
+    <param name="STROBE_LIGHT_MODE_DEFAULT" value="5"/>
+    <param name="NAV_LIGHT_MODE_DEFAULT" value="4"/>
+-->
+
     <file name="light.c"/>
   </makefile>
 </module>