rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5008 from martinbudden/bfa_use_osd 

Move define of USE_OSD into common_fc_pre.h
This commit is contained in:
Michael Keller 2018-01-31 19:16:04 +13:00 committed by GitHub
parent b22e84a2e1 486770a75d
commit ab1812455f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
45 changed files with 9 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/target/ALIENWHOOP/target.h
View File

@ -103,8 +103,6 @@
#endif
/* OSD MAX7456E */
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN SPI2_NSS_PIN

1
src/main/target/ANYFCF7/target.h
View File

@ -120,7 +120,6 @@
#define SPI4_MISO_PIN PE13
#define SPI4_MOSI_PIN PE14
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN SPI3_NSS_PIN

1
src/main/target/ANYFCM7/target.h
View File

@ -117,7 +117,6 @@
#define USE_FLASH_M25P16
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN SPI3_NSS_PIN

1
src/main/target/BEEBRAIN_V2F/target.h
View File

@ -76,7 +76,6 @@
#define MPU6500_CS_PIN PA15
#define MPU6500_SPI_INSTANCE SPI3
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI1
#define MAX7456_SPI_CS_PIN PA4

1
src/main/target/BEEROTORF4/target.h
View File

@ -48,7 +48,6 @@
#define USE_BARO
#define USE_BARO_BMP280
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN SPI3_NSS_PIN

1
src/main/target/BETAFLIGHTF3/target.h
View File

@ -96,7 +96,6 @@
#define SPI2_MISO_PIN PB14
#define SPI2_MOSI_PIN PB15
#define USE_OSD
// include the max7456 driver
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI1

1
src/main/target/BETAFLIGHTF4/target.h
View File

@ -55,7 +55,6 @@
#define USE_MAG
#define USE_MAG_HMC5883
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN PB12

1
src/main/target/CLRACINGF4/target.h
View File

@ -61,7 +61,6 @@
#define MPU6500_SPI_INSTANCE SPI1
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN PA15

1
src/main/target/CLRACINGF7/target.h
View File

@ -62,7 +62,6 @@
#define MPU6500_CS_PIN SPI1_NSS_PIN
#define MPU6500_SPI_INSTANCE SPI1
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN PA15

1
src/main/target/FF_FORTINIF4/target.h
View File

@ -86,7 +86,6 @@
/*---------------------------------*/
/*-------------OSD-----------------*/
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN PB3

1
src/main/target/FF_PIKOF4/target.h
View File

@ -82,7 +82,6 @@
#if defined(FF_PIKOF4OSD)
/*-------------OSD-----------------*/
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI1
#define MAX7456_SPI_CS_PIN PA4

1
src/main/target/FISHDRONEF4/target.h
View File

@ -80,7 +80,6 @@
#define SPI2_MISO_PIN PC2
#define SPI2_MOSI_PIN PC3
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN SPI2_NSS_PIN

1
src/main/target/FRSKYF3/target.h
View File

@ -76,7 +76,6 @@
#define USE_ESCSERIAL
#define ESCSERIAL_TIMER_TX_PIN PB9 // (HARDARE=0)
#define USE_SPI
#define USE_OSD
// include the max7456 driver
#define USE_MAX7456

1
src/main/target/FRSKYF4/target.h
View File

@ -47,7 +47,6 @@
#define BMP280_SPI_INSTANCE SPI3
#define BMP280_CS_PIN PB3
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN PA15

2
src/main/target/FURYF3/target.h
View File

@ -23,6 +23,7 @@
#else
#define TARGET_BOARD_IDENTIFIER "FYF3"
// #define USBD_PRODUCT_STRING "FuryF3"
#undef USE_OSD
#endif
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
@ -79,7 +80,6 @@
#define SPI2_MOSI_PIN PB15
#ifdef FURYF3OSD
#define USE_OSD
// include the max7456 driver
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI1

1
src/main/target/IMPULSERCF3/target.h
View File

@ -77,7 +77,6 @@
#define MPU6000_CS_PIN PA4
#define MPU6000_SPI_INSTANCE SPI1
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI1
#define MAX7456_SPI_CS_PIN PA3

1
src/main/target/KAKUTEF4/target.h
View File

@ -70,7 +70,6 @@
#define USE_BARO_BMP280 //onboard
#endif
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN PB14

1
src/main/target/KAKUTEF7/target.h
View File

@ -118,7 +118,6 @@
#define SPI4_MOSI_PIN PE6
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN SPI2_NSS_PIN

1
src/main/target/KIWIF4/target.h
View File

@ -62,7 +62,6 @@
#define ACC_MPU6000_ALIGN CW180_DEG
#if defined(KIWIF4) || defined(KIWIF4V2)
#define USE_OSD
#define USE_MAX7456
#endif

1
src/main/target/KROOZX/target.h
View File

@ -70,7 +70,6 @@
#define SDCARD_DMA_CHANNEL_TX DMA1_Stream5
#define SDCARD_DMA_CHANNEL 0
#define USE_OSD
#ifdef USE_MSP_DISPLAYPORT
#undef USE_MSP_DISPLAYPORT
#endif

1
src/main/target/MATEKF405/target.h
View File

@ -118,7 +118,6 @@
#define SPI2_MISO_PIN PB14
#define SPI2_MOSI_PIN PB15
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN PB10

1
src/main/target/MATEKF411/target.h
View File

@ -98,7 +98,6 @@
#define SPI2_MISO_PIN PB14
#define SPI2_MOSI_PIN PB15
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN PB12

1
src/main/target/MATEKF411RX/target.h
View File

@ -53,7 +53,6 @@
#define SPI2_MISO_PIN PB14
#define SPI2_MOSI_PIN PB15
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN PB12

1
src/main/target/MATEKF722/target.h
View File

@ -103,7 +103,6 @@
#define SPI2_MISO_PIN PB14
#define SPI2_MOSI_PIN PB15
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN PB10

2
src/main/target/MOTOLABF4/target.h
View File

@ -57,7 +57,7 @@
#define SPI3_SCK_PIN PC10
#define SPI3_MISO_PIN PC11
#define SPI3_MOSI_PIN PC12
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN SPI3_NSS_PIN

1
src/main/target/NOX/target.h
View File

@ -53,7 +53,6 @@
#define BMP280_SPI_INSTANCE SPI2
#define BMP280_CS_PIN PA9
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN PA10

1
src/main/target/NUCLEOF446RE/target.h
View File

@ -63,7 +63,6 @@
//#define USE_BARO_BMP280
//#define USE_BARO_MS5611
//#define USE_OSD
//#define USE_MAX7456
//#define MAX7456_SPI_INSTANCE SPI2
//#define MAX7456_SPI_CS_PIN SPI2_NSS_PIN

2
src/main/target/OMNIBUS/target.h
View File

@ -105,8 +105,6 @@
// OSD define info:
// feature name (includes source) -> MAX_OSD, used in target.mk
// include the osd code
#define USE_OSD
// include the max7456 driver
#define USE_MAX7456

1
src/main/target/OMNIBUSF4/target.h
View File

@ -129,7 +129,6 @@
#define DEFAULT_BARO_BMP280
#endif
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN PA15

1
src/main/target/OMNIBUSF7/target.h
View File

@ -136,7 +136,6 @@
#define SPI4_MOSI_PIN PE6
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN SPI2_NSS_PIN

1
src/main/target/PYRODRONEF4/target.h
View File

@ -49,7 +49,6 @@
#define SPI2_MISO_PIN PB14
#define SPI2_MOSI_PIN PB15
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN PB12

2
src/main/target/RACEBASE/target.h
View File

@ -99,8 +99,6 @@
#define CURRENT_METER_ADC_PIN PA5
#define RSSI_ADC_PIN PA6
#define USE_OSD
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL

2
src/main/target/RCEXPLORERF3/target.h
View File

@ -19,6 +19,8 @@
#define TARGET_BOARD_IDENTIFIER "REF3"
#undef USE_OSD
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
#define LED0_PIN PB4

2
src/main/target/SIRINFPV/target.h
View File

@ -142,8 +142,6 @@
//#define USE_QUAD_MIXER_ONLY
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define USE_OSD
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM

1
src/main/target/SITL/target.h
View File

@ -93,6 +93,7 @@
#undef USE_TELEMETRY_LTM
#undef USE_ADC
#undef USE_VCP
#undef USE_OSD
#undef USE_PPM
#undef USE_PWM
#undef USE_SERIAL_RX

1
src/main/target/SPRACINGF3/target.h
View File

@ -172,7 +172,6 @@
#define CURRENT_METER_ADC_PIN PA5
#define RSSI_ADC_PIN PB2
#define USE_OSD
#define USE_OSD_OVER_MSP_DISPLAYPORT
#define USE_SLOW_MSP_DISPLAYPORT_RATE_WHEN_UNARMED

1
src/main/target/SPRACINGF3EVO/target.h
View File

@ -163,7 +163,6 @@
#define CURRENT_METER_ADC_PIN PA5
#endif
#define USE_OSD
#define DISABLE_EXTENDED_CMS_OSD_MENU
#define USE_OSD_OVER_MSP_DISPLAYPORT
#define USE_MSP_CURRENT_METER

1
src/main/target/SPRACINGF3MINI/target.h
View File

@ -26,6 +26,7 @@
#else
#define TARGET_BOARD_IDENTIFIER "SRFM"
#undef USE_OSD
#ifndef SPRACINGF3MINI_REV
#define SPRACINGF3MINI_REV 2
#endif

1
src/main/target/SPRACINGF4EVO/target.h
View File

@ -155,7 +155,6 @@
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define USE_OSD
#define USE_OSD_OVER_MSP_DISPLAYPORT
#define USE_MSP_CURRENT_METER

2
src/main/target/SPRACINGF4NEO/target.h
View File

@ -143,8 +143,6 @@
#define USE_RTC6705_CLK_HACK
#define RTC6705_CLK_PIN SPI3_SCK_PIN
#define USE_OSD
// Bus Switched Device, Device A.
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3

2
src/main/target/STM32F3DISCOVERY/target.h
View File

@ -31,6 +31,7 @@
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
#undef USE_OSD // ROM SAVING
#undef USE_TELEMETRY_JETIEXBUS // ROM SAVING
#define CURRENT_TARGET_CPU_VOLTAGE 3.0
@ -128,7 +129,6 @@
#define USE_BARO_BMP280
#define USE_BARO_MS5611
//#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN SPI2_NSS_PIN

1
src/main/target/WORMFC/target.h
View File

@ -93,7 +93,6 @@
#define SPI3_MOSI_PIN PB5
//OSD
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN PC0

1
src/main/target/YUPIF4/target.h
View File

@ -126,7 +126,6 @@
#define SPI3_MOSI_PIN PC12
// OSD
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI1
#define MAX7456_SPI_CS_PIN PA14

1
src/main/target/YUPIF7/target.h
View File

@ -87,7 +87,6 @@
#define SPI3_MOSI_PIN PC12
// OSD
#define USE_OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI1
#define MAX7456_SPI_CS_PIN PA14

1
src/main/target/common_fc_pre.h
View File

@ -127,6 +127,7 @@
#if (FLASH_SIZE > 128)
#define USE_CMS
#define USE_OSD
#define USE_TELEMETRY_CRSF
#define USE_TELEMETRY_SRXL
#define USE_MSP_DISPLAYPORT