1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-23 16:25:26 +03:00

Merge pull request #4747 from shellixyz/fix_omnibusf4_target_h

Fix OMNIBUSF4/target.h
This commit is contained in:
Konstantin Sharlaimov 2019-05-27 20:26:57 +02:00 committed by GitHub
commit 01d4c34bc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -69,22 +69,22 @@
#define MPU6000_CS_PIN PA4
#define MPU6000_SPI_BUS BUS_SPI1
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4V3)
#define USE_GYRO_MPU6000
#define GYRO_MPU6000_ALIGN CW270_DEG
#define USE_ACC_MPU6000
#define ACC_MPU6000_ALIGN CW270_DEG
#else
#if defined(DYSF4PRO) || defined(DYSF4PROV2)
#define USE_GYRO_MPU6000
#define GYRO_MPU6000_ALIGN CW180_DEG
#define USE_ACC_MPU6000
#define ACC_MPU6000_ALIGN CW180_DEG
#else
#define USE_GYRO_MPU6000
#define GYRO_MPU6000_ALIGN CW270_DEG
#define USE_ACC_MPU6000
#define ACC_MPU6000_ALIGN CW270_DEG
#endif
// Support for OMNIBUS F4 PRO CORNER - it has ICM20608 instead of MPU6000
#if defined (OMNIBUSF4PRO) || defined(OMNIBUSF4V3) || defined(OMNIBUSF4PRO_LEDSTRIPM5)
#if !defined(DYSF4PRO) && !defined(DYSF4PROV2)
#define MPU6500_CS_PIN MPU6000_CS_PIN
#define MPU6500_SPI_BUS MPU6000_SPI_BUS
@ -110,7 +110,12 @@
#define USE_BARO
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4V3)
#if defined(DYSF4PRO) || defined(DYSF4PROV2)
#define BARO_I2C_BUS I2C_EXT_BUS
#define USE_BARO_BMP085
#define USE_BARO_BMP280
#define USE_BARO_MS5611
#else
#define USE_BARO_BMP280
#define BMP280_SPI_BUS BUS_SPI3
#define BMP280_CS_PIN PB3 // v1
@ -119,11 +124,6 @@
#define BARO_I2C_BUS I2C_EXT_BUS
#define USE_BARO_BMP085
#define USE_BARO_MS5611
#else
#define BARO_I2C_BUS I2C_EXT_BUS
#define USE_BARO_BMP085
#define USE_BARO_BMP280
#define USE_BARO_MS5611
#endif
#define PITOT_I2C_BUS I2C_EXT_BUS
@ -141,7 +141,7 @@
#define UART1_RX_PIN PA10
#define UART1_TX_PIN PA9
#define UART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2
#if !defined(OMNIBUSF4V3)
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4PRO_LEDSTRIPM5)
#define INVERTER_PIN_UART1_RX PC0 // PC0 has never been used as inverter control on genuine OMNIBUS F4 variants, but leave it as is since some clones actually implement it.
#endif
@ -152,7 +152,7 @@
#define USE_UART6
#define UART6_RX_PIN PC7
#define UART6_TX_PIN PC6
#if defined(OMNIBUSF4V3)
#if defined(OMNIBUSF4V3) || defined(OMNIBUSF4V3_S6_SS) || defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS)
#define INVERTER_PIN_UART6_RX PC8
#define INVERTER_PIN_UART6_TX PC9
#endif
@ -201,7 +201,7 @@
#define USE_SPI_DEVICE_1
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4V3)
#if !defined(DYSF4PRO) && !defined(DYSF4PROV2)
#define USE_SPI_DEVICE_2
#define SPI2_NSS_PIN PB12
#define SPI2_SCK_PIN PB13
@ -210,7 +210,7 @@
#endif
#define USE_SPI_DEVICE_3
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4V3)
#if !defined(DYSF4PRO) && !defined(DYSF4PROV2)
#define SPI3_NSS_PIN PA15
#else
#define SPI3_NSS_PIN PB3
@ -224,7 +224,13 @@
#define MAX7456_SPI_BUS BUS_SPI3
#define MAX7456_CS_PIN PA15
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4V3)
#if defined(DYSF4PRO) || defined(DYSF4PROV2)
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define M25P16_CS_PIN SPI3_NSS_PIN
#define M25P16_SPI_BUS BUS_SPI3
#define USE_FLASHFS
#define USE_FLASH_M25P16
#else
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define USE_SDCARD
#define USE_SDCARD_SPI
@ -234,12 +240,6 @@
#define SDCARD_DETECT_PIN PB7
#define SDCARD_DETECT_INVERTED
#else
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define M25P16_CS_PIN SPI3_NSS_PIN
#define M25P16_SPI_BUS BUS_SPI3
#define USE_FLASHFS
#define USE_FLASH_M25P16
#endif
#define USE_ADC