Browse Source

Merge pull request #88 "Fix logical operator error in tim_ic_set_input reported by hmjack2008"

Merge remote-tracking branch 'ksarkies/timer'
pull/94/head
Piotr Esden-Tempski 12 years ago
parent
commit
46263e90b4
  1. 2
      lib/stm32/timer.c

2
lib/stm32/timer.c

@ -1913,7 +1913,7 @@ void timer_ic_set_input(u32 timer_peripheral, enum tim_ic_id ic, enum tim_ic_inp
in &= 3;
if (((ic == TIM_IC2) || (ic == TIM_IC4)) &&
((in == TIM_IC_IN_TI1) || (in = TIM_IC_IN_TI2))) {
((in == TIM_IC_IN_TI1) || (in == TIM_IC_IN_TI2))) {
/* Input select bits are flipped for these combinations */
in ^= 3;
}

Loading…
Cancel
Save