diff options
| author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-12-06 14:13:45 +0000 |
|---|---|---|
| committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-12-06 14:13:45 +0000 |
| commit | d34bc423c805e7724898427cb5c4cfe69f596f30 (patch) | |
| tree | 99bb722b718cfe8792701e7bc94671c9ef97628a /os/hal/platforms/STM32 | |
| parent | 60e97e1c62c615c9e07042ec20fc8d354245aba9 (diff) | |
| parent | 0faef9a2928309385c52f25fb892ac46ced093ab (diff) | |
| download | ChibiOS-d34bc423c805e7724898427cb5c4cfe69f596f30.tar.gz ChibiOS-d34bc423c805e7724898427cb5c4cfe69f596f30.tar.bz2 ChibiOS-d34bc423c805e7724898427cb5c4cfe69f596f30.zip | |
I2C. Merged code from trunk.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3561 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms/STM32')
| -rw-r--r-- | os/hal/platforms/STM32/icu_lld.c | 2 | ||||
| -rw-r--r-- | os/hal/platforms/STM32/stm32.h | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/os/hal/platforms/STM32/icu_lld.c b/os/hal/platforms/STM32/icu_lld.c index e76f8a109..dfbcee5e6 100644 --- a/os/hal/platforms/STM32/icu_lld.c +++ b/os/hal/platforms/STM32/icu_lld.c @@ -360,7 +360,7 @@ void icu_lld_start(ICUDriver *icup) { icup->tim->ARR = 0xFFFF;
/* CCMR1_CC1S = 01 = CH1 Input on TI1.
- CCMR1_CC2S = 10 = CH2 Input on TI2.*/
+ CCMR1_CC2S = 10 = CH2 Input on TI1.*/
icup->tim->CCMR1 = TIM_CCMR1_CC1S_0 |
TIM_CCMR1_CC2S_1;
/* SMCR_TS = 101, input is TI1FP1.
diff --git a/os/hal/platforms/STM32/stm32.h b/os/hal/platforms/STM32/stm32.h index 0ee083dcc..c051dafe0 100644 --- a/os/hal/platforms/STM32/stm32.h +++ b/os/hal/platforms/STM32/stm32.h @@ -63,21 +63,6 @@ #include "stm32l1xx.h"
#endif
-#undef TIM1
-#undef TIM2
-#undef TIM3
-#undef TIM4
-#undef TIM5
-#undef TIM6
-#undef TIM7
-#undef TIM8
-#undef TIM9
-#undef TIM10
-#undef TIM11
-#undef TIM12
-#undef TIM13
-#undef TIM14
-
/*===========================================================================*/
/* Driver constants. */
/*===========================================================================*/
|