Merge branch 'master' into 20220612_3D_fix

emuflight · Jul 9, 2024 · b8aeb8a · b8aeb8a
2 parents af6cf5a + 560cdd7
commit b8aeb8a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/main/target/FLYCOLORF7/target.h b/src/main/target/FLYCOLORF7/target.h
@@ -31,6 +31,8 @@
 #define USE_GYRO_SPI_MPU6000
 #define USE_FLASH
 #define USE_FLASH_W25Q128FV
+#define USE_BARO
+#define USE_BARO_BMP280
 #define USE_MAX7456
 
 #define USE_VCP
@@ -105,6 +107,7 @@
 #define USE_I2C_DEVICE_1
 #define I2C_DEVICE_1      (I2CDEV_1)
 #define MAG_I2C_INSTANCE (I2CDEV_1)
+#define BARO_I2C_INSTANCE (I2CDEV_1)
 #define I2C1_SCL PB6
 #define I2C1_SDA PB7
 

diff --git a/src/main/target/FLYCOLORF7/target.mk b/src/main/target/FLYCOLORF7/target.mk
@@ -3,6 +3,7 @@ FEATURES       += VCP ONBOARDFLASH
 
 TARGET_SRC = \
 drivers/accgyro/accgyro_spi_mpu6000.c \
+drivers/barometer/barometer_bmp280.c \
 $(addprefix drivers/compass/,$(notdir $(wildcard $(SRC_DIR)/drivers/compass/*.c))) \
 drivers/light_led.h \
 drivers/light_ws2811strip.c \