From eccf19e0affd3b699bbb3872a53befa7f813848f Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 25 Feb 2012 00:36:28 +0000 Subject: [PATCH] Update STM32 configuration to use TIM8 instead of TIM2 git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4423 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/configs/stm32f4discovery/README.txt | 6 ++++-- nuttx/configs/stm32f4discovery/nsh/defconfig | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt index 06b835b078..5ea25c0c8d 100755 --- a/nuttx/configs/stm32f4discovery/README.txt +++ b/nuttx/configs/stm32f4discovery/README.txt @@ -358,8 +358,10 @@ Quadrature Encode Timer Inputs ------------------------------ If enabled (by setting CONFIG_QENCODER=y), then quadrature encoder will -user TIM2 (see nsh/defconfig) and input pins PA15, and PA1 for CH1 and -CH2, respectively (see include board.h). +use either TIM2 or TIM8 (see nsh/defconfig). If TIM2 is selected, the input +pins PA15 and PA1 for CH1 and CH2, respectively). If TIM8 is selected, then +PC6 and PI5 will be used for CH1 and CH2 (see include board.h for pin +definitions). FPU === diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig index 051de38626..fead7980df 100755 --- a/nuttx/configs/stm32f4discovery/nsh/defconfig +++ b/nuttx/configs/stm32f4discovery/nsh/defconfig @@ -327,11 +327,12 @@ CONFIG_STM32_TIM4_CHANNEL=2 # # Quadrature Encoder configuration. # -# Uses TIM2 (CONFIG_STM32_TIM2=y above) +# Uses TIM2 or TIM8. TIM2 also needs CONFIG_STM32_TIM2=y; TIM8 needs CONFIG_STM_TIM8 above. # # CONFIG_QENCODER=n -CONFIG_STM32_TIM2_QE=y +CONFIG_STM32_TIM2_QE=n +CONFIG_STM32_TIM8_QE=y # # General build options