Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-23 04:45:37 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[conf] remove flags that got obsolete with libopencm3

Browse Source
This commit is contained in:
Felix Ruess
2012-11-11 03:00:51 +01:00
parent 5fba8f3019
commit ba19f84a93
15 changed files with 9 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/boards/lisa_l_1.0.makefile
-10
View File
@@ -96,16 +96,6 @@ ifndef ACTUATORS
ACTUATORS = actuators_pwm
endif
#
# this is the DRDY pin of a max1168 on a booz IMU
#
# v 1.0
#
MAX_1168_DRDY_PORT = _GPIOD
MAX_1168_DRDY_PORT_SOURCE = PortSourceGPIOD
# v1.1
#MAX_1168_DRDY_PORT = GPIOB
ifndef ADC_IR1
ADC_IR1 = 1
conf/boards/lisa_l_1.1.makefile
-10
View File
@@ -99,16 +99,6 @@ ifndef ACTUATORS
ACTUATORS = actuators_pwm
endif
#
# this is the DRDY pin of a max1168 on a booz IMU
#
# v 1.1
#
MAX_1168_DRDY_PORT = _GPIOB
MAX_1168_DRDY_PORT_SOURCE = PortSourceGPIOB
# v1.1
#MAX_1168_DRDY_PORT = GPIOB
ifndef ADC_IR1
ADC_IR1 = 1
conf/firmwares/lisa_passthrough.makefile
+1 -1
View File
@@ -47,7 +47,7 @@ stm_passthrough.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
stm_passthrough.CFLAGS += -DUSE_OVERO_LINK
stm_passthrough.CFLAGS += -DOVERO_LINK_MSG_UP=AutopilotMessagePTUp
stm_passthrough.CFLAGS += -DOVERO_LINK_MSG_DOWN=AutopilotMessagePTDown
stm_passthrough.CFLAGS += -DOVERO_LINK_LED_OK=3 -DOVERO_LINK_LED_KO=2 -DUSE_DMA1_C2_IRQ
stm_passthrough.CFLAGS += -DOVERO_LINK_LED_OK=3 -DOVERO_LINK_LED_KO=2
stm_passthrough.srcs += $(SRC_LISA)/lisa_overo_link.c \
$(SRC_LISA_ARCH)/lisa_overo_link_arch.c
conf/firmwares/lisa_test_progs.makefile
+1 -15
View File
@@ -274,8 +274,6 @@ IMU_B2_CFLAGS = -DIMU_TYPE_H=\"subsystems/imu/imu_b2.h\"
IMU_B2_CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2100 -DIMU_B2_VERSION_1_1
IMU_B2_SRCS = $(SRC_SUBSYSTEMS)/imu.c
IMU_B2_SRCS += math/pprz_trig_int.c
IMU_B2_CFLAGS += -DMAX_1168_DRDY_PORT=$(MAX_1168_DRDY_PORT)
IMU_B2_CFLAGS += -DMAX_1168_DRDY_PORT_SOURCE=$(MAX_1168_DRDY_PORT_SOURCE)
IMU_B2_CFLAGS += -DUSE_SPI -DSPI_MASTER -DUSE_SPI1 -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2100 -DIMU_B2_VERSION_1_1 -DUSE_SPI_SLAVE1
IMU_B2_SRCS += $(SRC_SUBSYSTEMS)/imu/imu_b2.c
IMU_B2_SRCS += peripherals/max1168.c $(SRC_ARCH)/peripherals/max1168_arch.c
@@ -301,15 +299,12 @@ IMU_B2_2_CFLAGS = -DIMU_TYPE_H=\"subsystems/imu/imu_b2.h\"
IMU_B2_2_CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_HMC5843 -DIMU_B2_VERSION_1_2
IMU_B2_2_SRCS = $(SRC_SUBSYSTEMS)/imu.c
IMU_B2_2_SRCS += math/pprz_trig_int.c
IMU_B2_2_CFLAGS += -DMAX_1168_DRDY_PORT=$(MAX_1168_DRDY_PORT)
IMU_B2_2_CFLAGS += -DMAX_1168_DRDY_PORT_SOURCE=$(MAX_1168_DRDY_PORT_SOURCE)
IMU_B2_2_CFLAGS += -DUSE_SPI -DSPI_MASTER -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ -DUSE_SPI2_IRQ
IMU_B2_2_CFLAGS += -DUSE_SPI -DSPI_MASTER -DUSE_SPI2
IMU_B2_2_SRCS += $(SRC_SUBSYSTEMS)/imu/imu_b2.c $(SRC_ARCH)/subsystems/imu/imu_b2_arch.c
IMU_B2_2_SRCS += peripherals/max1168.c $(SRC_ARCH)/peripherals/max1168_arch.c
IMU_B2_2_CFLAGS += -DUSE_I2C2
IMU_B2_2_SRCS += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
IMU_B2_2_SRCS += peripherals/hmc5843.c $(SRC_ARCH)/peripherals/hmc5843_arch.c
IMU_B2_2_CFLAGS += -DUSE_EXTI9_5_IRQ # Mag Int on PB5
IMU_B2_2_SRCS += mcu_periph/spi.c $(SRC_ARCH)/mcu_periph/spi_arch.c
test_imu_b2_2.ARCHDIR = $(ARCH)
@@ -336,10 +331,6 @@ IMU_ASPIRIN_SRCS += math/pprz_trig_int.c
IMU_ASPIRIN_SRCS += peripherals/hmc5843.c $(SRC_ARCH)/peripherals/hmc5843_arch.c
IMU_ASPIRIN_CFLAGS += -DUSE_I2C2
IMU_ASPIRIN_SRCS += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
IMU_ASPIRIN_CFLAGS += -DUSE_EXTI15_10_IRQ # Gyro Int on PC14
IMU_ASPIRIN_CFLAGS += -DUSE_EXTI9_5_IRQ # Mag Int on PB5
IMU_ASPIRIN_CFLAGS += -DUSE_EXTI2_IRQ # Accel Int on PD2
IMU_ASPIRIN_CFLAGS += -DUSE_DMA1_C4_IRQ # SPI2 Rx DMA
test_imu_aspirin.ARCHDIR = $(ARCH)
test_imu_aspirin.srcs = test/subsystems/test_imu.c
@@ -436,7 +427,6 @@ test_hmc5843.CFLAGS += -I$(SRC_LISA)
test_hmc5843.srcs += lisa/test/lisa_test_hmc5843.c
test_hmc5843.CFLAGS += -DUSE_I2C2
test_hmc5843.srcs += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
test_hmc5843.CFLAGS += -DUSE_EXTI9_5_IRQ # Mag Int on PB5
#
@@ -452,7 +442,6 @@ test_itg3200.CFLAGS += -I$(SRC_LISA)
test_itg3200.srcs += lisa/test/lisa_test_itg3200.c
test_itg3200.CFLAGS += -DUSE_I2C2
test_itg3200.srcs += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
test_itg3200.CFLAGS += -DUSE_EXTI15_10_IRQ # Gyro Int on PC14
#
@@ -466,8 +455,6 @@ test_adxl345.srcs += $(COMMON_TELEMETRY_SRCS)
test_adxl345.CFLAGS += -I$(SRC_LISA)
test_adxl345.srcs += lisa/test/lisa_test_adxl345_dma.c
test_adxl345.CFLAGS += -DUSE_EXTI2_IRQ # Accel Int on PD2
test_adxl345.CFLAGS += -DUSE_DMA1_C4_IRQ # SPI2 Rx DMA
@@ -548,7 +535,6 @@ test_actuators_asctecv1.srcs += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_ar
#test_bmp085.srcs += lisa/test/lisa_test_bmp085.c
#test_bmp085.CFLAGS += -DUSE_I2C2
#test_bmp085.srcs += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
##test_bmp085.CFLAGS += -DUSE_EXTI9_5_IRQ # Mag Int on PB5
conf/firmwares/subsystems/lisa_passthrough/imu_b2_v1.1.makefile
+1 -8
View File
@@ -34,11 +34,6 @@
#
#
#
# param: MAX_1168_DRDY_PORT
# imu Booz2 v1.1
imu_CFLAGS += -DIMU_TYPE_H=\"subsystems/imu/imu_b2.h\"
@@ -58,9 +53,7 @@ imu_CFLAGS += -DSSP_VIC_SLOT=9
imu_CFLAGS += -DMAX1168_EOC_VIC_SLOT=8
imu_CFLAGS += -DMS2100_DRDY_VIC_SLOT=11
else ifeq ($(ARCH), stm32)
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)
imu_CFLAGS += -DUSE_SPI2
endif
# Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
conf/firmwares/subsystems/lisa_passthrough/imu_b2_v1.2.makefile
+2 -9
View File
@@ -34,11 +34,6 @@
#
#
#
# param: MAX_1168_DRDY_PORT
# imu Booz2 v1.2
imu_CFLAGS += -DIMU_TYPE_H=\"subsystems/imu/imu_b2.h\"
@@ -59,10 +54,8 @@ imu_CFLAGS += -DMAX1168_EOC_VIC_SLOT=8
#FIXME ms2100 not used on this imu
imu_CFLAGS += -DMS2100_DRDY_VIC_SLOT=11
else ifeq ($(ARCH), stm32)
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)
imu_CFLAGS += -DUSE_I2C2 -DUSE_EXTI9_5_IRQ
imu_CFLAGS += -DUSE_SPI2
imu_CFLAGS += -DUSE_I2C2
endif
# Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
conf/firmwares/subsystems/rotorcraft/imu_crista_hmc5843.makefile
+1 -1
View File
@@ -73,7 +73,7 @@ ifeq ($(ARCH), lpc21)
imu_CFLAGS += -DUSE_I2C1
imu_CFLAGS += -DI2C1_SCLL=150 -DI2C1_SCLH=150 -DI2C1_VIC_SLOT=12 -DI2C1_BUF_LEN=16
else ifeq ($(ARCH), stm32)
imu_CFLAGS += -DUSE_I2C2 -DUSE_EXTI9_5_IRQ -DUSE_DMA1_C4_IRQ
imu_CFLAGS += -DUSE_I2C2
endif
# Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
conf/firmwares/subsystems/shared/imu_aspirin_common.makefile
-5
View File
@@ -37,11 +37,6 @@ IMU_ASPIRIN_CFLAGS += -DUSE_I2C2
ifeq ($(ARCH), lpc21)
$(error The aspirin subsystem (using SPI) is currently not implemnented for the lpc21. Please use the aspirin_i2c subsystem.)
else ifeq ($(ARCH), stm32)
IMU_ASPIRIN_CFLAGS += -DUSE_EXTI15_10_IRQ # Gyro Int on PC14
IMU_ASPIRIN_CFLAGS += -DUSE_EXTI9_5_IRQ # Mag Int on PB5
IMU_ASPIRIN_CFLAGS += -DUSE_EXTI2_IRQ # Accel Int on PD2
IMU_ASPIRIN_CFLAGS += -DUSE_DMA1_C4_IRQ # SPI2 Rx DMA
endif
include $(CFG_SHARED)/imu_nps.makefile
conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
-1
View File
@@ -50,7 +50,6 @@ ifeq ($(ARCH), lpc21)
#TODO
$(error Not implemented for the LCP21x yet. Needs the new SPI mcu_periph. See issue 147!)
else ifeq ($(ARCH), stm32)
IMU_ASPIRIN_CFLAGS += -DUSE_DMA1_C4_IRQ # SPI2 Rx DMA
IMU_ASPIRIN_CFLAGS += -DUSE_SPI2
endif
conf/firmwares/subsystems/shared/imu_b2_common.makefile
+1 -3
View File
@@ -55,9 +55,7 @@ imu_CFLAGS += -DSSP_VIC_SLOT=9
imu_CFLAGS += -DMAX1168_EOC_VIC_SLOT=8
else ifeq ($(ARCH), stm32)
#FIXME: untested
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)
imu_CFLAGS += -DUSE_SPI2
endif
conf/firmwares/subsystems/shared/imu_b2_v1.0.makefile
+1 -1
View File
@@ -52,7 +52,7 @@ ifeq ($(ARCH), lpc21)
imu_CFLAGS += -DUSE_I2C1 -DI2C1_SCLL=150 -DI2C1_SCLH=150 -DI2C1_VIC_SLOT=12
else ifeq ($(ARCH), stm32)
#FIXME: untested
imu_CFLAGS += -DUSE_I2C2 -DUSE_EXTI9_5_IRQ
imu_CFLAGS += -DUSE_I2C2
endif
endif #NO_MAG
conf/firmwares/subsystems/shared/imu_b2_v1.1.makefile
-5
View File
@@ -35,10 +35,6 @@
#
#
#
# param: MAX_1168_DRDY_PORT
# common Booz2 IMU files
include $(CFG_SHARED)/imu_b2_common.makefile
@@ -53,7 +49,6 @@ imu_srcs += $(SRC_ARCH)/peripherals/ms2100_arch.c
ifeq ($(ARCH), lpc21)
imu_CFLAGS += -DMS2100_DRDY_VIC_SLOT=12
else ifeq ($(ARCH), stm32)
endif
# Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
conf/firmwares/subsystems/shared/imu_b2_v1.2.makefile
+1 -5
View File
@@ -35,10 +35,6 @@
#
#
#
# param: MAX_1168_DRDY_PORT
# common Booz2 IMU files
include $(CFG_SHARED)/imu_b2_common.makefile
@@ -54,7 +50,7 @@ else ifeq ($(ARCH), stm32)
imu_CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_HMC5843
imu_srcs += peripherals/hmc5843.c
imu_srcs += $(SRC_ARCH)/peripherals/hmc5843_arch.c
imu_CFLAGS += -DUSE_I2C2 -DUSE_EXTI9_5_IRQ
imu_CFLAGS += -DUSE_I2C2
endif
# Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
conf/firmwares/subsystems/shared/imu_yai.makefile
-3
View File
@@ -26,9 +26,6 @@
#
#
#
# param: MAX_1168_DRDY_PORT
# common Booz2 IMU files
include $(CFG_SHARED)/imu_b2_common.makefile
conf/modules/vehicle_interface_overo_link.xml
-1
View File
@@ -23,7 +23,6 @@
<define name="OVERO_LINK_MSG_DOWN" value="AutopilotMessageVIDown"/>
<define name="OVERO_LINK_LED_OK" value="3"/>
<define name="OVERO_LINK_LED_KO" value="2"/>
<define name="USE_DMA1_C2_IRQ"/>
</makefile>
</module>