From 5a258070bc0d36b901dc3fd6285f890a0b15dd56 Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Sun, 1 Apr 2018 11:00:03 +1200 Subject: [PATCH] Fixed DMA conflicts for CRAZYBEEF3 targets. (#5590) --- src/main/target/CRAZYBEEF3FR/target.c | 12 ++++++------ src/main/target/CRAZYBEEF3FR/target.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/target/CRAZYBEEF3FR/target.c b/src/main/target/CRAZYBEEF3FR/target.c index 78f741453..bb68139c8 100644 --- a/src/main/target/CRAZYBEEF3FR/target.c +++ b/src/main/target/CRAZYBEEF3FR/target.c @@ -25,10 +25,10 @@ #include "drivers/dma.h" const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - - DEF_TIM(TIM8, CH2, PB8, TIM_USE_MOTOR, 0), // PWM1 - PB8 - DEF_TIM(TIM8, CH3, PB9, TIM_USE_MOTOR, 0), // PWM2 - PB9 - DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0), // PWM3 - PA3 - DEF_TIM(TIM15, CH1, PA2, TIM_USE_MOTOR, 0), // PWM4 - PA2 - + // TIM8_UP, DMA2_CH1 + DEF_TIM(TIM8, CH2, PB8, TIM_USE_MOTOR, 0), + DEF_TIM(TIM8, CH3, PB9, TIM_USE_MOTOR, 0), + // TIM2_UP, DMA1_CH2 + DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0), + DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0), }; diff --git a/src/main/target/CRAZYBEEF3FR/target.h b/src/main/target/CRAZYBEEF3FR/target.h index 08d029d62..8a7da9f32 100644 --- a/src/main/target/CRAZYBEEF3FR/target.h +++ b/src/main/target/CRAZYBEEF3FR/target.h @@ -25,6 +25,8 @@ #define USBD_PRODUCT_STRING "CrazyBee F3 FR" #endif +#define ENABLE_DSHOT_DMAR true + #define LED0_PIN PB3 #define USE_BEEPER #define BEEPER_PIN PC15