electronics
/
libopencm3
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Merge remote-tracking branch 'ksarkies/timer'
This commit is contained in:
Piotr Esden-Tempski 2013-02-18 14:19:53 -08:00
parent b4634ba8ff e20ef7a416
commit 46263e90b4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/stm32/timer.c
View File

@ -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;
}