Skip to content

Commit

Permalink
Merge pull request #5226 from Faduf/YupiF7_DMA_conflict_correction
Browse files Browse the repository at this point in the history
YupiF7 - Correction of DMA conflict
  • Loading branch information
mikeller committed Feb 18, 2018
2 parents 3656963 + faebc43 commit 08281c1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/target/YUPIF7/target.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM8, CH3, PC8, TIM_USE_PPM, 0, 0 ), // PPM IN
DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR, 0, 0 ), // S1_OUT - DMA1_ST2
DEF_TIM(TIM2, CH1, PA0, TIM_USE_MOTOR, 0, 0 ), // S1_OUT - DMA1_ST2
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR, 0, 0 ), // S2_OUT - DMA1_ST4
DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0, 0 ), // S3_OUT - DMA1_ST1
DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0, 1 ), // S4_OUT - DMA1_ST6
Expand Down

0 comments on commit 08281c1

Please sign in to comment.