From f37a523e2569a10741ec219d264c652d67560952 Mon Sep 17 00:00:00 2001 From: blckmn Date: Mon, 19 Sep 2016 20:32:11 +1000 Subject: [PATCH] REVO LED strip and RSSI fix for FURYF4, REVO and OMNIBUSF4 --- src/main/target/FURYF4/target.h | 2 +- src/main/target/OMNIBUSF4/target.h | 2 +- src/main/target/REVO/target.h | 15 +++++++++++++-- src/main/target/REVO/target.mk | 5 +++-- src/main/target/VRRACE/target.h | 2 +- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index 2f0cfb863..ab8f1e386 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -140,7 +140,7 @@ #define USE_ADC #define BOARD_HAS_VOLTAGE_DIVIDER #define VBAT_ADC_PIN PC1 -#define RSSI_ADC_GPIO_PIN PC2 +#define RSSI_ADC_PIN PC2 #define CURRENT_METER_ADC_PIN PC3 #define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_BLACKBOX) diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index 4bd45103a..dd30c52f2 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -114,7 +114,7 @@ #define USE_ADC #define CURRENT_METER_ADC_PIN PC1 #define VBAT_ADC_PIN PC2 -#define RSSI_ADC_GPIO_PIN PA0 +#define RSSI_ADC_PIN PA0 #define SENSORS_SET (SENSOR_ACC) diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index e4fddd092..ca6ea3b4f 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -107,12 +107,23 @@ #define USE_ADC #define CURRENT_METER_ADC_PIN PC1 #define VBAT_ADC_PIN PC2 -#define RSSI_ADC_GPIO_PIN PA0 +//#define RSSI_ADC_PIN PA0 +#define LED_STRIP +// LED Strip can run off Pin 6 (PA0) of the MOTOR outputs. +#define WS2811_GPIO_AF GPIO_AF_TIM5 +#define WS2811_PIN PA0 +#define WS2811_TIMER TIM5 +#define WS2811_TIMER_CHANNEL TIM_Channel_2 +#define WS2811_DMA_HANDLER_IDENTIFER DMA1_ST2_HANDLER +#define WS2811_DMA_STREAM DMA1_Stream2 +#define WS2811_DMA_CHANNEL DMA_Channel_6 +#define WS2811_DMA_IRQ DMA1_Stream2_IRQn +#define WS2811_DMA_FLAG DMA_FLAG_TCIF2 +#define WS2811_DMA_IT DMA_IT_TCIF2 #define SENSORS_SET (SENSOR_ACC) - #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_FEATURES (FEATURE_BLACKBOX) diff --git a/src/main/target/REVO/target.mk b/src/main/target/REVO/target.mk index 7347dd10f..e3fc89c21 100644 --- a/src/main/target/REVO/target.mk +++ b/src/main/target/REVO/target.mk @@ -4,5 +4,6 @@ FEATURES += VCP ONBOARDFLASH TARGET_SRC = \ drivers/accgyro_spi_mpu6000.c \ drivers/barometer_ms5611.c \ - drivers/compass_hmc5883l.c - + drivers/compass_hmc5883l.c \ + drivers/light_ws2811strip.c \ + drivers/light_ws2811strip_stm32f4xx.c diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h index cda9b1446..fbca59cbe 100644 --- a/src/main/target/VRRACE/target.h +++ b/src/main/target/VRRACE/target.h @@ -153,7 +153,7 @@ #define USE_ADC #define BOARD_HAS_VOLTAGE_DIVIDER #define VBAT_ADC_PIN PC0 -#define RSSI_ADC_GPIO_PIN PB1 +#define RSSI_ADC_PIN PB1 #define CURRENT_METER_ADC_PIN PA5 #define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_SOFTSERIAL | FEATURE_TELEMETRY)