diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-15 17:51:30 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-15 17:51:30 +0000 |
commit | 8b265a45d9b5d840b563321941c632bd3b2c3963 (patch) | |
tree | 35172ca6e0c8bc762e6ee6588589e6ef2a5d350d /nuttx/configs/stm32f4discovery/nsh | |
parent | 9f4ec53da93776bfcf221a699317c59a13782d7e (diff) | |
download | px4-nuttx-8b265a45d9b5d840b563321941c632bd3b2c3963.tar.gz px4-nuttx-8b265a45d9b5d840b563321941c632bd3b2c3963.tar.bz2 px4-nuttx-8b265a45d9b5d840b563321941c632bd3b2c3963.zip |
Add QE support to STM32F4Discovery; add a test of the quadrature encoder driver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4395 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/stm32f4discovery/nsh')
-rw-r--r-- | nuttx/configs/stm32f4discovery/nsh/appconfig | 4 | ||||
-rwxr-xr-x | nuttx/configs/stm32f4discovery/nsh/defconfig | 16 |
2 files changed, 16 insertions, 4 deletions
diff --git a/nuttx/configs/stm32f4discovery/nsh/appconfig b/nuttx/configs/stm32f4discovery/nsh/appconfig index 770762110..73da507f5 100644 --- a/nuttx/configs/stm32f4discovery/nsh/appconfig +++ b/nuttx/configs/stm32f4discovery/nsh/appconfig @@ -51,3 +51,7 @@ endif ifeq ($(CONFIG_PWM),y) CONFIGURED_APPS += examples/pwm endif + +ifeq ($(CONFIG_QENCODER),y) +CONFIGURED_APPS += examples/qencoder +endif diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig index 7bd0cec32..b95d2a52c 100755 --- a/nuttx/configs/stm32f4discovery/nsh/defconfig +++ b/nuttx/configs/stm32f4discovery/nsh/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/stm32f4discovery/nsh/defconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -313,19 +313,26 @@ CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_ETH_PTP=n CONFIG_STM32_ETHMAC_REGDEBUG=n - # # PWM configuration # # The stm32f4discovery has no real on-board PWM devices, but the board can be configured to output -# a pulse train using TIM4 CH2. +# a pulse train using TIM4 CH2. (Don't forget to set CONFIG_STM32_TIM4=y above) # CONFIG_PWM=n -CONFIG_STM32_TIM4=y CONFIG_STM32_TIM4_PWM=y CONFIG_STM32_TIM4_CHANNEL=2 # +# Quadrature Encoder configuration. +# +# Uses TIM2 (CONFIG_STM32_TIM2=y above) +# +# +CONFIG_QENCODER=n +CONFIG_STM32_TIM2_QE=y + +# # General build options # # CONFIG_RRLOAD_BINARY - make the rrload binary format used with @@ -452,6 +459,7 @@ CONFIG_DEBUG_RTC=n CONFIG_DEBUG_ANALOG=n CONFIG_DEBUG_PWM=n CONFIG_DEBUG_CAN=n +CONFIG_DEBUG_QENCODER=n CONFIG_HAVE_CXX=y CONFIG_MM_REGIONS=2 CONFIG_ARCH_LOWPUTC=y |