Fixed DMA conflicts for CRAZYBEEF3 targets. (#5590)

This commit is contained in:
Michael Keller 2018-04-01 11:00:03 +12:00 committed by GitHub
parent c3cb2e1605
commit 5a258070bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions

View File

@ -25,10 +25,10 @@
#include "drivers/dma.h" #include "drivers/dma.h"
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
// TIM8_UP, DMA2_CH1
DEF_TIM(TIM8, CH2, PB8, TIM_USE_MOTOR, 0), // PWM1 - PB8 DEF_TIM(TIM8, CH2, PB8, TIM_USE_MOTOR, 0),
DEF_TIM(TIM8, CH3, PB9, TIM_USE_MOTOR, 0), // PWM2 - PB9 DEF_TIM(TIM8, CH3, PB9, TIM_USE_MOTOR, 0),
DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0), // PWM3 - PA3 // TIM2_UP, DMA1_CH2
DEF_TIM(TIM15, CH1, PA2, TIM_USE_MOTOR, 0), // PWM4 - PA2 DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0),
DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0),
}; };

View File

@ -25,6 +25,8 @@
#define USBD_PRODUCT_STRING "CrazyBee F3 FR" #define USBD_PRODUCT_STRING "CrazyBee F3 FR"
#endif #endif
#define ENABLE_DSHOT_DMAR true
#define LED0_PIN PB3 #define LED0_PIN PB3
#define USE_BEEPER #define USE_BEEPER
#define BEEPER_PIN PC15 #define BEEPER_PIN PC15