From 96eb6db51902d5c31c7432145297678015a05c11 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Mon, 30 Dec 2013 11:08:56 +0000 Subject: Fixed bug #449. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6583 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/STM32/TIMv1/stm32_tim.h | 8 ++++---- readme.txt | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/os/hal/platforms/STM32/TIMv1/stm32_tim.h b/os/hal/platforms/STM32/TIMv1/stm32_tim.h index ce0274c33..b5b7e7809 100644 --- a/os/hal/platforms/STM32/TIMv1/stm32_tim.h +++ b/os/hal/platforms/STM32/TIMv1/stm32_tim.h @@ -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) /** @} */ diff --git a/readme.txt b/readme.txt index c60195638..20f331b48 100644 --- a/readme.txt +++ b/readme.txt @@ -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 -- cgit v1.2.3