diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-25 00:36:28 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-25 00:36:28 +0000 |
| commit | 4f494d03276c8a1c4794354bbe49b3f0f0af5d5f (patch) | |
| tree | 8b0fcc4284b67a5d4a1b12a07f404ab092353b7f /nuttx/configs | |
| parent | 30e08be6ab603e1ea2b6e93f7363f0cf2e1e42e2 (diff) | |
| download | px4-nuttx-4f494d03276c8a1c4794354bbe49b3f0f0af5d5f.tar.gz px4-nuttx-4f494d03276c8a1c4794354bbe49b3f0f0af5d5f.tar.bz2 px4-nuttx-4f494d03276c8a1c4794354bbe49b3f0f0af5d5f.zip | |
Update STM32 configuration to use TIM8 instead of TIM2
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4423 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs')
| -rwxr-xr-x | nuttx/configs/stm32f4discovery/README.txt | 6 | ||||
| -rwxr-xr-x | 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 06b835b07..5ea25c0c8 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 051de3862..fead7980d 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 |