From 174e53089e96f5503b8bc7983d6a3fa071f4e254 Mon Sep 17 00:00:00 2001 From: mikeller Date: Tue, 30 Jan 2018 22:50:32 +1300 Subject: [PATCH] Rearranged BEEROTORF4 DMA to make quad mixer work with LED_STRIP. --- src/main/target/BEEROTORF4/target.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/target/BEEROTORF4/target.c b/src/main/target/BEEROTORF4/target.c index d390c58a1..961a75ff7 100644 --- a/src/main/target/BEEROTORF4/target.c +++ b/src/main/target/BEEROTORF4/target.c @@ -27,14 +27,14 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM9, CH2, PA3, TIM_USE_PPM, 0, 0), // PPM IN - DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, 0, 0), // M1 - DMAR2_ST1 (DMA2_ST2) - DEF_TIM(TIM8, CH3N, PB1, TIM_USE_MOTOR, 0, 0), // M2 - (DMA2_ST4) - DEF_TIM(TIM2, CH2, PA1, TIM_USE_MOTOR, 0, 0), // M3 - DMAR1_ST7 (DMA1_ST6) - DEF_TIM(TIM2, CH1, PA0, TIM_USE_MOTOR, 0, 0), // M4 - (DMA1_ST5) - DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 0), // M5 - (DMA2_ST2) - DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0, 0), // M6 - (DMA2_ST3) - DEF_TIM(TIM3, CH2, PB5, TIM_USE_MOTOR, 0, 0), // M7 - DMAR1_ST2 (DMA1_ST5, doesn't work for DShot) - DEF_TIM(TIM4, CH4, PB9, TIM_USE_MOTOR, 0, 0), // M8 - DMAR1_ST6 (no DMA, doesn't work for DShot) + DEF_TIM(TIM1, CH2N, PB0, TIM_USE_MOTOR, 0, 0), // M1 - DMAR: DMA2_ST5 + DEF_TIM(TIM1, CH3N, PB1, TIM_USE_MOTOR, 0, 0), // M2 - + DEF_TIM(TIM2, CH2, PA1, TIM_USE_MOTOR, 0, 0), // M3 - DMAR: DMA1_ST7 + DEF_TIM(TIM2, CH1, PA0, TIM_USE_MOTOR, 0, 0), // M4 - + DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 0), // M5 - DMAR: DMA2_ST1 + DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0, 0), // M6 - + DEF_TIM(TIM3, CH2, PB5, TIM_USE_MOTOR, 0, 0), // M7 - DMAR: DMA1_ST2 + DEF_TIM(TIM4, CH4, PB9, TIM_USE_MOTOR, 0, 0), // M8 - DMAR: DMA1_ST6 DEF_TIM(TIM4, CH3, PB8, TIM_USE_LED | TIM_USE_TRANSPONDER, 0, 0), // LED_STRIP / TRANSPONDER - DMA1_ST7 (can be used for DShot, conflicts with OSD TX) }; -- 2.11.4.GIT