From 6c9a2badd74d39b7dea0e3c43f76193ba2b0dd31 Mon Sep 17 00:00:00 2001 From: kevindehecker Date: Tue, 22 Mar 2016 14:57:55 +0100 Subject: [PATCH] Baro is on spi --- conf/firmwares/subsystems/shared/baro_board.makefile | 11 +++++++---- sw/airborne/boards/px4fmu/baro_board.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/conf/firmwares/subsystems/shared/baro_board.makefile b/conf/firmwares/subsystems/shared/baro_board.makefile index 096a079e4f..5c49b6bb8c 100644 --- a/conf/firmwares/subsystems/shared/baro_board.makefile +++ b/conf/firmwares/subsystems/shared/baro_board.makefile @@ -168,11 +168,14 @@ else ifeq ($(BOARD), krooz) # PX4FMU else ifeq ($(BOARD),$(filter $(BOARD),px4fmu)) - BARO_BOARD_CFLAGS += -DUSE_I2C2 - BARO_BOARD_CFLAGS += -DBB_MS5611_I2C_DEV=i2c2 + + 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 + BARO_BOARD_SRCS += peripherals/ms5611.c - BARO_BOARD_SRCS += peripherals/ms5611_i2c.c - BARO_BOARD_SRCS += boards/baro_board_ms5611_i2c.c + BARO_BOARD_SRCS += peripherals/ms5611_spi.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_spi.c # apogee baro else ifeq ($(BOARD), apogee) diff --git a/sw/airborne/boards/px4fmu/baro_board.h b/sw/airborne/boards/px4fmu/baro_board.h index 7cdd39b856..11d42e601a 100644 --- a/sw/airborne/boards/px4fmu/baro_board.h +++ b/sw/airborne/boards/px4fmu/baro_board.h @@ -8,7 +8,7 @@ #define BOARDS_PX4FMU_BARO_H // only for printing the baro type during compilation -#define BARO_BOARD BARO_BOARD_MS5611_I2C +#define BARO_BOARD BARO_BOARD_MS5611_SPI extern void baro_event(void);