Merge pull request #4074 from brucesdad13/target-alienwhoop-osd-support

ALIENWHOOP add support for OSD on upcoming V3 board
This commit is contained in:
Martin Budden 2017-09-08 07:18:12 +01:00 committed by GitHub
commit 2b72d938cd
2 changed files with 19 additions and 4 deletions

View File

@ -104,6 +104,15 @@
//#define SPI5_MOSI_PIN
#endif
/* OSD MAX7456E */
#define OSD
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN SPI2_NSS_PIN
#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz
#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST)
/* Motion Processing Unit (MPU) - Invensense 6-axis MPU-6500 or 9-axis MPU-9250
*/
// Interrupt
@ -132,11 +141,13 @@
/* Optional Digital Pressure Sensor (barometer) - Bosch BMP280
* TODO: not implemented on V1 or V2 pcb
*/
#if defined(BREADBOARD)
#define BARO
#define USE_BARO_BMP280
#define USE_BARO_SPI_BMP280
#define BMP280_SPI_INSTANCE SPI3
#define BMP280_CS_PIN SPI3_NSS_PIN
#endif
/* Serial ports etc.
*/
@ -185,15 +196,17 @@
/* Defaults - What do we want out of the box?
*/
#if defined(BREADBOARD)
#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP | FEATURE_LED_STRIP )
#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP | FEATURE_LED_STRIP | FEATURE_OSD )
#else
#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP) // FEATURE_TELEMETRY changes bind pin from rx to tx
#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP ) // TODO FEATURE_OSD for V3 board ... FEATURE_TELEMETRY changes bind pin from rx to tx
#endif
/* OSD currently dependent upon CMS, SMARTAUDIO, TRAMP
#undef VTX_COMMON
#undef VTX_CONTROL
#undef VTX_SMARTAUDIO
#undef VTX_TRAMP
*/
/* OLED Support
*/
@ -206,7 +219,7 @@
#define I2C1_SCL PB6
#define I2C1_SDA PB7
#else
#undef CMS
//#undef CMS // TODO: OSD depends upon CMS
#undef USE_I2C
#endif

View File

@ -21,4 +21,6 @@ TARGET_SRC = \
drivers/accgyro/accgyro_mpu6500.c \
drivers/accgyro/accgyro_spi_mpu6500.c \
drivers/barometer/barometer_bmp280.c \
drivers/compass/compass_ak8963.c
drivers/compass/compass_ak8963.c \
drivers/max7456.c \
io/osd.c