diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-06 21:25:27 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-06 21:25:27 +0000 |
| commit | 89acebd2f0100884427100b43c9d07942437229e (patch) | |
| tree | 7ebcb93619c4da3f14abbcc81dc0ce72f897966a /nuttx/configs/stm3240g-eval | |
| parent | 30b51501ba8643b15481b9584064fa014d9352b3 (diff) | |
| download | px4-nuttx-89acebd2f0100884427100b43c9d07942437229e.tar.gz px4-nuttx-89acebd2f0100884427100b43c9d07942437229e.tar.bz2 px4-nuttx-89acebd2f0100884427100b43c9d07942437229e.zip | |
Make STM32 F4 TIM pin naming consistent with F1
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4272 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/stm3240g-eval')
| -rwxr-xr-x | nuttx/configs/stm3240g-eval/README.txt | 2 | ||||
| -rwxr-xr-x | nuttx/configs/stm3240g-eval/include/board.h | 4 | ||||
| -rw-r--r-- | nuttx/configs/stm3240g-eval/src/stm3240g-internal.h | 2 | ||||
| -rw-r--r-- | nuttx/configs/stm3240g-eval/src/up_pwm.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt index 7e4046be9..4ce507244 100755 --- a/nuttx/configs/stm3240g-eval/README.txt +++ b/nuttx/configs/stm3240g-eval/README.txt @@ -213,7 +213,7 @@ 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_CH2 pin 33 (EnB) + PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB) FSMC must be disabled in this case! PD13 is available at: diff --git a/nuttx/configs/stm3240g-eval/include/board.h b/nuttx/configs/stm3240g-eval/include/board.h index 80ac9a809..6ad4736d7 100755 --- a/nuttx/configs/stm3240g-eval/include/board.h +++ b/nuttx/configs/stm3240g-eval/include/board.h @@ -311,7 +311,7 @@ * but is also connected to the Motor Control Connector (CN5) just for this * purpose: * - * PD13 FSMC_A18 / MC_TIM4_CH2 pin 33 (EnB) + * PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB) * * FSMC must be disabled in this case! PD13 is available at: * @@ -320,7 +320,7 @@ * Motor Control Connector CN15, pin 33 -- not available unless you bridge SB14. */ -#define GPIO_TIM4_CH2 GPIO_TIM4_CH2_2 +#define GPIO_TIM4_CH2OUT GPIO_TIM4_CH2OUT_2 /* CAN * diff --git a/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h b/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h index 679951314..2f23d252c 100644 --- a/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h +++ b/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h @@ -117,7 +117,7 @@ * but is also connected to the Motor Control Connector (CN5) just for this * purpose: * - * PD13 FSMC_A18 / MC_TIM4_CH2 pin 33 (EnB) + * PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB) * * FSMC must be disabled in this case! PD13 is available at: * diff --git a/nuttx/configs/stm3240g-eval/src/up_pwm.c b/nuttx/configs/stm3240g-eval/src/up_pwm.c index d0701b2b2..f2932cc4d 100644 --- a/nuttx/configs/stm3240g-eval/src/up_pwm.c +++ b/nuttx/configs/stm3240g-eval/src/up_pwm.c @@ -61,7 +61,7 @@ * 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_CH2 pin 33 (EnB) + * PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB) * * FSMC must be disabled in this case! */ |