From 567bb7cef63513d41d045361d878d798689831e5 Mon Sep 17 00:00:00 2001 From: JuliooCesarMDM Date: Fri, 13 Aug 2021 12:36:46 -0300 Subject: [PATCH 1/6] Add Baro Support --- src/main/target/FURYF4/target.h | 1 + src/main/target/FURYF4/target.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index 072a337a1a..8bab03ca19 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -89,6 +89,7 @@ #else #define USE_BARO +#define USE_BARO_BMP280 #define USE_BARO_MS5611 #define MS5611_I2C_INSTANCE I2CDEV_1 diff --git a/src/main/target/FURYF4/target.mk b/src/main/target/FURYF4/target.mk index 06b60c1c7f..8697ff48c2 100644 --- a/src/main/target/FURYF4/target.mk +++ b/src/main/target/FURYF4/target.mk @@ -16,5 +16,6 @@ TARGET_SRC += \ drivers/max7456.c else TARGET_SRC += \ - drivers/barometer/barometer_ms5611.c + drivers/barometer/barometer_ms5611.c \ + drivers/barometer/barometer_bmp280.c endif From b5594a5a1b90ecbeb29f200e30dafa07fab1e7f1 Mon Sep 17 00:00:00 2001 From: JuliooCesarMDM Date: Fri, 13 Aug 2021 23:21:29 -0300 Subject: [PATCH 2/6] fix --- src/main/target/FURYF4/target.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index 8bab03ca19..f8bff4f384 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -75,6 +75,11 @@ #define USE_ACC_SPI_MPU6500 #define ACC_MPU6500_ALIGN CW180_DEG +#define USE_BARO +#define USE_BARO_BMP280 +#define USE_BARO_MS5611 +#define MS5611_I2C_INSTANCE I2CDEV_1 + #ifdef FURYF4OSD #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 @@ -88,11 +93,6 @@ #else -#define USE_BARO -#define USE_BARO_BMP280 -#define USE_BARO_MS5611 -#define MS5611_I2C_INSTANCE I2CDEV_1 - #define USE_SDCARD #define SDCARD_DETECT_INVERTED From a57a068b636a95e8e9803629cf2df70c8a3dfd6b Mon Sep 17 00:00:00 2001 From: JuliooCesarMDM Date: Fri, 13 Aug 2021 23:32:36 -0300 Subject: [PATCH 3/6] fix --- src/main/target/FURYF4/target.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index f8bff4f384..151f9df034 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -185,4 +185,4 @@ #define TARGET_IO_PORTD (BIT(2)) #define USABLE_TIMER_CHANNEL_COUNT 7 -#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(8) | TIM_N(11) ) +#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(8) | TIM_N(11) ) \ No newline at end of file From a500f03c9011507983cbc34d94308a7de2e6c303 Mon Sep 17 00:00:00 2001 From: JuliooCesarMDM Date: Sat, 14 Aug 2021 00:03:14 -0300 Subject: [PATCH 4/6] fix2 --- src/main/target/FURYF4/target.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/target/FURYF4/target.mk b/src/main/target/FURYF4/target.mk index 8697ff48c2..3bc73b8a0d 100644 --- a/src/main/target/FURYF4/target.mk +++ b/src/main/target/FURYF4/target.mk @@ -13,7 +13,9 @@ TARGET_SRC = \ ifeq ($(TARGET), FURYF4OSD) TARGET_SRC += \ - drivers/max7456.c + drivers/max7456.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/barometer/barometer_bmp280.c else TARGET_SRC += \ drivers/barometer/barometer_ms5611.c \ From f150725b3bc4bd9dd477a35983056579649bd127 Mon Sep 17 00:00:00 2001 From: JuliooCesarMDM Date: Sat, 14 Aug 2021 00:11:33 -0300 Subject: [PATCH 5/6] fix3 --- src/main/target/FURYF4/target.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/target/FURYF4/target.mk b/src/main/target/FURYF4/target.mk index 3bc73b8a0d..ec0f1c4499 100644 --- a/src/main/target/FURYF4/target.mk +++ b/src/main/target/FURYF4/target.mk @@ -13,11 +13,8 @@ TARGET_SRC = \ ifeq ($(TARGET), FURYF4OSD) TARGET_SRC += \ - drivers/max7456.c \ - drivers/barometer/barometer_ms5611.c \ - drivers/barometer/barometer_bmp280.c -else + drivers/max7456.c +endif TARGET_SRC += \ drivers/barometer/barometer_ms5611.c \ drivers/barometer/barometer_bmp280.c -endif From 143686020aa49809fc9c054146e2051678192021 Mon Sep 17 00:00:00 2001 From: JuliooCesarMDM Date: Sun, 15 Aug 2021 21:07:03 -0300 Subject: [PATCH 6/6] RUSHBLADEF7 BMP280 --- src/main/target/FURYF4/target.mk | 1 + src/main/target/RUSHBLADEF7/target.h | 1 + src/main/target/RUSHBLADEF7/target.mk | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/target/FURYF4/target.mk b/src/main/target/FURYF4/target.mk index ec0f1c4499..526e9609f9 100644 --- a/src/main/target/FURYF4/target.mk +++ b/src/main/target/FURYF4/target.mk @@ -15,6 +15,7 @@ ifeq ($(TARGET), FURYF4OSD) TARGET_SRC += \ drivers/max7456.c endif + TARGET_SRC += \ drivers/barometer/barometer_ms5611.c \ drivers/barometer/barometer_bmp280.c diff --git a/src/main/target/RUSHBLADEF7/target.h b/src/main/target/RUSHBLADEF7/target.h index 61f1a5bbfb..8559f4f88d 100644 --- a/src/main/target/RUSHBLADEF7/target.h +++ b/src/main/target/RUSHBLADEF7/target.h @@ -54,6 +54,7 @@ #define USE_GYRO_SPI_MPU6000 #define USE_BARO +#define USE_BARO_BMP280 #define USE_BARO_MS5611 #define USE_MAG diff --git a/src/main/target/RUSHBLADEF7/target.mk b/src/main/target/RUSHBLADEF7/target.mk index 2d4fcd51a8..eb35ec20ee 100644 --- a/src/main/target/RUSHBLADEF7/target.mk +++ b/src/main/target/RUSHBLADEF7/target.mk @@ -4,7 +4,7 @@ FEATURES += VCP ONBOARDFLASH TARGET_SRC = \ drivers/accgyro/accgyro_mpu.c \ drivers/accgyro/accgyro_spi_mpu6000.c \ - drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_ms5611.c \ + drivers/barometer/barometer_bmp280.c \ drivers/compass/compass_hmc5883l.c \ drivers/max7456.c