Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 12:25:20 +03:00
Code Issues Wiki Activity

Merge pull request #8771 from etracer65/target_furyf4osd_add_baro

Browse source 
Add missing baro support for target FURYF4OSD
This commit is contained in:
Dominic Clifton 2019-08-30 01:04:56 +02:00 • committed by GitHub
commit 2d4b2f827b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/main/target/FURYF4/target.h
View file

@ -21,11 +21,11 @@
#pragma once #pragma once
#ifdef FURYF4OSD #ifdef FURYF4OSD
#define TARGET_BOARD_IDENTIFIER "FY4O" #define TARGET_BOARD_IDENTIFIER "FY4O"
#define USBD_PRODUCT_STRING "FuryF4OSD" #define USBD_PRODUCT_STRING "FuryF4OSD"
#else #else
#define TARGET_BOARD_IDENTIFIER "FYF4" #define TARGET_BOARD_IDENTIFIER "FYF4"
#define USBD_PRODUCT_STRING "FuryF4" #define USBD_PRODUCT_STRING "FuryF4"
#endif #endif
#define LED0_PIN PB5 #define LED0_PIN PB5
@ -57,30 +57,31 @@
#define USE_ACC_SPI_MPU6500 #define USE_ACC_SPI_MPU6500
#define USE_ACC_SPI_ICM20689 #define USE_ACC_SPI_ICM20689
#define USE_BARO
#define USE_BARO_MS5611
#define USE_BARO_BMP280
#define MS5611_I2C_INSTANCE I2CDEV_1
#ifdef FURYF4OSD #ifdef FURYF4OSD
#define USE_MAX7456 #define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN PB12 #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 #else
#define USE_BARO #define USE_SDCARD
#define USE_BARO_MS5611 #define USE_SDCARD_SPI
#define MS5611_I2C_INSTANCE I2CDEV_1 #define SDCARD_DETECT_INVERTED
#define SDCARD_DETECT_PIN PD2
#define USE_SDCARD #define SDCARD_SPI_INSTANCE SPI2
#define USE_SDCARD_SPI #define SDCARD_SPI_CS_PIN PB12
#define SDCARD_DETECT_INVERTED #define SPI2_TX_DMA_OPT 0 // DMA 1 Stream 4 Channel 0
#define SDCARD_DETECT_PIN PD2 #define SPI2_TX_DMA_OPT 0 // DMA 1 Stream 4 Channel 0
#define SDCARD_SPI_INSTANCE SPI2 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#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 #endif

6
src/main/target/FURYF4/target.mk
View file

@ -14,7 +14,7 @@ TARGET_SRC = \
ifeq ($(TARGET), FURYF4OSD) ifeq ($(TARGET), FURYF4OSD)
TARGET_SRC += \ TARGET_SRC += \
drivers/max7456.c drivers/max7456.c
else
TARGET_SRC += \
drivers/barometer/barometer_ms5611.c
endif endif
TARGET_SRC += \
drivers/barometer/barometer_ms5611.c \
drivers/barometer/barometer_bmp280.c