From c4f0bb18b8cf77022fadb128749662d98d21e435 Mon Sep 17 00:00:00 2001 From: blckmn Date: Sat, 5 Nov 2016 10:17:04 +1100 Subject: [PATCH] Revolt adjustments. LED will be enabled once remapping is turned on for LEDs --- src/main/target/REVO/target.c | 6 +++++- src/main/target/REVO/target.h | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/target/REVO/target.c b/src/main/target/REVO/target.c index 77aa1d7d0e..ef6023948b 100644 --- a/src/main/target/REVO/target.c +++ b/src/main/target/REVO/target.c @@ -34,6 +34,10 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { { TIM3, IO_TAG(PB1), TIM_Channel_4, TIM3_IRQn, TIM_USE_MOTOR, 1, GPIO_AF_TIM3, DMA1_Stream2, DMA_Channel_5, DMA1_ST2_HANDLER }, // S2_OUT { TIM2, IO_TAG(PA3), TIM_Channel_4, TIM2_IRQn, TIM_USE_MOTOR, 1, GPIO_AF_TIM2, DMA1_Stream6, DMA_Channel_3, DMA1_ST6_HANDLER }, // S3_OUT { TIM2, IO_TAG(PA2), TIM_Channel_3, TIM2_IRQn, TIM_USE_MOTOR, 1, GPIO_AF_TIM2, DMA1_Stream1, DMA_Channel_3, DMA1_ST1_HANDLER }, // S4_OUT - { TIM5, IO_TAG(PA1), TIM_Channel_2, TIM5_IRQn, TIM_USE_MOTOR | TIM_USE_LED, 1, GPIO_AF_TIM5, DMA1_Stream4, DMA_Channel_6, DMA1_ST4_HANDLER }, // S5_OUT +#ifdef REVOLT + { TIM4, IO_TAG(PB6), TIM_Channel_1, TIM4_IRQn, TIM_USE_LED, 0, GPIO_AF_TIM4, DMA1_Stream0, DMA_Channel_2, DMA1_ST0_HANDLER }, // LED for REVOLT +#else + { TIM5, IO_TAG(PA1), TIM_Channel_2, TIM5_IRQn, TIM_USE_MOTOR | TIM_USE_LED, 1, GPIO_AF_TIM5, DMA1_Stream4, DMA_Channel_6, DMA1_ST4_HANDLER }, // S5_OUT / LED for REVO { TIM5, IO_TAG(PA0), TIM_Channel_1, TIM5_IRQn, TIM_USE_MOTOR, 1, GPIO_AF_TIM5, DMA1_Stream2, DMA_Channel_6, DMA1_ST2_HANDLER }, // S6_OUT +#endif }; diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index f6517b3632..f5540f713b 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -40,8 +40,8 @@ #define USE_DSHOT #define LED0 PB5 -// Disable LED1, conflicts with AirbotF4/Flip32F4 beeper -#if defined(AIRBOTF4) +// Disable LED1, conflicts with AirbotF4/Flip32F4/Revolt beeper +#if defined(AIRBOTF4) || defined(REVOLT) #define BEEPER PB4 #define BEEPER_INVERTED #else