[paparazzi-commits] [5730] Fix passthrough compile for booz_max1168_arch, with DRDY_PORT pin definitions.

[Allen Ibara]

Revision: 5730
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5730
Author:   aibara
Date:     2010-08-27 16:41:01 +0000 (Fri, 27 Aug 2010)
Log Message:
-----------
Fix passthrough compile for booz_max1168_arch, with DRDY_PORT pin definitions. 
The problem stems from
having two versions of the imu_b2_v1.1 makefile. Change the passthrough version 
of the makefile to just include the rotorcraft version.

Modified Paths:
--------------
    
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile
    paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile
    2010-08-27 15:30:54 UTC (rev 5729)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile
    2010-08-27 16:41:01 UTC (rev 5730)
@@ -35,19 +35,6 @@
 #
 
 # imu Booz2 v1.1
-stm_passthrough.CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
-stm_passthrough.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001
-stm_passthrough.CFLAGS += -DIMU_B2_VERSION_1_1
-stm_passthrough.srcs += $(SRC_BOOZ)/booz_imu.c                   \
-           $(SRC_BOOZ)/imu/booz_imu_b2.c            \
-           $(SRC_BOOZ_ARCH)/imu/booz_imu_b2_arch.c
-
-stm_passthrough.srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
-           $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c
-
-stm_passthrough.srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c \
-           $(SRC_BOOZ_ARCH)/peripherals/booz_ms2001_arch.c
-
-stm_passthrough.CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ 
-DUSE_SPI2_IRQ
-
-
+include conf/rotorcraft/imu_b2_v1.1.makefile
+stm_passthrough.CFLAGS += $(imu_CFLAGS)
+stm_passthrough.srcs += $(imu_srcs)

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile  
2010-08-27 15:30:54 UTC (rev 5729)
+++ paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile  
2010-08-27 16:41:01 UTC (rev 5730)
@@ -40,31 +40,35 @@
 
 
 # imu Booz2 v1.1
-ap.CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
-ap.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001
-ap.CFLAGS += -DIMU_B2_VERSION_1_1
-ap.srcs += $(SRC_BOOZ)/booz_imu.c                   \
+imu_CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
+imu_CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001
+imu_CFLAGS += -DIMU_B2_VERSION_1_1
+imu_srcs += $(SRC_BOOZ)/booz_imu.c                   \
            $(SRC_BOOZ)/imu/booz_imu_b2.c            \
            $(SRC_BOOZ_ARCH)/imu/booz_imu_b2_arch.c
 
-ap.srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
+imu_srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
            $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c
 
-ap.srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c \
+imu_srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c \
            $(SRC_BOOZ_ARCH)/peripherals/booz_ms2001_arch.c
 
 # FIXME : that would lpc21
 #ifeq ($(ap.ARCH), arm7tmdi)
 ifeq ($(ARCHI), arm7)
-ap.CFLAGS += -DSSP_VIC_SLOT=9
-ap.CFLAGS += -DMAX1168_EOC_VIC_SLOT=8
-ap.CFLAGS += -DMS2001_DRDY_VIC_SLOT=11
+imu_CFLAGS += -DSSP_VIC_SLOT=9
+imu_CFLAGS += -DMAX1168_EOC_VIC_SLOT=8
+imu_CFLAGS += -DMS2001_DRDY_VIC_SLOT=11
 else ifeq ($(ARCHI), stm32) 
-ap.CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ -DUSE_SPI2_IRQ
-ap.CFLAGS += -DMAX_1168_DRDY_PORT=$(MAX_1168_DRDY_PORT)
-ap.CFLAGS += -DMAX_1168_DRDY_PORT_SOURCE=$(MAX_1168_DRDY_PORT_SOURCE)
+imu_CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ -DUSE_SPI2_IRQ
+imu_CFLAGS += -DMAX_1168_DRDY_PORT=$(MAX_1168_DRDY_PORT)
+imu_CFLAGS += -DMAX_1168_DRDY_PORT_SOURCE=$(MAX_1168_DRDY_PORT_SOURCE)
 endif
 
+# Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other 
targets
+ap.CFLAGS += $(imu_CFLAGS)
+ap.srcs += $(imu_srcs)
+
 #
 # Simulator
 #