From 13132e40bf2714ab5a52f73485cc24da190dfdd8 Mon Sep 17 00:00:00 2001 From: Marcin Baliniak Date: Sun, 13 Nov 2016 22:50:51 +0100 Subject: [PATCH] Added support for DShot on RACEBASE FC --- src/main/target/RACEBASE/target.c | 19 +++++++++++++------ src/main/target/RACEBASE/target.h | 8 +++++++- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/target/RACEBASE/target.c b/src/main/target/RACEBASE/target.c index 009f6d63b2..a04a6c8142 100755 --- a/src/main/target/RACEBASE/target.c +++ b/src/main/target/RACEBASE/target.c @@ -25,10 +25,17 @@ #include "drivers/dma.h" const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM2, CH1, PA0, TIM_USE_PPM, 1 ), - DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 1 ), // PWM2 - PC6 - DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 1 ), // PWM3 - PC7 - DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 1 ), // PMW4 - PC8 - DEF_TIM(TIM4, CH4, PB9, TIM_USE_MOTOR, 1 ), // PWM5 - PC9 - DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED, 1 ), // PWM5 - PC9 + DEF_TIM(TIM2, CH1, PA0, TIM_USE_PPM, TIMER_INPUT_ENABLED), + DEF_TIM(TIM8, CH1, PB6, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED ), // PWM1 - DMA2 CH3 + DEF_TIM(TIM3, CH4, PB7, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED ), // PWM2 - DMA1 CH3 + DEF_TIM(TIM8, CH2, PB8, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED ), // PMW3 - DMA2 CH5 + DEF_TIM(TIM17,CH1,PB9, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED ), // PWM4 -DMA1 CH1 + DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED, TIMER_OUTPUT_ENABLED ), // LED - DMA1 CH2 }; +//other working setup with dissabled uart1 TX / RX DMA + + //DEF_TIM(TIM8, CH1, PB6, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED ), // PWM1 - DMA2 CH3 + //DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED ), // PWM2 - DMA1 CH4 + //DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED ), // PMW3 - DMA1 CH5 + //DEF_TIM(TIM17,CH1,PB9, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED ), // PWM4 -DMA1 CH1 + //DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED, TIMER_OUTPUT_ENABLED ), // LED - DMA1 CH2 diff --git a/src/main/target/RACEBASE/target.h b/src/main/target/RACEBASE/target.h index 470347b9a8..8e24a1455e 100755 --- a/src/main/target/RACEBASE/target.h +++ b/src/main/target/RACEBASE/target.h @@ -116,8 +116,14 @@ #define TARGET_IO_PORTC (BIT(5)) #define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(3)|BIT(4)) +#define USE_DSHOT + +#if defined(USE_UART3_RX_DMA) && defined(USE_DSHOT) +#undef USE_UART3_RX_DMA +#endif + #define USABLE_TIMER_CHANNEL_COUNT 6 -#define USED_TIMERS (TIM_N(2) | TIM_N(4)) +#define USED_TIMERS (TIM_N(2) | TIM_N(3)| TIM_N(4) | TIM_N(8) | TIM_N(17))