From 913d3a9461e9c5029da83e0f614909191cf4a7d5 Mon Sep 17 00:00:00 2001 From: "brucesdad13@gmail.com" Date: Thu, 7 Sep 2017 00:36:04 -0400 Subject: [PATCH 1/3] ALIENWHOOP add support for OSD on upcoming V3 board --- src/main/target/ALIENWHOOP/target.h | 15 +++++++++++++-- src/main/target/ALIENWHOOP/target.mk | 3 ++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/target/ALIENWHOOP/target.h b/src/main/target/ALIENWHOOP/target.h index eebdb91099..921ed5e538 100644 --- a/src/main/target/ALIENWHOOP/target.h +++ b/src/main/target/ALIENWHOOP/target.h @@ -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,9 +196,9 @@ /* 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 #undef VTX_COMMON diff --git a/src/main/target/ALIENWHOOP/target.mk b/src/main/target/ALIENWHOOP/target.mk index 62476322ab..39fe6f76ae 100644 --- a/src/main/target/ALIENWHOOP/target.mk +++ b/src/main/target/ALIENWHOOP/target.mk @@ -21,4 +21,5 @@ 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 From b1f26666615cac0d3b4483467ca86b14809a6533 Mon Sep 17 00:00:00 2001 From: "brucesdad13@gmail.com" Date: Thu, 7 Sep 2017 21:12:46 -0400 Subject: [PATCH 2/3] Restored VTX and CMS defines --- src/main/target/ALIENWHOOP/target.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/target/ALIENWHOOP/target.mk b/src/main/target/ALIENWHOOP/target.mk index 39fe6f76ae..f1f9cd8a7c 100644 --- a/src/main/target/ALIENWHOOP/target.mk +++ b/src/main/target/ALIENWHOOP/target.mk @@ -22,4 +22,5 @@ TARGET_SRC = \ drivers/accgyro/accgyro_spi_mpu6500.c \ drivers/barometer/barometer_bmp280.c \ drivers/compass/compass_ak8963.c \ - drivers/max7456.c + drivers/max7456.c \ + io/osd.c From ba2567122c58579b3510d52a668ecec65e677395 Mon Sep 17 00:00:00 2001 From: "brucesdad13@gmail.com" Date: Thu, 7 Sep 2017 21:13:09 -0400 Subject: [PATCH 3/3] Restored VTX and CMS defines --- src/main/target/ALIENWHOOP/target.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/target/ALIENWHOOP/target.h b/src/main/target/ALIENWHOOP/target.h index 921ed5e538..0777d9fab2 100644 --- a/src/main/target/ALIENWHOOP/target.h +++ b/src/main/target/ALIENWHOOP/target.h @@ -201,10 +201,12 @@ #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 */ @@ -217,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