Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 04:46:51 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

fix baro on px4fmu_1.7

Browse Source
This commit is contained in:
Felix Ruess
2017-01-16 22:19:40 +01:00
parent 7a0dcce0fb
commit faf278bb37
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/firmwares/subsystems/shared/baro_board.makefile
+11 -12
View File
@@ -168,26 +168,25 @@ else ifeq ($(BOARD), krooz)
# PX4FMU # PX4FMU
else ifeq ($(BOARD),$(filter $(BOARD),px4fmu)) else ifeq ($(BOARD),$(filter $(BOARD),px4fmu))
ifeq ($(BOARD_VERSION), 2.4) include $(CFG_SHARED)/spi_master.makefile
# PX4FMU 2.4 a.k.a. PIXHAWK BARO_BOARD_SRCS += peripherals/ms5611.c
include $(CFG_SHARED)/spi_master.makefile BARO_BOARD_SRCS += peripherals/ms5611_spi.c
BARO_BOARD_SRCS += boards/baro_board_ms5611_spi.c
ifeq ($(BOARD_VERSION), 1.7)
# PX4FMU 1.7
BARO_BOARD_CFLAGS += -DUSE_SPI1 -DUSE_SPI_SLAVE3
BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi1
BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3
else ifeq ($(BOARD_VERSION), 2.4)
# PX4FMU 2.4 a.k.a. PIXHAWK
BARO_BOARD_CFLAGS += -DUSE_SPI1 -DUSE_SPI_SLAVE3 BARO_BOARD_CFLAGS += -DUSE_SPI1 -DUSE_SPI_SLAVE3
BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi1 BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi1
BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3 BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3
BARO_BOARD_SRCS += peripherals/ms5611.c
BARO_BOARD_SRCS += peripherals/ms5611_spi.c
BARO_BOARD_SRCS += boards/baro_board_ms5611_spi.c
else ifeq ($(BOARD_VERSION), 4.0) else ifeq ($(BOARD_VERSION), 4.0)
# PX4FMU 4.0 a.k.a. PX4_PIXRACER # PX4FMU 4.0 a.k.a. PX4_PIXRACER
include $(CFG_SHARED)/spi_master.makefile
BARO_BOARD_CFLAGS += -DUSE_SPI2 -DUSE_SPI_SLAVE3 BARO_BOARD_CFLAGS += -DUSE_SPI2 -DUSE_SPI_SLAVE3
BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi2 BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi2
BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3 BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3
BARO_BOARD_SRCS += peripherals/ms5611.c
BARO_BOARD_SRCS += peripherals/ms5611_spi.c
BARO_BOARD_SRCS += boards/baro_board_ms5611_spi.c
endif endif
# apogee baro # apogee baro
else ifeq ($(BOARD), apogee) else ifeq ($(BOARD), apogee)