Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FURYF4OSD] / [RUSHBLADEF7] Add BMP280 Support #671

Merged
merged 7 commits into from
Aug 17, 2021
Merged

[FURYF4OSD] / [RUSHBLADEF7] Add BMP280 Support #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
567bb7c
Add Baro Support
JulioCesarMatias Aug 13, 2021
b5594a5
fix
JulioCesarMatias Aug 14, 2021
a57a068
fix
JulioCesarMatias Aug 14, 2021
a500f03
fix2
JulioCesarMatias Aug 14, 2021
f150725
fix3
JulioCesarMatias Aug 14, 2021
1436860
RUSHBLADEF7 BMP280
JulioCesarMatias Aug 16, 2021
bd385cb
Merge branch 'master' into BMP280FuryF4OSD
nerdCopter Aug 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/main/target/FURYF4/target.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -88,10 +93,6 @@

#else

#define USE_BARO
#define USE_BARO_MS5611
#define MS5611_I2C_INSTANCE I2CDEV_1

#define USE_SDCARD

#define SDCARD_DETECT_INVERTED
Expand Down Expand Up @@ -184,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) )
7 changes: 4 additions & 3 deletions src/main/target/FURYF4/target.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ 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
1 change: 1 addition & 0 deletions src/main/target/RUSHBLADEF7/target.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#define USE_GYRO_SPI_MPU6000

#define USE_BARO
#define USE_BARO_BMP280
#define USE_BARO_MS5611

#define USE_MAG
Expand Down
2 changes: 1 addition & 1 deletion src/main/target/RUSHBLADEF7/target.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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