[paparazzi-commits] [4082]

[Pascal Brisset]

Revision: 4082
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4082
Author:   hecto
Date:     2009-09-04 16:18:44 +0000 (Fri, 04 Sep 2009)
Log Message:
-----------


Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/slayer2.xml

Modified: paparazzi3/trunk/conf/airframes/slayer2.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/slayer2.xml 2009-09-04 15:59:18 UTC (rev 
4081)
+++ paparazzi3/trunk/conf/airframes/slayer2.xml 2009-09-04 16:18:44 UTC (rev 
4082)
@@ -1,7 +1,7 @@
 <airframe name="Miraterre Slayer 2">
  <!-- Slayer 
(http://www.recherche.enac.fr/wiki/index.php/Image:DragonSlayer_0948sm.jpg)
       Two ailevons
-      Hatch to drop a paint ball
+      Baro
       Tilted infrared sensor, gyro
       Still camera
       Tiny 0.99
@@ -88,7 +88,7 @@
   </section>
 
  <section name="BAT">
-    <define name="MILLIAMP_PER_PERCENT" value="0.86"/>
+    <define name="MILLIAMP_AT_FULL_THROTTLE" value="5000"/>
     <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
   </section>
  
@@ -97,8 +97,6 @@
     <define name="CARROT" value="3." unit="s"/>
     <define name="KILL_MODE_DISTANCE" value="(1.5*MAX_DIST_FROM_HOME)"/>
     <define name="CONTROL_RATE" value="60" unit="Hz"/>
-<!--    <define name="XBEE_INIT" value="\"ATPL2\rATRN1\rATTT80\rATWR\r\""/> -->
-<!--   <define name="NO_XBEE_API_INIT" value="TRUE"/> -->
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="90"/>
 
@@ -236,11 +234,14 @@
 ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM
 ap.srcs += nav.c fw_h_ctl.c fw_v_ctl.c nav_survey_rectangle.c traffic_info.c 
nav_line.c
 
+# Camera power switch on ADC_7 pin
+ap.CFLAGS += -DLED_3_BANK=0 -DLED_3_PIN=10 -DPOWER_SWITCH_LED=3
 
+
 ap.CFLAGS += -DGYRO -DADXRS150
 # -DIDG300
 ap.srcs += gyro.c
-ap.srcs += bomb.c
+# ap.srcs += bomb.c
 
 # Hack to use the same tuning file than slayer1
 ap.CFLAGS += -DUSE_GPIO
@@ -263,7 +264,7 @@
 # Config for SITL simulation
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN 
-DUSE_BARO_MS5534A
-sim.srcs += nav_survey_rectangle.c bomb.c $(SRC_ARCH)/sim_baro.c nav_line.c
+sim.srcs += nav_survey_rectangle.c $(SRC_ARCH)/sim_baro.c nav_line.c
 
   </makefile>
 </airframe>