diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-09 21:34:58 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-09 21:34:58 +0000 |
| commit | bfd6e961c47c3572c7c409c296b345966634c217 (patch) | |
| tree | b8b6b86209167f5a7c4556abe884221e12a45095 /nuttx/configs/stm3240g-eval/src | |
| parent | ed93fd7399d11571a4cf214fadcd671a8e2f5d50 (diff) | |
| download | px4-nuttx-bfd6e961c47c3572c7c409c296b345966634c217.tar.gz px4-nuttx-bfd6e961c47c3572c7c409c296b345966634c217.tar.bz2 px4-nuttx-bfd6e961c47c3572c7c409c296b345966634c217.zip | |
Finish PWM pulse count configuration
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4287 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/stm3240g-eval/src')
| -rw-r--r-- | nuttx/configs/stm3240g-eval/src/stm3240g-internal.h | 24 | ||||
| -rw-r--r-- | nuttx/configs/stm3240g-eval/src/up_pwm.c | 32 |
2 files changed, 16 insertions, 40 deletions
diff --git a/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h b/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h index 2f23d252c..672d2f95e 100644 --- a/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h +++ b/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h @@ -113,21 +113,19 @@ /* PWM * * The STM3240G-Eval has no real on-board PWM devices, but the board can be - * configured to output a pulse train using TIM4 CH2. This pin is used by FSMC is - * but is also connected to the Motor Control Connector (CN5) just for this - * purpose: - * - * PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB) - * - * FSMC must be disabled in this case! PD13 is available at: - * - * Daughterboard Extension Connector, CN3, pin 32 - available - * TFT LCD Connector, CN19, pin 17 -- not available without removing the LCD. - * Motor Control Connector CN15, pin 33 -- not available unless you bridge SB14. + * configured to output a pulse train using TIM4, TIM1, or TIM8 (see board.h). + * Let's figure out which the user has configured. */ -#define STM3240G_EVAL_PWMTIMER 4 -#define STM3240G_EVAL_PWMCHANNEL 2 +#ifdef CONFIG_PWM +# if defined(CONFIG_STM32_TIM1_PWM) +# define STM3240G_EVAL_PWMTIMER 1 +# elif defined(CONFIG_STM32_TIM4_PWM) +# define STM3240G_EVAL_PWMTIMER 4 +# elif defined(CONFIG_STM32_TIM8_PWM) +# define STM3240G_EVAL_PWMTIMER 8 +# endif +#endif /**************************************************************************************************** * Public Types diff --git a/nuttx/configs/stm3240g-eval/src/up_pwm.c b/nuttx/configs/stm3240g-eval/src/up_pwm.c index f2932cc4d..7cc1d39d5 100644 --- a/nuttx/configs/stm3240g-eval/src/up_pwm.c +++ b/nuttx/configs/stm3240g-eval/src/up_pwm.c @@ -57,34 +57,12 @@ /* Configuration *******************************************************************/ /* PWM * - * The STM3240G-Eval has no real on-board PWM devices, but the board can be configured to output - * a pulse train using TIM4 CH2. This pin is used by FSMC is connect to CN5 just for this - * purpose: - * - * PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB) - * - * FSMC must be disabled in this case! + * The STM3240G-Eval has no real on-board PWM devices, but the board can be + * configured to output a pulse train using variously unused pins on the board for + * PWM output (see board.h for details of pins). */ -#define HAVE_PWM 1 - -#ifndef CONFIG_PWM -# undef HAVE_PWM -#endif - -#ifndef CONFIG_STM32_TIM4 -# undef HAVE_PWM -#endif - -#ifndef CONFIG_STM32_TIM4_PWM -# undef HAVE_PWM -#endif - -#if CONFIG_STM32_TIM4_CHANNEL != STM3240G_EVAL_PWMCHANNEL -# undef HAVE_PWM -#endif - -#ifdef HAVE_PWM +#ifdef CONFIG_PWM /************************************************************************************ * Private Functions @@ -139,4 +117,4 @@ int pwm_devinit(void) return OK; } -#endif /* HAVE_PWM */ +#endif /* CONFIG_PWM */ |