[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [6216] fix paths for imu in lisa
|
From: |
Felix Ruess |
|
Subject: |
[paparazzi-commits] [6216] fix paths for imu in lisa |
|
Date: |
Sat, 23 Oct 2010 21:12:20 +0000 |
Revision: 6216
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6216
Author: flixr
Date: 2010-10-23 21:12:20 +0000 (Sat, 23 Oct 2010)
Log Message:
-----------
fix paths for imu in lisa
Modified Paths:
--------------
paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
paparazzi3/trunk/conf/autopilot/lisa_passthrough.makefile
paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile
paparazzi3/trunk/conf/autopilot/mercury.makefile
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.2.makefile
Modified: paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile 2010-10-23
21:12:13 UTC (rev 6215)
+++ paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile 2010-10-23
21:12:20 UTC (rev 6216)
@@ -49,6 +49,7 @@
SRC_BOARD=boards/$(BOARD)
SRC_FIRMWARE=firmwares/rotorcraft
+SRC_SUBSYSTEMS=subsystems
#
# default configuration expected from the board files
@@ -289,7 +290,7 @@
# MODEM_BAUD
#
test_imu_b2.ARCHDIR = $(ARCH)
-test_imu_b2.CFLAGS = -I$(SRC_FIRMWARE)/imu/arch/$(ARCH) -I$(SRC_LISA)
-I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_imu_b2.CFLAGS = -I$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH) -I$(SRC_LISA)
-I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
test_imu_b2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
test_imu_b2.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \
$(SRC_ARCH)/stm32_exceptions.c \
@@ -313,11 +314,11 @@
test_imu_b2.CFLAGS += -DIMU_TYPE_H=\"imu/imu_b2.h\"
test_imu_b2.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001 -DIMU_B2_VERSION_1_1
-test_imu_b2.srcs += $(SRC_FIRMWARE)/imu.c
+test_imu_b2.srcs += $(SRC_SUBSYSTEMS)/imu.c
test_imu_b2.CFLAGS += -DMAX_1168_DRDY_PORT=$(MAX_1168_DRDY_PORT)
test_imu_b2.CFLAGS += -DMAX_1168_DRDY_PORT_SOURCE=$(MAX_1168_DRDY_PORT_SOURCE)
test_imu_b2.CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ
-DUSE_SPI2_IRQ
-test_imu_b2.srcs += $(SRC_FIRMWARE)/imu/imu_b2.c
$(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_b2_arch.c
+test_imu_b2.srcs += $(SRC_SUBSYSTEMS)/imu/imu_b2.c
$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_b2_arch.c
test_imu_b2.srcs += peripherals/max1168.c
$(SRC_ARCH)/peripherals/max1168_arch.c
test_imu_b2.srcs += peripherals/ms2001.c $(SRC_ARCH)/peripherals/ms2001_arch.c
@@ -330,7 +331,7 @@
# MODEM_BAUD
#
test_imu_b2_2.ARCHDIR = $(ARCH)
-test_imu_b2_2.CFLAGS = -I$(SRC_FIRMWARE)/imu/arch/$(ARCH) -I$(SRC_LISA)
-I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_imu_b2_2.CFLAGS = -I$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH) -I$(SRC_LISA)
-I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
test_imu_b2_2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
test_imu_b2_2.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \
$(SRC_ARCH)/stm32_exceptions.c \
@@ -354,11 +355,11 @@
test_imu_b2_2.CFLAGS += -DIMU_TYPE_H=\"imu/imu_b2.h\"
test_imu_b2_2.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_HMC5843
-DIMU_B2_VERSION_1_2
-test_imu_b2_2.srcs += $(SRC_FIRMWARE)/imu.c
+test_imu_b2_2.srcs += $(SRC_SUBSYSTEMS)/imu.c
test_imu_b2_2.CFLAGS += -DMAX_1168_DRDY_PORT=$(MAX_1168_DRDY_PORT)
test_imu_b2_2.CFLAGS +=
-DMAX_1168_DRDY_PORT_SOURCE=$(MAX_1168_DRDY_PORT_SOURCE)
test_imu_b2_2.CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ
-DUSE_SPI2_IRQ
-test_imu_b2_2.srcs += $(SRC_FIRMWARE)/imu/imu_b2.c
$(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_b2_arch.c
+test_imu_b2_2.srcs += $(SRC_SUBSYSTEMS)/imu/imu_b2.c
$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_b2_arch.c
test_imu_b2_2.srcs += peripherals/max1168.c
$(SRC_ARCH)/peripherals/max1168_arch.c
test_imu_b2_2.CFLAGS += -DUSE_I2C2
test_imu_b2_2.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
@@ -370,7 +371,7 @@
# test IMU aspirin
#
test_imu_aspirin.ARCHDIR = $(ARCH)
-test_imu_aspirin.CFLAGS = -I$(SRC_FIRMWARE)
-I$(SRC_FIRMWARE)/imu/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ)
-I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_imu_aspirin.CFLAGS = -I$(SRC_FIRMWARE)
-I$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ)
-I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
test_imu_aspirin.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
test_imu_aspirin.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \
$(SRC_ARCH)/stm32_exceptions.c \
@@ -392,9 +393,9 @@
test_imu_aspirin.srcs += math/pprz_trig_int.c
test_imu_aspirin.CFLAGS += -DIMU_TYPE_H=\"imu/imu_aspirin.h\"
-DIMU_OVERRIDE_CHANNELS
-test_imu_aspirin.srcs += $(SRC_FIRMWARE)/imu.c \
-
$(SRC_FIRMWARE)/imu/imu_aspirin.c \
-
$(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_aspirin_arch.c
+test_imu_aspirin.srcs += $(SRC_SUBSYSTEMS)/imu.c \
+
$(SRC_SUBSYSTEMS)/imu/imu_aspirin.c \
+
$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_aspirin_arch.c
test_imu_aspirin.CFLAGS += -DUSE_I2C2
test_imu_aspirin.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
Modified: paparazzi3/trunk/conf/autopilot/lisa_passthrough.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_passthrough.makefile 2010-10-23
21:12:13 UTC (rev 6215)
+++ paparazzi3/trunk/conf/autopilot/lisa_passthrough.makefile 2010-10-23
21:12:20 UTC (rev 6216)
@@ -12,8 +12,9 @@
SRC_CSC=csc
SRC_BOARD=boards/$(BOARD)
SRC_FIRMWARE=firmwares/rotorcraft
+SRC_SUBSYSTEMS=subsystems
SRC_ROTOR_ARCH=$(SRC_FIRMWARE)/actuators/arch/$(ARCH)
-SRC_IMU_ARCH=$(SRC_FIRMWARE)/imu/arch/$(ARCH)
+SRC_IMU_ARCH=$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)
CFG_LISA_PASSTHROUGH =
$(PAPARAZZI_SRC)/conf/autopilot/subsystems/lisa_passthrough
Modified: paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile 2010-10-23
21:12:13 UTC (rev 6215)
+++ paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile 2010-10-23
21:12:20 UTC (rev 6216)
@@ -124,6 +124,7 @@
SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH)
SRC_FIRMWARE=firmwares/rotorcraft
+SRC_SUBSYSTEMS=subsystems
#BOARD_CFG=\"boards/olimex_stm32-h103.h\"
BOARD_CFG=\"boards/lisa_l_1.0.h\"
@@ -401,7 +402,7 @@
# test IMU b2
#
test_imu_b2.ARCHDIR = $(ARCH)
-test_imu_b2.CFLAGS = -I$(SRC_FIRMWARE) -I$(SRC_FIRMWARE)/imu/arch/$(ARCH)
-I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_imu_b2.CFLAGS = -I$(SRC_FIRMWARE) -I$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)
-I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
test_imu_b2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
test_imu_b2.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \
$(SRC_ARCH)/stm32_exceptions.c \
@@ -424,9 +425,9 @@
test_imu_b2.CFLAGS += -DIMU_TYPE_H=\"imu/imu_b2.h\"
test_imu_b2.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001
-test_imu_b2.srcs += $(SRC_FIRMWARE)/imu.c
+test_imu_b2.srcs += $(SRC_SUBSYSTEMS)/imu.c
test_imu_b2.CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ
-DUSE_SPI2_IRQ
-test_imu_b2.srcs += $(SRC_FIRMWARE)/imu/imu_b2.c
$(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_b2_arch.c
+test_imu_b2.srcs += $(SRC_SUBSYSTEMS)/imu/imu_b2.c
$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_b2_arch.c
test_imu_b2.srcs += peripherals/max1168.c
$(SRC_ARCH)/peripherals/max1168_arch.c
test_imu_b2.srcs += peripherals/ms2001.c $(SRC_ARCH)/peripherals/ms2001_arch.c
@@ -435,7 +436,7 @@
# test IMU crista
#
test_imu_crista.ARCHDIR = $(ARCH)
-test_imu_crista.CFLAGS = -I$(SRC_FIRMWARE) -I$(SRC_FIRMWARE)/imu/arch/$(ARCH)
-I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_imu_crista.CFLAGS = -I$(SRC_FIRMWARE)
-I$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ)
-I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
test_imu_crista.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
test_imu_crista.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \
$(SRC_ARCH)/stm32_exceptions.c \
@@ -457,9 +458,9 @@
test_imu_crista.srcs += math/pprz_trig_int.c
test_imu_crista.CFLAGS += -DIMU_TYPE_H=\"imu/imu_crista.h\"
-DIMU_OVERRIDE_CHANNELS
-test_imu_crista.srcs += $(SRC_FIRMWARE)/imu.c \
- $(SRC_FIRMWARE)/imu/imu_crista.c \
- $(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_crista_arch.c
+test_imu_crista.srcs += $(SRC_SUBSYSTEMS)/imu.c \
+ $(SRC_SUBSYSTEMS)/imu/imu_crista.c \
+ $(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_crista_arch.c
test_imu_crista.CFLAGS += -DUSE_DMA1_C4_IRQ
@@ -467,7 +468,7 @@
# test IMU aspirin
#
test_imu_aspirin.ARCHDIR = $(ARCH)
-test_imu_aspirin.CFLAGS = -I$(SRC_FIRMWARE)
-I$(SRC_FIRMWARE)/imu/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ)
-I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_imu_aspirin.CFLAGS = -I$(SRC_FIRMWARE)
-I$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ)
-I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
test_imu_aspirin.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
test_imu_aspirin.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \
$(SRC_ARCH)/stm32_exceptions.c \
@@ -489,9 +490,9 @@
test_imu_aspirin.srcs += math/pprz_trig_int.c
test_imu_aspirin.CFLAGS += -DIMU_TYPE_H=\"imu/imu_aspirin.h\"
-DIMU_OVERRIDE_CHANNELS
-test_imu_aspirin.srcs += $(SRC_FIRMWARE)/imu.c \
- $(SRC_FIRMWARE)/imu/imu_aspirin.c \
- $(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_aspirin_arch.c
+test_imu_aspirin.srcs += $(SRC_SUBSYSTEMS)/imu.c \
+ $(SRC_SUBSYSTEMS)/imu/imu_aspirin.c \
+ $(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_aspirin_arch.c
test_imu_aspirin.CFLAGS += -DUSE_I2C2
test_imu_aspirin.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
@@ -1092,9 +1093,9 @@
# IMU
ptw.CFLAGS += -DIMU_TYPE_H=\"imu/imu_b2.h\"
ptw.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001
-ptw.srcs += $(SRC_FIRMWARE)/imu.c
+ptw.srcs += $(SRC_SUBSYSTEMS)/imu.c
ptw.CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ -DUSE_SPI2_IRQ
-ptw.srcs += $(SRC_FIRMWARE)/imu/imu_b2.c
$(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_b2_arch.c
+ptw.srcs += $(SRC_SUBSYSTEMS)/imu/imu_b2.c
$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_b2_arch.c
ptw.srcs += peripherals/max1168.c $(SRC_ARCH)/peripherals/max1168_arch.c
ptw.srcs += peripherals/ms2001.c $(SRC_ARCH)/peripherals/ms2001_arch.c
ptw.srcs += math/pprz_trig_int.c
@@ -1312,9 +1313,9 @@
hs_gyro_aspirin.srcs += math/pprz_trig_int.c
hs_gyro_aspirin.CFLAGS += -DIMU_TYPE_H=\"imu/imu_aspirin.h\"
-DIMU_OVERRIDE_CHANNELS
-hs_gyro_aspirin.srcs += $(SRC_FIRMWARE)/imu.c \
- $(SRC_FIRMWARE)/imu/imu_aspirin.c \
- $(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_aspirin_arch.c
+hs_gyro_aspirin.srcs += $(SRC_SUBSYSTEMS)/imu.c \
+ $(SRC_SUBSYSTEMS)/imu/imu_aspirin.c \
+ $(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_aspirin_arch.c
hs_gyro_aspirin.CFLAGS += -DUSE_I2C2
hs_gyro_aspirin.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
@@ -1351,9 +1352,9 @@
hs_gyro_b2.CFLAGS += -DIMU_TYPE_H=\"imu/imu_b2.h\"
hs_gyro_b2.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001
-hs_gyro_b2.srcs += $(SRC_FIRMWARE)/imu.c
+hs_gyro_b2.srcs += $(SRC_SUBSYSTEMS)/imu.c
hs_gyro_b2.CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ
-DUSE_SPI2_IRQ
-hs_gyro_b2.srcs += $(SRC_FIRMWARE)/imu/imu_b2.c
$(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_b2_arch.c
+hs_gyro_b2.srcs += $(SRC_SUBSYSTEMS)/imu/imu_b2.c
$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_b2_arch.c
hs_gyro_b2.srcs += peripherals/max1168.c $(SRC_ARCH)/peripherals/max1168_arch.c
hs_gyro_b2.srcs += peripherals/ms2001.c $(SRC_ARCH)/peripherals/ms2001_arch.c
@@ -1383,9 +1384,9 @@
hs_gyro_crista.srcs += math/pprz_trig_int.c
hs_gyro_crista.CFLAGS += -DIMU_TYPE_H=\"imu/imu_crista.h\"
-DIMU_OVERRIDE_CHANNELS
-hs_gyro_crista.srcs += $(SRC_FIRMWARE)/imu.c \
- $(SRC_FIRMWARE)/imu/imu_crista.c \
- $(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_crista_arch.c
+hs_gyro_crista.srcs += $(SRC_SUBSYSTEMS)/imu.c \
+ $(SRC_SUBSYSTEMS)/imu/imu_crista.c \
+ $(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_crista_arch.c
hs_gyro_crista.CFLAGS += -DUSE_DMA1_C4_IRQ
hs_gyro_crista.CFLAGS += -DMEASURED_SENSOR=gyro_unscaled.p
-DMEASURED_SENSOR_NB=0
Modified: paparazzi3/trunk/conf/autopilot/mercury.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/mercury.makefile 2010-10-23 21:12:13 UTC
(rev 6215)
+++ paparazzi3/trunk/conf/autopilot/mercury.makefile 2010-10-23 21:12:20 UTC
(rev 6216)
@@ -1,6 +1,6 @@
#
# $Id$
-#
+#
# Copyright (C) 2009 Antoine Drouin, Allen H. Ibara
#
# This file is part of paparazzi.
@@ -18,7 +18,7 @@
# You should have received a copy of the GNU General Public License
# along with paparazzi; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Boston, MA 02111-1307, USA.
#
#
@@ -42,6 +42,7 @@
SRC_CSC=csc
SRC_CSC_ARCH=$(SRC_CSC)/$(ARCHI)
SRC_BOOZ=booz
+SRC_SUBSYSTEMS=subsystems
ap.ARCHDIR = $(ARCHI)
@@ -64,13 +65,13 @@
ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B230400 -DUART0_VIC_SLOT=5
ap.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 -DUART1_VIC_SLOT=6
ap.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport \
- -DDOWNLINK_DEVICE=Uart1
+ -DDOWNLINK_DEVICE=Uart1
ap.srcs += downlink.c pprz_transport.c $(SRC_CSC)/csc_telemetry.c
ap.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart1
ap.srcs += $(SRC_CSC)/csc_datalink.c
ap.CFLAGS += -DPPRZ_TRIG_CONST=const
-ap.srcs += $(SRC_CSC)/mercury_xsens.c $(SRC_FIRMWARE)/imu.c
math/pprz_trig_int.c
+ap.srcs += $(SRC_CSC)/mercury_xsens.c $(SRC_SUBSYSTEMS)/imu.c
math/pprz_trig_int.c
ap.CFLAGS += -DXSENS1_LINK=Uart0 -DIMU_TYPE_H=\"mercury_xsens.h\"
ap.srcs += $(SRC_BOOZ)/ahrs/ahrs_cmpl_euler.c $(SRC_BOOZ)/ahrs/ahrs_aligner.c
@@ -137,6 +138,5 @@
test_uart.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 -DUART1_VIC_SLOT=6
test_uart.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport \
- -DDOWNLINK_DEVICE=Uart1
+ -DDOWNLINK_DEVICE=Uart1
test_uart.srcs += downlink.c pprz_transport.c
-
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-10-23 21:12:13 UTC (rev 6215)
+++
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile
2010-10-23 21:12:20 UTC (rev 6216)
@@ -43,9 +43,9 @@
$(TARGET).CFLAGS += -DIMU_TYPE_H=\"imu/imu_b2.h\"
$(TARGET).CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001
$(TARGET).CFLAGS += -DIMU_B2_VERSION_1_1
-$(TARGET).srcs += $(SRC_FIRMWARE)/imu.c \
- $(SRC_FIRMWARE)/imu/imu_b2.c \
- $(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_b2_arch.c
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/imu.c \
+ $(SRC_SUBSYSTEMS)/imu/imu_b2.c \
+ $(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_b2_arch.c
$(TARGET).srcs += peripherals/max1168.c \
$(SRC_ARCH)/peripherals/max1168_arch.c
@@ -70,8 +70,8 @@
sim.CFLAGS += -DIMU_TYPE_H=\"imu/imu_b2.h\"
sim.CFLAGS += -DIMU_B2_VERSION_1_1
sim.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_AMI601
-sim.srcs += $(SRC_FIRMWARE)/imu.c \
- $(SRC_FIRMWARE)/imu/imu_b2.c \
+sim.srcs += $(SRC_SUBSYSTEMS)/imu.c \
+ $(SRC_SUBSYSTEMS)/imu/imu_b2.c \
$(SRC_BOOZ_SIM)/imu/imu_b2_arch.c
Modified:
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.2.makefile
===================================================================
---
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.2.makefile
2010-10-23 21:12:13 UTC (rev 6215)
+++
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.2.makefile
2010-10-23 21:12:20 UTC (rev 6216)
@@ -42,14 +42,14 @@
# imu Booz2 v1.2
# add imu arch to include directories
-imu_CFLAGS += -I$(SRC_FIRMWARE)/imu/arch/$(ARCH)
+imu_CFLAGS += -I$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)
imu_CFLAGS += -DIMU_TYPE_H=\"imu/imu_b2.h\"
imu_CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_HMC5843
imu_CFLAGS += -DIMU_B2_VERSION_1_2
-imu_srcs += $(SRC_FIRMWARE)/imu.c \
- $(SRC_FIRMWARE)/imu/imu_b2.c \
- $(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_b2_arch.c
+imu_srcs += $(SRC_SUBSYSTEMS)/imu.c \
+ $(SRC_SUBSYSTEMS)/imu/imu_b2.c \
+ $(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_b2_arch.c
imu_srcs += peripherals/max1168.c \
$(SRC_ARCH)/peripherals/max1168_arch.c
@@ -78,14 +78,14 @@
#
# add imu arch to include directories
-sim.CFLAGS += -I$(SRC_FIRMWARE)/imu/arch/$(ARCH)
+sim.CFLAGS += -I$(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)
sim.CFLAGS += -DIMU_TYPE_H=\"imu/imu_b2.h\"
sim.CFLAGS += -DIMU_B2_VERSION_1_1
sim.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_AMI601
-sim.srcs += $(SRC_FIRMWARE)/imu.c \
- $(SRC_FIRMWARE)/imu/imu_b2.c \
- $(SRC_FIRMWARE)/imu/arch/$(ARCH)/imu_b2_arch.c
+sim.srcs += $(SRC_SUBSYSTEMS)/imu.c \
+ $(SRC_SUBSYSTEMS)/imu/imu_b2.c \
+ $(SRC_SUBSYSTEMS)/imu/arch/$(ARCH)/imu_b2_arch.c
sim.srcs += peripherals/max1168.c \
$(SRC_BOOZ_SIM)/peripherals/max1168_arch.c
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [6216] fix paths for imu in lisa,
Felix Ruess <=