From 3bec1576baa41228140824d20dc27743fa259288 Mon Sep 17 00:00:00 2001
From: Bruce Luckcuck <github@etracer.net>
Date: Wed, 28 Aug 2019 09:09:30 -0400
Subject: [PATCH] Add missing baro support for target FURYF4OSD

---
 src/main/target/FURYF4/target.h  | 45 ++++++++++++++++----------------
 src/main/target/FURYF4/target.mk |  6 ++---
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index 780a2721e4..41bd694827 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -21,11 +21,11 @@
 #pragma once
 
 #ifdef FURYF4OSD
-    #define TARGET_BOARD_IDENTIFIER "FY4O"
-    #define USBD_PRODUCT_STRING     "FuryF4OSD"
+#define TARGET_BOARD_IDENTIFIER "FY4O"
+#define USBD_PRODUCT_STRING     "FuryF4OSD"
 #else
-    #define TARGET_BOARD_IDENTIFIER "FYF4"
-    #define USBD_PRODUCT_STRING     "FuryF4"
+#define TARGET_BOARD_IDENTIFIER "FYF4"
+#define USBD_PRODUCT_STRING     "FuryF4"
 #endif
 
 #define LED0_PIN                PB5
@@ -57,30 +57,31 @@
 #define USE_ACC_SPI_MPU6500
 #define USE_ACC_SPI_ICM20689
 
+#define USE_BARO
+#define USE_BARO_MS5611
+#define USE_BARO_BMP280
+#define MS5611_I2C_INSTANCE     I2CDEV_1
+
 #ifdef FURYF4OSD
-    #define USE_MAX7456
-    #define MAX7456_SPI_INSTANCE    SPI2
-    #define MAX7456_SPI_CS_PIN      PB12
+#define USE_MAX7456
+#define MAX7456_SPI_INSTANCE    SPI2
+#define MAX7456_SPI_CS_PIN      PB12
 
-    #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
+#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
 
-    #define DEFAULT_FEATURES        FEATURE_OSD
+#define DEFAULT_FEATURES        FEATURE_OSD
 
 #else
 
-    #define USE_BARO
-    #define USE_BARO_MS5611
-    #define MS5611_I2C_INSTANCE     I2CDEV_1
-
-    #define USE_SDCARD
-    #define USE_SDCARD_SPI
-    #define SDCARD_DETECT_INVERTED
-    #define SDCARD_DETECT_PIN                   PD2
-    #define SDCARD_SPI_INSTANCE                 SPI2
-    #define SDCARD_SPI_CS_PIN                   PB12
-    #define SPI2_TX_DMA_OPT                     0     // DMA 1 Stream 4 Channel 0
-    #define SPI2_TX_DMA_OPT                     0     // DMA 1 Stream 4 Channel 0
-    #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
+#define USE_SDCARD
+#define USE_SDCARD_SPI
+#define SDCARD_DETECT_INVERTED
+#define SDCARD_DETECT_PIN                   PD2
+#define SDCARD_SPI_INSTANCE                 SPI2
+#define SDCARD_SPI_CS_PIN                   PB12
+#define SPI2_TX_DMA_OPT                     0     // DMA 1 Stream 4 Channel 0
+#define SPI2_TX_DMA_OPT                     0     // DMA 1 Stream 4 Channel 0
+#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
 #endif
 
diff --git a/src/main/target/FURYF4/target.mk b/src/main/target/FURYF4/target.mk
index 707a725aa7..6be1291c14 100644
--- a/src/main/target/FURYF4/target.mk
+++ b/src/main/target/FURYF4/target.mk
@@ -14,7 +14,7 @@ TARGET_SRC = \
 ifeq ($(TARGET), FURYF4OSD)
 TARGET_SRC += \
             drivers/max7456.c
-else
-TARGET_SRC += \
-            drivers/barometer/barometer_ms5611.c
 endif
+TARGET_SRC += \
+            drivers/barometer/barometer_ms5611.c \
+            drivers/barometer/barometer_bmp280.c