[paparazzi-commits] [5978] fix rotorcraft actuators makefiles

[Felix Ruess]

Revision: 5978
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5978
Author:   flixr
Date:     2010-09-27 22:56:54 +0000 (Mon, 27 Sep 2010)
Log Message:
-----------
fix rotorcraft actuators makefiles

Modified Paths:
--------------
    
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_asctec.makefile
    
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile
    
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_heli.makefile
    paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_asctec.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_asctec.makefile 
    2010-09-27 22:56:47 UTC (rev 5977)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_asctec.makefile 
    2010-09-27 22:56:54 UTC (rev 5978)
@@ -1,5 +1,5 @@
 # asctec controllers
-ap.srcs += $(SRC_BOOZ)/actuators/booz_actuators_asctec.c
+ap.srcs += $(SRC_FIRMWARE)/actuators/actuators_asctec.c
 ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 
 ifeq ($(ARCH), lpc21)
@@ -14,7 +14,7 @@
 
 
 # Simulator
-sim.srcs += $(SRC_BOOZ)/actuators/booz_actuators_asctec.c
+sim.srcs += $(SRC_FIRMWARE)/actuators/actuators_asctec.c
 sim.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10
 sim.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile
  2010-09-27 22:56:47 UTC (rev 5977)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile
  2010-09-27 22:56:54 UTC (rev 5978)
@@ -16,9 +16,9 @@
 #
 #
 
-ap.srcs += $(SRC_BOOZ)/actuators/booz_supervision.c
+ap.srcs += $(SRC_FIRMWARE)/actuators/supervision.c
 ap.CFLAGS += -DACTUATORS_ASCTEC_V2_PROTOCOL
-ap.srcs += $(SRC_BOOZ)/actuators/booz_actuators_asctec.c
+ap.srcs += $(SRC_FIRMWARE)/actuators/actuators_asctec.c
 ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 
 ifeq ($(ARCH), lpc21)

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_heli.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_heli.makefile   
    2010-09-27 22:56:47 UTC (rev 5977)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_heli.makefile   
    2010-09-27 22:56:54 UTC (rev 5978)
@@ -1,6 +1,9 @@
 
-ap.srcs += $(SRC_BOOZ)/actuators/booz_actuators_heli.c
-ap.srcs += $(SRC_BOOZ_ARCH)/actuators/booz_actuators_pwm_arch.c
+# add actuatos arch to include directories
+ap.CFLAGS += -I$(SRC_FIRMWARE)/actuators/arch/$(ARCH)
 
+ap.srcs += $(SRC_FIRMWARE)/actuators/actuators_heli.c
+ap.srcs += $(SRC_FIRMWARE)/actuators/arch/$(ARCH)/actuators_pwm_arch.c
+
 # fixme : this is needed by baro and usualy added by actuators_mkk or 
actuators_asctec
-ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
\ No newline at end of file
+ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile    
    2010-09-27 22:56:47 UTC (rev 5977)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile    
    2010-09-27 22:56:54 UTC (rev 5978)
@@ -26,8 +26,8 @@
 
 
 #
-ap.srcs += $(SRC_BOOZ)/actuators/booz_supervision.c
-ap.srcs += $(SRC_BOOZ)/actuators/booz_actuators_mkk.c
+ap.srcs += $(SRC_FIRMWARE)/actuators/supervision.c
+ap.srcs += $(SRC_FIRMWARE)/actuators/actuators_mkk.c
 ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 
 ifeq ($(ARCH), lpc21)
@@ -39,7 +39,7 @@
 endif
 
 # Simulator
-sim.srcs += $(SRC_BOOZ)/actuators/booz_supervision.c
-sim.srcs += $(SRC_BOOZ)/actuators/booz_actuators_mkk.c
+sim.srcs += $(SRC_FIRMWARE)/actuators/supervision.c
+sim.srcs += $(SRC_FIRMWARE)/actuators/actuators_mkk.c
 sim.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10 
-DACTUATORS_MKK_DEVICE=i2c1
 sim.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c