From 3b6ee6d3955c0b78514c240ba815ba282f66a277 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 4 Jul 2015 07:11:19 +0000 Subject: Fixed bug #610. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8063 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/STM32F1xx/stm32_registry.h | 14 +++++++------- readme.txt | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/os/hal/ports/STM32/STM32F1xx/stm32_registry.h b/os/hal/ports/STM32/STM32F1xx/stm32_registry.h index 8eeab9747..c2f635977 100644 --- a/os/hal/ports/STM32/STM32F1xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F1xx/stm32_registry.h @@ -116,7 +116,7 @@ #define STM32_TIM1_CHANNELS 4 #define STM32_HAS_TIM2 TRUE -#define STM32_TIM2_IS_32BITS TRUE +#define STM32_TIM2_IS_32BITS FALSE #define STM32_TIM2_CHANNELS 4 #define STM32_HAS_TIM3 TRUE @@ -278,7 +278,7 @@ #define STM32_TIM1_CHANNELS 4 #define STM32_HAS_TIM2 TRUE -#define STM32_TIM2_IS_32BITS TRUE +#define STM32_TIM2_IS_32BITS FALSE #define STM32_TIM2_CHANNELS 4 #define STM32_HAS_TIM3 TRUE @@ -436,7 +436,7 @@ #define STM32_TIM1_CHANNELS 4 #define STM32_HAS_TIM2 TRUE -#define STM32_TIM2_IS_32BITS TRUE +#define STM32_TIM2_IS_32BITS FALSE #define STM32_TIM2_CHANNELS 4 #define STM32_HAS_TIM3 TRUE @@ -579,7 +579,7 @@ #define STM32_TIM1_CHANNELS 4 #define STM32_HAS_TIM2 TRUE -#define STM32_TIM2_IS_32BITS TRUE +#define STM32_TIM2_IS_32BITS FALSE #define STM32_TIM2_CHANNELS 4 #define STM32_HAS_TIM3 TRUE @@ -738,7 +738,7 @@ #define STM32_TIM1_CHANNELS 4 #define STM32_HAS_TIM2 TRUE -#define STM32_TIM2_IS_32BITS TRUE +#define STM32_TIM2_IS_32BITS FALSE #define STM32_TIM2_CHANNELS 4 #define STM32_HAS_TIM3 TRUE @@ -930,7 +930,7 @@ #define STM32_TIM1_CHANNELS 4 #define STM32_HAS_TIM2 TRUE -#define STM32_TIM2_IS_32BITS TRUE +#define STM32_TIM2_IS_32BITS FALSE #define STM32_TIM2_CHANNELS 4 #define STM32_HAS_TIM3 TRUE @@ -1122,7 +1122,7 @@ #define STM32_TIM1_CHANNELS 4 #define STM32_HAS_TIM2 TRUE -#define STM32_TIM2_IS_32BITS TRUE +#define STM32_TIM2_IS_32BITS FALSE #define STM32_TIM2_CHANNELS 4 #define STM32_HAS_TIM3 TRUE diff --git a/readme.txt b/readme.txt index 962607c6a..01ccfa03a 100644 --- a/readme.txt +++ b/readme.txt @@ -73,6 +73,10 @@ *** Releases and Change Log *** ***************************************************************************** +*** 3.0.0 *** +- HAL: Fixed TIM2 wrongly classified as 32bits in STM32F1xx devices + (bug #610). + *** 3.0.0p6 *** - HAL: Removed call to localtime_r() function for non-GNU compilers in STM32F1xx RTC driver. -- cgit v1.2.3