diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-07-30 16:51:43 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-07-30 16:51:43 +0000 |
| commit | cb77f5961df901626b4f4cb3e1d5672f6a94b5f3 (patch) | |
| tree | 41f9e4861aa9914bbcf36241710b609ce1681ba1 /nuttx/arch/arm/src/stm32/stm32_qencoder.c | |
| parent | a4f9a7805d2ed730798b4da73d3513258f393908 (diff) | |
| download | px4-firmware-cb77f5961df901626b4f4cb3e1d5672f6a94b5f3.tar.gz px4-firmware-cb77f5961df901626b4f4cb3e1d5672f6a94b5f3.tar.bz2 px4-firmware-cb77f5961df901626b4f4cb3e1d5672f6a94b5f3.zip | |
Add support for testing multiple ADC, PWM, and QE devices
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4993 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/arch/arm/src/stm32/stm32_qencoder.c')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_qencoder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_qencoder.c b/nuttx/arch/arm/src/stm32/stm32_qencoder.c index 237782c15..8553296f9 100644 --- a/nuttx/arch/arm/src/stm32/stm32_qencoder.c +++ b/nuttx/arch/arm/src/stm32/stm32_qencoder.c @@ -124,7 +124,7 @@ /* If TIM1,3,4, or 8 are enabled, then we have 16-bit timers */ # if defined(CONFIG_STM32_TIM1_QE) || defined(CONFIG_STM32_TIM3_QE) || \ -# defined(CONFIG_STM32_TIM4_QE) || defined(CONFIG_STM32_TIM8_QE) + defined(CONFIG_STM32_TIM4_QE) || defined(CONFIG_STM32_TIM8_QE) # define HAVE_16BIT_TIMERS 1 # endif @@ -734,8 +734,10 @@ static int stm32_setup(FAR struct qe_lowerhalf_s *lower) uint16_t ccmr1; uint16_t ccer; uint16_t cr1; +#ifdef HAVE_16BIT_TIMERS uint16_t regval; int ret; +#endif /* NOTE: Clocking should have been enabled in the low-level RCC logic at boot-up */ |