Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[baro] some ms5611 cleanup

Browse Source 
- move ms5611 baro board wrappers to boards dir
- no defaults devices for baro_board_ms5611_x wrappers
- rename MS5611_SLAVE_DEV to MS5611_SLAVE_IDX
This commit is contained in:
Felix Ruess
2013-09-05 21:32:40 +02:00
parent 1e50aacf20
commit 5e4f494806
5 changed files with 35 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/firmwares/subsystems/shared/baro_board.makefile
+23 -18
View File
@@ -23,32 +23,33 @@ LISA_M_BARO ?= BARO_BOARD_BMP085
ifeq ($(LISA_M_BARO), BARO_MS5611_SPI)
include $(CFG_SHARED)/spi_master.makefile
ap.CFLAGS += -DUSE_SPI2 -DUSE_SPI_SLAVE3
ap.CFLAGS += -DBB_MS5611_SPI_DEV=spi2
ap.CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3
ap.srcs += peripherals/ms5611.c
ap.srcs += peripherals/ms5611_spi.c
ap.srcs += subsystems/sensors/baro_ms5611_spi.c
ap.srcs += boards/baro_board_ms5611_spi.c
else ifeq ($(LISA_M_BARO), BARO_MS5611_I2C)
ap.CFLAGS += -DUSE_I2C2
ap.CFLAGS += -DBB_MS5611_I2C_DEV=i2c2
ap.srcs += peripherals/ms5611.c
ap.srcs += peripherals/ms5611_i2c.c
ap.srcs += subsystems/sensors/baro_ms5611_i2c.c
ap.srcs += boards/baro_board_ms5611_i2c.c
else ifeq ($(LISA_M_BARO), BARO_BOARD_BMP085)
ap.srcs += peripherals/bmp085.c
ap.srcs += $(SRC_BOARD)/baro_board.c
ap.CFLAGS += -DUSE_I2C2
ap.srcs += peripherals/bmp085.c
ap.srcs += $(SRC_BOARD)/baro_board.c
endif
ap.CFLAGS += -D$(LISA_M_BARO)
# Lisa/S baro
else ifeq ($(BOARD), lisa_s)
# defaults to SPI baro MS5611 on the board
include $(CFG_SHARED)/spi_master.makefile
ap.CFLAGS += -DUSE_SPI1 -DUSE_SPI_SLAVE1
ap.CFLAGS += -DMS5611_SPI_DEV=spi1
ap.CFLAGS += -DMS5611_SLAVE_DEV=SPI_SLAVE1
ap.CFLAGS += -DBB_MS5611_SPI_DEV=spi1
ap.CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE1
ap.srcs += peripherals/ms5611.c
ap.srcs += peripherals/ms5611_spi.c
ap.srcs += subsystems/sensors/baro_ms5611_spi.c
ap.CFLAGS += -DBARO_MS5611_SPI
ap.srcs += boards/baro_board_ms5611_spi.c
# Lia baro (no bmp onboard)
else ifeq ($(BOARD), lia)
@@ -57,16 +58,18 @@ LIA_BARO ?= BARO_MS5611_SPI
ifeq ($(LIA_BARO), BARO_MS5611_SPI)
include $(CFG_SHARED)/spi_master.makefile
ap.CFLAGS += -DUSE_SPI2 -DUSE_SPI_SLAVE3
ap.CFLAGS += -DBB_MS5611_SPI_DEV=spi2
ap.CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3
ap.srcs += peripherals/ms5611.c
ap.srcs += peripherals/ms5611_spi.c
ap.srcs += subsystems/sensors/baro_ms5611_spi.c
ap.srcs += boards/baro_board_ms5611_spi.c
else ifeq ($(LIA_BARO), BARO_MS5611_I2C)
ap.CFLAGS += -DUSE_I2C2
ap.CFLAGS += -DBB_MS5611_I2C_DEV=i2c2
ap.srcs += peripherals/ms5611.c
ap.srcs += peripherals/ms5611_i2c.c
ap.srcs += subsystems/sensors/baro_ms5611_i2c.c
ap.srcs += boards/baro_board_ms5611_i2c.c
endif
ap.CFLAGS += -D$(LIA_BARO)
# navgo baro
else ifeq ($(BOARD), navgo)
@@ -78,17 +81,19 @@ else ifeq ($(BOARD), navgo)
# krooz baro
else ifeq ($(BOARD), krooz)
ap.CFLAGS += -DMS5611_I2C_DEV=i2c2 -DMS5611_SLAVE_ADDR=0xEC
ap.CFLAGS += -DBB_MS5611_I2C_DEV=i2c2
ap.CFLAGS += -DBB_MS5611_SLAVE_ADDR=0xEC
ap.srcs += peripherals/ms5611.c
ap.srcs += peripherals/ms5611_i2c.c
ap.srcs += subsystems/sensors/baro_ms5611_i2c.c
ap.srcs += boards/baro_board_ms5611_i2c.c
# PX4FMU
else ifeq ($(BOARD), px4fmu)
ap.CFLAGS += -DUSE_I2C2 -DMS5611_I2C_DEV=i2c2
ap.CFLAGS += -DUSE_I2C2
ap.CFLAGS += -DBB_MS5611_I2C_DEV=i2c2
ap.srcs += peripherals/ms5611.c
ap.srcs += peripherals/ms5611_i2c.c
ap.srcs += subsystems/sensors/baro_ms5611_i2c.c
ap.srcs += boards/baro_board_ms5611_i2c.c
# apogee baro
else ifeq ($(BOARD), apogee)
@@ -101,10 +106,10 @@ else ifeq ($(BOARD), apogee)
# Umarim
else ifeq ($(BOARD), umarim)
ifeq ($(BOARD_VERSION), 1.0)
ap.srcs += boards/umarim/baro_board.c
ap.CFLAGS += -DUSE_I2C1 -DUSE_ADS1114_1
ap.CFLAGS += -DADS1114_I2C_DEV=i2c1
ap.srcs += peripherals/ads1114.c
ap.srcs += peripherals/ads1114.c
ap.srcs += boards/umarim/baro_board.c
endif
endif # End baro
conf/modules/baro_ms5611_spi.xml
+1 -1
View File
@@ -7,7 +7,7 @@
Measurement Specialties MS5611-01BA pressure sensor (SPI)
</description>
<define name="MS5611_SPI_DEV" value="spiX" description="select spi peripheral to use (default spi1)"/>
<define name="MS5611_SLAVE_DEV" value="SPI_SLAVE0" description="SPI slave select index"/>
<define name="MS5611_SLAVE_IDX" value="SPI_SLAVE0" description="SPI slave select index"/>
<define name="SENSOR_SYNC_SEND" description="flag to enable sending BARO_MS5611 message on every new measurement"/>
</doc>
<header>
sw/airborne/subsystems/sensors/baro_ms5611_i2c.c → sw/airborne/boards/baro_board_ms5611_i2c.c
+5 -9
View File
@@ -21,9 +21,9 @@
*/
/**
* @file subsystems/sensors/baro_ms5611_i2c.c
* @file boards/baro_board_ms5611_i2c.c
*
* Driver for MS5611 baro via I2C.
* Driver for onboard MS5611 baro via I2C.
*
*/
@@ -43,18 +43,14 @@
#include "subsystems/datalink/downlink.h"
#ifndef MS5611_I2C_DEV
#define MS5611_I2C_DEV i2c2
#endif
/* default i2c address
* when CSB is set to GND addr is 0xEE
* when CSB is set to VCC addr is 0xEC
*
* Note: Aspirin 2.1 has CSB bound to GND.
*/
#ifndef MS5611_SLAVE_ADDR
#define MS5611_SLAVE_ADDR 0xEE
#ifndef BB_MS5611_SLAVE_ADDR
#define BB_MS5611_SLAVE_ADDR 0xEE
#endif
@@ -66,7 +62,7 @@ struct Ms5611_I2c bb_ms5611;
void baro_init(void) {
ms5611_i2c_init(&bb_ms5611, &MS5611_I2C_DEV, MS5611_SLAVE_ADDR);
ms5611_i2c_init(&bb_ms5611, &BB_MS5611_I2C_DEV, BB_MS5611_SLAVE_ADDR);
#ifdef BARO_LED
LED_OFF(BARO_LED);
sw/airborne/subsystems/sensors/baro_ms5611_spi.c → sw/airborne/boards/baro_board_ms5611_spi.c
+3 -15
View File
@@ -21,9 +21,9 @@
*/
/**
* @file subsystems/sensors/baro_ms5611_spi.c
* @file boards/baro_board_ms5611_spi.c
*
* Driver for MS5611 baro on LisaM/Aspirin2.2 via SPI.
* Driver for onboard MS5611 baro via SPI.
*
*/
@@ -43,18 +43,6 @@
#include "subsystems/datalink/downlink.h"
#ifndef MS5611_SPI_DEV
#define MS5611_SPI_DEV spi2
#endif
/* SPI SLAVE3 is on pin PC13
* Aspirin 2.2 has ms5611 on SPI bus
*/
#ifndef MS5611_SLAVE_DEV
#define MS5611_SLAVE_DEV SPI_SLAVE3
#endif
#ifndef BARO_BOARD_MS5611_SENDER_ID
#define BARO_BOARD_MS5611_SENDER_ID 7
#endif
@@ -63,7 +51,7 @@ struct Ms5611_Spi bb_ms5611;
void baro_init(void) {
ms5611_spi_init(&bb_ms5611, &MS5611_SPI_DEV, MS5611_SLAVE_DEV);
ms5611_spi_init(&bb_ms5611, &BB_MS5611_SPI_DEV, BB_MS5611_SLAVE_IDX);
#ifdef BARO_LED
LED_OFF(BARO_LED);
sw/airborne/modules/sensors/baro_ms5611_spi.c
+3 -3
View File
@@ -47,8 +47,8 @@
#define MS5611_SPI_DEV spi1
#endif
#ifndef MS5611_SLAVE_DEV
#define MS5611_SLAVE_DEV SPI_SLAVE0
#ifndef MS5611_SLAVE_IDX
#define MS5611_SLAVE_IDX SPI_SLAVE0
#endif
@@ -64,7 +64,7 @@ float baro_ms5611_sigma2;
void baro_ms5611_init(void) {
ms5611_spi_init(&baro_ms5611, &MS5611_SPI_DEV, MS5611_SLAVE_DEV);
ms5611_spi_init(&baro_ms5611, &MS5611_SPI_DEV, MS5611_SLAVE_IDX);
baro_ms5611_enabled = TRUE;
baro_ms5611_alt_valid = FALSE;