rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for new BMP280 barometer, modified files

This commit is contained in:
Richard Lehey 2015-06-02 01:53:05 +09:00 committed by borisbstyle
parent 105910b25a
commit 637fd64f36
11 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -297,6 +297,7 @@ NAZE_SRC = startup_stm32f10x_md_gcc.S \
drivers/adc.c \ drivers/adc.c \
drivers/adc_stm32f10x.c \ drivers/adc_stm32f10x.c \
drivers/barometer_bmp085.c \ drivers/barometer_bmp085.c \
drivers/barometer_bmp280.c \
drivers/barometer_ms5611.c \ drivers/barometer_ms5611.c \
drivers/bus_spi.c \ drivers/bus_spi.c \
drivers/bus_i2c_stm32f10x.c \ drivers/bus_i2c_stm32f10x.c \
@ -338,6 +339,7 @@ EUSTM32F103RC_SRC = startup_stm32f10x_hd_gcc.S \
drivers/adc.c \ drivers/adc.c \
drivers/adc_stm32f10x.c \ drivers/adc_stm32f10x.c \
drivers/barometer_bmp085.c \ drivers/barometer_bmp085.c \
drivers/barometer_bmp280.c \
drivers/barometer_ms5611.c \ drivers/barometer_ms5611.c \
drivers/bus_i2c_stm32f10x.c \ drivers/bus_i2c_stm32f10x.c \
drivers/bus_spi.c \ drivers/bus_spi.c \
@ -372,6 +374,7 @@ OLIMEXINO_SRC = startup_stm32f10x_md_gcc.S \
drivers/adc.c \ drivers/adc.c \
drivers/adc_stm32f10x.c \ drivers/adc_stm32f10x.c \
drivers/barometer_bmp085.c \ drivers/barometer_bmp085.c \
drivers/barometer_bmp280.c \
drivers/bus_i2c_stm32f10x.c \ drivers/bus_i2c_stm32f10x.c \
drivers/bus_spi.c \ drivers/bus_spi.c \
drivers/compass_hmc5883l.c \ drivers/compass_hmc5883l.c \
@ -432,6 +435,7 @@ CC3D_SRC = \
drivers/adc.c \ drivers/adc.c \
drivers/adc_stm32f10x.c \ drivers/adc_stm32f10x.c \
drivers/barometer_bmp085.c \ drivers/barometer_bmp085.c \
drivers/barometer_bmp280.c \
drivers/barometer_ms5611.c \ drivers/barometer_ms5611.c \
drivers/bus_spi.c \ drivers/bus_spi.c \
drivers/bus_i2c_stm32f10x.c \ drivers/bus_i2c_stm32f10x.c \
@ -502,6 +506,7 @@ STM32F3DISCOVERY_SRC = \
drivers/accgyro_mpu6050.c \ drivers/accgyro_mpu6050.c \
drivers/accgyro_l3g4200d.c \ drivers/accgyro_l3g4200d.c \
drivers/barometer_ms5611.c \ drivers/barometer_ms5611.c \
drivers/barometer_bmp280.c \
drivers/compass_ak8975.c \ drivers/compass_ak8975.c \
$(HIGHEND_SRC) \ $(HIGHEND_SRC) \
$(COMMON_SRC) $(COMMON_SRC)
@ -528,6 +533,7 @@ SPARKY_SRC = \
drivers/display_ug2864hsweg01.c \ drivers/display_ug2864hsweg01.c \
drivers/accgyro_mpu6050.c \ drivers/accgyro_mpu6050.c \
drivers/barometer_ms5611.c \ drivers/barometer_ms5611.c \
drivers/barometer_bmp280.c \
drivers/compass_ak8975.c \ drivers/compass_ak8975.c \
drivers/serial_usb_vcp.c \ drivers/serial_usb_vcp.c \
$(HIGHEND_SRC) \ $(HIGHEND_SRC) \
@ -541,6 +547,7 @@ SPRACINGF3_SRC = \
drivers/accgyro_mpu6050.c \ drivers/accgyro_mpu6050.c \
drivers/barometer_ms5611.c \ drivers/barometer_ms5611.c \
drivers/compass_ak8975.c \ drivers/compass_ak8975.c \
drivers/barometer_bmp280.c \
drivers/compass_hmc5883l.c \ drivers/compass_hmc5883l.c \
drivers/display_ug2864hsweg01.h \ drivers/display_ug2864hsweg01.h \
drivers/flash_m25p16.c \ drivers/flash_m25p16.c \

3
src/main/sensors/barometer.h
View File

@ -21,7 +21,8 @@ typedef enum {
BARO_NONE = 0, BARO_NONE = 0,
BARO_DEFAULT = 1, BARO_DEFAULT = 1,
BARO_BMP085 = 2, BARO_BMP085 = 2,
BARO_MS5611 = 3 BARO_MS5611 = 3,
BARO_BMP280 = 4
} baroSensor_e; } baroSensor_e;
#define BARO_SAMPLE_COUNT_MAX 48 #define BARO_SAMPLE_COUNT_MAX 48

9
src/main/sensors/initialisation.c
View File

@ -42,6 +42,7 @@
#include "drivers/barometer.h" #include "drivers/barometer.h"
#include "drivers/barometer_bmp085.h" #include "drivers/barometer_bmp085.h"
#include "drivers/barometer_bmp280.h"
#include "drivers/barometer_ms5611.h" #include "drivers/barometer_ms5611.h"
#include "drivers/compass.h" #include "drivers/compass.h"
@ -456,6 +457,14 @@ static void detectBaro()
baroHardware = BARO_BMP085; baroHardware = BARO_BMP085;
break; break;
} }
#endif
; // fallthough
case BARO_BMP280:
#ifdef USE_BARO_BMP280
if (bmp280Detect(&baro)) {
baroHardware = BARO_BMP280;
break;
}
#endif #endif
case BARO_NONE: case BARO_NONE:
baroHardware = BARO_NONE; baroHardware = BARO_NONE;

1
src/main/target/CC3D/target.h
View File

@ -58,6 +58,7 @@
#define BARO #define BARO
#define USE_BARO_MS5611 #define USE_BARO_MS5611
#define USE_BARO_BMP085 #define USE_BARO_BMP085
#define USE_BARO_BMP280
// External I2C MAG // External I2C MAG
#define MAG #define MAG

1
src/main/target/CHEBUZZF3/target.h
View File

@ -58,6 +58,7 @@
#define BARO #define BARO
#define USE_BARO_MS5611 #define USE_BARO_MS5611
#define USE_BARO_BMP280
#define MAG #define MAG
#define USE_MAG_AK8975 #define USE_MAG_AK8975

1
src/main/target/EUSTM32F103RC/target.h
View File

@ -65,6 +65,7 @@
#define BARO #define BARO
#define USE_BARO_MS5611 #define USE_BARO_MS5611
#define USE_BARO_BMP085 #define USE_BARO_BMP085
#define USE_BARO_BMP280
#define MAG #define MAG
#define USE_MAG_HMC5883 #define USE_MAG_HMC5883

1
src/main/target/NAZE/target.h
View File

@ -107,6 +107,7 @@
#define BARO #define BARO
#define USE_BARO_MS5611 #define USE_BARO_MS5611
#define USE_BARO_BMP085 #define USE_BARO_BMP085
#define USE_BARO_BMP280
#define MAG #define MAG
#define USE_MAG_HMC5883 #define USE_MAG_HMC5883

1
src/main/target/OLIMEXINO/target.h
View File

@ -59,6 +59,7 @@
#define BARO #define BARO
//#define USE_BARO_MS5611 //#define USE_BARO_MS5611
#define USE_BARO_BMP085 #define USE_BARO_BMP085
#define USE_BARO_BMP280
#define MAG #define MAG
#define USE_MAG_HMC5883 #define USE_MAG_HMC5883

1
src/main/target/PORT103R/target.h
View File

@ -88,6 +88,7 @@
#define BARO #define BARO
#define USE_BARO_MS5611 #define USE_BARO_MS5611
#define USE_BARO_BMP085 #define USE_BARO_BMP085
#define USE_BARO_BMP280
#define MAG #define MAG
#define USE_MAG_HMC5883 #define USE_MAG_HMC5883

1
src/main/target/SPARKY/target.h
View File

@ -41,6 +41,7 @@
#define BARO #define BARO
#define USE_BARO_MS5611 #define USE_BARO_MS5611
#define USE_BARO_BMP280
#define MAG #define MAG
#define USE_MAG_AK8975 #define USE_MAG_AK8975

1
src/main/target/SPRACINGF3/target.h
View File

@ -49,6 +49,7 @@
#define BARO #define BARO
#define USE_BARO_MS5611 #define USE_BARO_MS5611
#define USE_BARO_BMP280
#define MAG #define MAG
#define USE_MAG_AK8975 #define USE_MAG_AK8975