aboutsummaryrefslogtreecommitdiff
path: root/include/libopencm3/stm32/timer.h
diff options
context:
space:
mode:
authorGareth McMullin2012-04-07 09:01:39 +1200
committerGareth McMullin2012-04-07 09:01:39 +1200
commit3be6cd8f76739dde0f837c64adb83ec6bbc1f00b (patch)
treeb28f2e033351c2aa28138c2cd8119fe949e21a77 /include/libopencm3/stm32/timer.h
parentfa1c6bc632d1fe9a84a7e38ecb239b5cedc15c15 (diff)
Corrected bit definitions for capture/compare input selection.
Thanks to Linux Casassa.
Diffstat (limited to 'include/libopencm3/stm32/timer.h')
-rw-r--r--include/libopencm3/stm32/timer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libopencm3/stm32/timer.h b/include/libopencm3/stm32/timer.h
index c10d015..71ff64c 100644
--- a/include/libopencm3/stm32/timer.h
+++ b/include/libopencm3/stm32/timer.h
@@ -533,8 +533,8 @@
/* Note: CC2S bits are writable only when the channel is OFF (CC2E = 0 in
* TIMx_CCER). */
#define TIM_CCMR1_CC1S_OUT (0x0 << 0)
-#define TIM_CCMR1_CC1S_IN_TI2 (0x1 << 0)
-#define TIM_CCMR1_CC1S_IN_TI1 (0x2 << 0)
+#define TIM_CCMR1_CC1S_IN_TI2 (0x2 << 0)
+#define TIM_CCMR1_CC1S_IN_TI1 (0x1 << 0)
#define TIM_CCMR1_CC1S_IN_TRC (0x3 << 0)
#define TIM_CCMR1_CC1S_MASK (0x3 << 0)