[paparazzi-commits] [5993] fix actuators test makefile for now

[Felix Ruess]

Revision: 5993
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5993
Author:   flixr
Date:     2010-09-28 12:01:10 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
fix actuators test makefile for now

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml
    paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
    paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile

Modified: paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml  2010-09-28 11:35:41 UTC 
(rev 5992)
+++ paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml  2010-09-28 12:01:10 UTC 
(rev 5993)
@@ -180,12 +180,12 @@
    <load name="vehicle_interface_overo_link.xml"/>
  </modules>
 <!-- -->
- 
+
   <firmware name="rotorcraft">
     <target name="ap" board="lisa_l_1.0">
 <!--      <define name="BOOZ_START_DELAY" value="1"/> -->
       <subsystem name="radio_control" type="spektrum">
-        <param name="RADIO_CONTROL_SPEKTRUM_MODEL" 
+        <param name="RADIO_CONTROL_SPEKTRUM_MODEL"
              
value="\\\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\\\""/>
       </subsystem>
       <subsystem name="actuators"     type="asctec"/>
@@ -202,6 +202,7 @@
   </firmware>
 
   <firmware name="lisa_l_test_progs">
+    <target name="test_servos"   board="lisa_l_1.0"/>
     <target name="test_telemetry"   board="lisa_l_1.0"/>
     <target name="test_baro"        board="lisa_l_1.0"/>
     <target name="test_imu_b2"      board="lisa_l_1.0"/>
@@ -227,7 +228,7 @@
     </target>
     <target name="stm_passthrough" board="lisa_l_1.0"/>
       <subsystem name="radio_control" type="spektrum">
-        <param name="RADIO_CONTROL_SPEKTRUM_MODEL" 
+        <param name="RADIO_CONTROL_SPEKTRUM_MODEL"
               
value="\\\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\\\""/>
       </subsystem>
       <subsystem name="imu" type="b2_v1.1"/>

Modified: paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile  2010-09-28 
11:35:41 UTC (rev 5992)
+++ paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile  2010-09-28 
12:01:10 UTC (rev 5993)
@@ -75,7 +75,7 @@
 SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH)
 
 test_servos.ARCHDIR = $(ARCH)
-test_servos.CFLAGS  = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) 
-DPERIPHERALS_AUTO_INIT
+test_servos.CFLAGS  = -I$(SRC_FIRMWARE) 
-I$(SRC_FIRMWARE)/actuators/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) 
-DPERIPHERALS_AUTO_INIT
 test_servos.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_servos.LDFLAGS += -lm
 test_servos.srcs += $(SRC_LISA)/test_servos.c  \
@@ -87,7 +87,7 @@
 test_servos.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))'
 test_servos.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
 
-test_servos.srcs += $(SRC_BOOZ)/actuators/booz_actuators_pwm.c 
$(SRC_BOOZ_ARCH)/actuators/booz_actuators_pwm_arch.c
+test_servos.srcs += $(SRC_FIRMWARE)/actuators/actuators_pwm.c 
$(SRC_FIRMWARE)/actuators/arch/$(ARCH)/actuators_pwm_arch.c
 
 
 #

Modified: paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile    2010-09-28 
11:35:41 UTC (rev 5992)
+++ paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile    2010-09-28 
12:01:10 UTC (rev 5993)
@@ -372,7 +372,7 @@
 SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH)
 
 test_servos.ARCHDIR = $(ARCH)
-test_servos.CFLAGS  = -I$(SRC_FIRMWARE) 
-I$(SRC_FIRMWARE)/actuators/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_servos.CFLAGS  = -I$(SRC_FIRMWARE) 
-I$(SRC_FIRMWARE)/actuators/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) 
-DPERIPHERALS_AUTO_INIT
 test_servos.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_servos.LDFLAGS += -lm
 test_servos.srcs += $(SRC_LISA)/test_servos.c   \