diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-03-23 17:55:45 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-03-23 17:55:45 +0000 |
| commit | 406ba0e9312ce2db937e71203b93b38645469446 (patch) | |
| tree | 9330796b270b1b82b35d8fa8daebc2f97e7c54f2 | |
| parent | 35a45e50136c48754378976fbb844adeb9f067bc (diff) | |
| download | ChibiOS-406ba0e9312ce2db937e71203b93b38645469446.tar.gz ChibiOS-406ba0e9312ce2db937e71203b93b38645469446.tar.bz2 ChibiOS-406ba0e9312ce2db937e71203b93b38645469446.zip | |
Fixed bug #480.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6805 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/platforms/STM32F4xx/stm32_isr.h | 2 | ||||
| -rw-r--r-- | readme.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/os/hal/platforms/STM32F4xx/stm32_isr.h b/os/hal/platforms/STM32F4xx/stm32_isr.h index fc655165a..a763e28e7 100644 --- a/os/hal/platforms/STM32F4xx/stm32_isr.h +++ b/os/hal/platforms/STM32F4xx/stm32_isr.h @@ -98,7 +98,7 @@ #define STM32_TIM3_NUMBER TIM3_IRQn
#define STM32_TIM4_NUMBER TIM4_IRQn
#define STM32_TIM5_NUMBER TIM5_IRQn
-#define STM32_TIM6_NUMBER TIM6_IRQn
+#define STM32_TIM6_NUMBER TIM6_DAC_IRQn
#define STM32_TIM7_NUMBER TIM7_IRQn
#define STM32_TIM8_UP_NUMBER TIM8_UP_TIM13_IRQn
#define STM32_TIM8_CC_NUMBER TIM8_CC_IRQn
diff --git a/readme.txt b/readme.txt index 2749b32a6..951cf957f 100644 --- a/readme.txt +++ b/readme.txt @@ -89,6 +89,8 @@ *****************************************************************************
*** 2.7.0 ***
+- FIX: Fixed wrong STM32F4 TIM6 vector number symbol (bug #480)
+ (backported to 2.6.4).
- FIX: Fixed problem in STM32 SDADC driver initialization (bug #479)
(backported to 2.6.4).
- FIX: Fixed chThdShouldTerminate() documentation incorrect (bug #478)
|