[paparazzi-commits] [5000] made both protocols usable both on STM32 and LPC21

[antoine drouin]

Revision: 5000
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5000
Author:   poine
Date:     2010-06-22 00:17:56 +0000 (Tue, 22 Jun 2010)
Log Message:
-----------
made both protocols usable both on STM32 and LPC21

Modified Paths:
--------------
    paparazzi3/trunk/conf/autopilot/subsystems/booz2_actuators_asctec.makefile
    
paparazzi3/trunk/conf/autopilot/subsystems/booz2_actuators_asctec_v2.makefile

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/booz2_actuators_asctec.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/booz2_actuators_asctec.makefile  
2010-06-22 00:01:38 UTC (rev 4999)
+++ paparazzi3/trunk/conf/autopilot/subsystems/booz2_actuators_asctec.makefile  
2010-06-22 00:17:56 UTC (rev 5000)
@@ -1,10 +1,18 @@
 # asctec controllers
 ap.srcs += $(SRC_BOOZ)/actuators/booz_actuators_asctec.c
+ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
+
+ifeq ($(ARCHI), arm7)
 # on I2C0
 ap.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10
-ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
+endif
 
+ifeq ($(ARCHI), stm32) 
+ap.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c1
+ap.CFLAGS += -DUSE_I2C1
+endif
 
+
 # Simulator
 sim.srcs += $(SRC_BOOZ)/actuators/booz_actuators_asctec.c
 sim.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/booz2_actuators_asctec_v2.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/booz2_actuators_asctec_v2.makefile   
    2010-06-22 00:01:38 UTC (rev 4999)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/booz2_actuators_asctec_v2.makefile   
    2010-06-22 00:17:56 UTC (rev 5000)
@@ -21,6 +21,10 @@
 ap.srcs += $(SRC_BOOZ)/actuators/booz_actuators_asctec.c
 ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 
+ifeq ($(ARCHI), arm7)
+ap.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10
+endif
+
 ifeq ($(ARCHI), stm32) 
 ap.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c1
 ap.CFLAGS += -DUSE_I2C1