diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-25 18:01:44 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-25 18:01:44 +0000 |
| commit | 43695c398502fed0d12eb96b96f6fa5fb5c38ecc (patch) | |
| tree | fe0edc1b429f41dfd2ae591473cf997f6cafc8e2 | |
| parent | c01a8bc5821936b2463e2a529db89beaaba998a1 (diff) | |
| download | px4-nuttx-43695c398502fed0d12eb96b96f6fa5fb5c38ecc.tar.gz px4-nuttx-43695c398502fed0d12eb96b96f6fa5fb5c38ecc.tar.bz2 px4-nuttx-43695c398502fed0d12eb96b96f6fa5fb5c38ecc.zip | |
Misc quad encoder updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4426 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_qencoder.c | 2 | ||||
| -rwxr-xr-x | nuttx/configs/stm32f4discovery/README.txt | 6 | ||||
| -rwxr-xr-x | nuttx/configs/stm32f4discovery/nsh/defconfig | 10 |
3 files changed, 13 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_qencoder.c b/nuttx/arch/arm/src/stm32/stm32_qencoder.c index f9fbdd49d..66d96dfd4 100644 --- a/nuttx/arch/arm/src/stm32/stm32_qencoder.c +++ b/nuttx/arch/arm/src/stm32/stm32_qencoder.c @@ -666,7 +666,7 @@ static int stm32_setup(FAR struct qe_lowerhalf_s *lower) * configured CLKOUT value (minus one) */ - stm32_putreg16(priv, STM32_GTIM_PSC_OFFSET, (uint16_t)priv->psc); + stm32_putreg16(priv, STM32_GTIM_PSC_OFFSET, (uint16_t)priv->config->psc); #if defined(CONFIG_STM32_TIM1_QE) || defined(CONFIG_STM32_TIM8_QE) if (priv->config->timid == 1 || priv->config->timid == 8) diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt index 5ea25c0c8..70075220a 100755 --- a/nuttx/configs/stm32f4discovery/README.txt +++ b/nuttx/configs/stm32f4discovery/README.txt @@ -736,8 +736,10 @@ Where <subdir> is one of the following: but this must be manually enabled by selecting: CONFIG_QENCODER=y : Enable the generic Quadrature Encoder infrastructure - CONFIG_STM32_TIM2=y : Enable TIM2 - CONFIG_STM32_TIM2_QE=y : Use TIM2 as the quadrature encoder + CONFIG_STM32_TIM8=y : Enable TIM8 + CONFIG_STM32_TIM2=n : (Or optionally TIM2) + CONFIG_STM32_TIM8_QE=y : Use TIM8 as the quadrature encoder + CONFIG_STM32_TIM2_QE=y : (Or optionally TIM2) See also apps/examples/README.txt diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig index fead7980d..5bc628323 100755 --- a/nuttx/configs/stm32f4discovery/nsh/defconfig +++ b/nuttx/configs/stm32f4discovery/nsh/defconfig @@ -327,12 +327,18 @@ CONFIG_STM32_TIM4_CHANNEL=2 # # Quadrature Encoder configuration. # -# Uses TIM2 or TIM8. TIM2 also needs CONFIG_STM32_TIM2=y; TIM8 needs CONFIG_STM_TIM8 above. -# +# CONFIG_QENCODER - Enables the upper-half quadrature encoder driver +# CONFIG_STM32_TIMn - Enables TIMn +# CONFIG_STM32_TIMn_QE - Configures TIMn as a quadrature encoder +# CONFIG_STM32_TIMn_QECLKOUT - Used to configure the TIMn prescaler value +# +# Uses TIM2 or TIM8. TIM2 also needs CONFIG_STM32_TIM2=y; TIM8 needs CONFIG_STM_TIM8=y above. # CONFIG_QENCODER=n CONFIG_STM32_TIM2_QE=n +CONFIG_STM32_TIM2_QECLKOUT=28000000 CONFIG_STM32_TIM8_QE=y +CONFIG_STM32_TIM8_QECLKOUT=28000000 # # General build options |