git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6583 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2013-12-30 11:08:56 +00:00
parent 6d966b1a55
commit 96eb6db519
2 changed files with 6 additions and 4 deletions

View File

@ -181,7 +181,7 @@
#define STM32_TIM_CCMR1_OC1M_MASK ((7U << 4) | (1U << 16))
#define STM32_TIM_CCMR1_OC1M(n) ((((n) & 7) << 4) | \
(((n) >> 2) << 16))
(((n) >> 3) << 16))
#define STM32_TIM_CCMR1_OC1CE (1U << 7)
@ -193,7 +193,7 @@
#define STM32_TIM_CCMR1_OC2M_MASK ((7U << 12) | (1U << 24))
#define STM32_TIM_CCMR1_OC2M(n) ((((n) & 7) << 12) | \
(((n) >> 2) << 24))
(((n) >> 3) << 24))
#define STM32_TIM_CCMR1_OC2CE (1U << 15)
/** @} */
@ -227,7 +227,7 @@
#define STM32_TIM_CCMR2_OC3M_MASK ((7U << 4) | (1U << 16))
#define STM32_TIM_CCMR2_OC3M(n) ((((n) & 7) << 4) | \
(((n) >> 2) << 16))
(((n) >> 3) << 16))
#define STM32_TIM_CCMR2_OC3CE (1U << 7)
@ -239,7 +239,7 @@
#define STM32_TIM_CCMR2_OC4M_MASK ((7U << 12) | (1U << 24))
#define STM32_TIM_CCMR2_OC4M(n) ((((n) & 7) << 12) | \
(((n) >> 2) << 24))
(((n) >> 3) << 24))
#define STM32_TIM_CCMR2_OC4CE (1U << 15)
/** @} */

View File

@ -89,6 +89,8 @@
*****************************************************************************
*** 2.7.0 ***
- FIX: Fixed wrong STM32_TIM_CCMR2_OCxM macros on STM32F30x (bug #449)
(backported to 2.6.2).
- FIX: Fixed STM32F30x TIM1/TIM8 alternate clock source setting not
recognized (bug #448)(backported to 2.6.2).
- FIX: Fixed wrong MCO2 check in STM32F4xx HAL driver (bug #447)(backported