diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-25 13:27:21 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-25 13:27:21 +0000 |
commit | 385b0fd6504ea1cb35b52cb425b5c37a62afa91d (patch) | |
tree | c2cba4e1ffe3a8a2d8bccfe6a7a1dc76faf6270b | |
parent | 68f81e1dfef545a718da2932d61aa207ea4588b2 (diff) | |
download | nuttx-385b0fd6504ea1cb35b52cb425b5c37a62afa91d.tar.gz nuttx-385b0fd6504ea1cb35b52cb425b5c37a62afa91d.tar.bz2 nuttx-385b0fd6504ea1cb35b52cb425b5c37a62afa91d.zip |
Fix conditional compilation in STM32 quadrature encoder
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4770 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 | 72 | ||||
-rw-r--r-- | nuttx/configs/stm32f4discovery/src/up_ssd1289.c | 55 |
3 files changed, 81 insertions, 48 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_qencoder.c b/nuttx/arch/arm/src/stm32/stm32_qencoder.c index 1471f4bd7..237782c15 100644 --- a/nuttx/arch/arm/src/stm32/stm32_qencoder.c +++ b/nuttx/arch/arm/src/stm32/stm32_qencoder.c @@ -185,7 +185,7 @@ struct stm32_qeconfig_s #ifdef HAVE_MIXEDWIDTH_TIMERS uint8_t width; /* Timer width (16- or 32-bits) */ #endif -#elif defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F40XX) +#if defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F40XX) uint32_t ti1cfg; /* TI1 input pin configuration (20-bit encoding) */ uint32_t ti2cfg; /* TI2 input pin configuration (20-bit encoding) */ #else diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt index 6663022aa..0d1f6a2ff 100755 --- a/nuttx/configs/stm32f4discovery/README.txt +++ b/nuttx/configs/stm32f4discovery/README.txt @@ -546,30 +546,39 @@ LCD CONNECTOR: SSD1289 MPU INTERFACE PINS MAPPING TO STM32 F4: - STM32 FUNCTION LCD PIN STM32F4Discovery pin - ---------------- ------------- -------------------- - FSMC_D0 D0 pin 4 PD14 P1 pin 46 - FSMC_D1 D1 pin 3 PD15 P1 pin 47 - FSMC_D2 D2 pin 6 PD0 P2 pin 36 - FSMC_D3 D3 pin 5 PD1 P2 pin 33 - FSMC_D4 D4 pin 8 PE7 P1 pin 25 - FSMC_D5 D5 pin 7 PE8 P1 pin 26 - FSMC_D6 D6 pin 10 PE9 P1 pin 27 - FSMC_D7 D7 pin 9 PE10 P1 pin 28 - FSMC_D8 D8 pin 12 PE11 P1 pin 29 - FSMC_D9 D9 pin 11 PE12 P1 pin 30 - FSMC_D10 D10 pin 14 PE13 P1 pin 31 - FSMC_D11 D11 pin 13 PE14 P1 pin 32 - FSMC_D12 D12 pin 16 PE15 P1 pin 33 - FSMC_D13 D13 pin 15 PD8 P1 pin 40 - FSMC_D14 D14 pin 18 PD9 P1 pin 41 - FSMC_D15 D15 pin 17 PD10 P1 pin 42 - FSMC_A16 RS pin 19 PD11 P1 pin 27 - FSMC_NE1 ~CS pin 10 PD7 P2 pin 27 - FSMC_NWE ~WR pin 22 PD5 P2 pin 29 - FSMC_NOE ~RD pin 21 PD4 P2 pin 32 - PC6 RESET pin 24 PC6 P2 pin 47 - + ---------------- ------------- ---------------------------------- + STM32 FUNCTION LCD PIN STM32F4Discovery PIN + ---------------- ------------- ---------------------------------- + FSMC_D0 D0 pin 4 PD14 P1 pin 46 Conflict (Note 1) + FSMC_D1 D1 pin 3 PD15 P1 pin 47 Conflict (Note 2) + FSMC_D2 D2 pin 6 PD0 P2 pin 36 Free I/O + FSMC_D3 D3 pin 5 PD1 P2 pin 33 Free I/O + FSMC_D4 D4 pin 8 PE7 P1 pin 25 Free I/O + FSMC_D5 D5 pin 7 PE8 P1 pin 26 Free I/O + FSMC_D6 D6 pin 10 PE9 P1 pin 27 Free I/O + FSMC_D7 D7 pin 9 PE10 P1 pin 28 Free I/O + FSMC_D8 D8 pin 12 PE11 P1 pin 29 Free I/O + FSMC_D9 D9 pin 11 PE12 P1 pin 30 Free I/O + FSMC_D10 D10 pin 14 PE13 P1 pin 31 Free I/O + FSMC_D11 D11 pin 13 PE14 P1 pin 32 Free I/O + FSMC_D12 D12 pin 16 PE15 P1 pin 33 Free I/O + FSMC_D13 D13 pin 15 PD8 P1 pin 40 Free I/O + FSMC_D14 D14 pin 18 PD9 P1 pin 41 Free I/O + FSMC_D15 D15 pin 17 PD10 P1 pin 42 Free I/O + FSMC_A16 RS pin 19 PD11 P1 pin 27 Free I/O + FSMC_NE1 ~CS pin 10 PD7 P2 pin 27 Free I/O + FSMC_NWE ~WR pin 22 PD5 P2 pin 29 Conflict (Note 3) + FSMC_NOE ~RD pin 21 PD4 P2 pin 32 Conflict (Note 4) + PC6 RESET pin 24 PC6 P2 pin 47 Free I/O + ---------------- ------------- ---------------------------------- + + 1 Used for the RED LED + 2 Used for the BLUE LED + 3 Used for the RED LED and for OTG FS Overcurrent. It may be okay to use + for the parallel interface if PC0 is held high (or floating). PC0 enables + the STMPS2141STR IC power switch that drives the OTG FS host VBUS. + 4 Also the reset pin for the CS43L22 audio Codec. + MAPPING of similar LCD in Arduino (write-only): LCD PIN BOARD CONNECTION @@ -975,3 +984,18 @@ Where <subdir> is one of the following: The IWDG timer has a range of about 35 seconds and should not be an issue. + nxlines: + ------ + An example using the NuttX graphics system (NX). This example focuses on + placing lines on the background in various orientations. + + CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_LCD_LANDSCAPE=y : 320x240 landscape orientation + + The STM32F4Discovery board does not have any graphics capability. This + configuration assumes that you have connected an SD1289-based LCD as + described about under "SSD1289". NOTE: At present, it has not been + proven that the STM32F4Discovery can actually drive an LCD. There are + some issues with how some of the dedicated FSMC pins are used on the + boards. This configuration may not be useful and may only serve as + an illustration of how to build for th SSD1289 LCD. diff --git a/nuttx/configs/stm32f4discovery/src/up_ssd1289.c b/nuttx/configs/stm32f4discovery/src/up_ssd1289.c index 5a21caafa..d7f949557 100644 --- a/nuttx/configs/stm32f4discovery/src/up_ssd1289.c +++ b/nuttx/configs/stm32f4discovery/src/up_ssd1289.c @@ -141,29 +141,38 @@ static void stm32_backlight(FAR struct ssd1289_lcd_s *dev, int power); /* LCD pin mapping (see configs/stm324discovery/README.txt * MAPPING TO STM32 F4: * - * STM32 FUNCTION LCD PIN STM32F4Discovery pin - * ---------------- ----------- -------------------- - * FSMC_D0 D0 pin 4 PD14 P1 pin 46 - * FSMC_D1 D1 pin 3 PD15 P1 pin 47 - * FSMC_D2 D2 pin 6 PD0 P2 pin 36 - * FSMC_D3 D3 pin 5 PD1 P2 pin 33 - * FSMC_D4 D4 pin 8 PE7 P1 pin 25 - * FSMC_D5 D5 pin 7 PE8 P1 pin 26 - * FSMC_D6 D6 pin 10 PE9 P1 pin 27 - * FSMC_D7 D7 pin 9 PE10 P1 pin 28 - * FSMC_D8 D8 pin 12 PE11 P1 pin 29 - * FSMC_D9 D9 pin 11 PE12 P1 pin 30 - * FSMC_D10 D10 pin 14 PE13 P1 pin 31 - * FSMC_D11 D11 pin 13 PE14 P1 pin 32 - * FSMC_D12 D12 pin 16 PE15 P1 pin 33 - * FSMC_D13 D13 pin 15 PD8 P1 pin 40 - * FSMC_D14 D14 pin 18 PD9 P1 pin 41 - * FSMC_D15 D15 pin 17 PD10 P1 pin 42 - * FSMC_A16 RS pin 19 PD11 P1 pin 27 - * FSMC_NE1 ~CS pin 10 PD7 P2 pin 27 - * FSMC_NWE ~WR pin 22 PD5 P2 pin 29 - * FSMC_NOE ~RD pin 21 PD4 P2 pin 32 - * PC6 RESET pin 24 PC6 P2 pin 47 + * ---------------- ------------- ---------------------------------- + * STM32 FUNCTION LCD PIN STM32F4Discovery PIN + * ---------------- ------------- ---------------------------------- + * FSMC_D0 D0 pin 4 PD14 P1 pin 46 Conflict (Note 1) + * FSMC_D1 D1 pin 3 PD15 P1 pin 47 Conflict (Note 2) + * FSMC_D2 D2 pin 6 PD0 P2 pin 36 Free I/O + * FSMC_D3 D3 pin 5 PD1 P2 pin 33 Free I/O + * FSMC_D4 D4 pin 8 PE7 P1 pin 25 Free I/O + * FSMC_D5 D5 pin 7 PE8 P1 pin 26 Free I/O + * FSMC_D6 D6 pin 10 PE9 P1 pin 27 Free I/O + * FSMC_D7 D7 pin 9 PE10 P1 pin 28 Free I/O + * FSMC_D8 D8 pin 12 PE11 P1 pin 29 Free I/O + * FSMC_D9 D9 pin 11 PE12 P1 pin 30 Free I/O + * FSMC_D10 D10 pin 14 PE13 P1 pin 31 Free I/O + * FSMC_D11 D11 pin 13 PE14 P1 pin 32 Free I/O + * FSMC_D12 D12 pin 16 PE15 P1 pin 33 Free I/O + * FSMC_D13 D13 pin 15 PD8 P1 pin 40 Free I/O + * FSMC_D14 D14 pin 18 PD9 P1 pin 41 Free I/O + * FSMC_D15 D15 pin 17 PD10 P1 pin 42 Free I/O + * FSMC_A16 RS pin 19 PD11 P1 pin 27 Free I/O + * FSMC_NE1 ~CS pin 10 PD7 P2 pin 27 Free I/O + * FSMC_NWE ~WR pin 22 PD5 P2 pin 29 Conflict (Note 3) + * FSMC_NOE ~RD pin 21 PD4 P2 pin 32 Conflict (Note 4) + * PC6 RESET pin 24 PC6 P2 pin 47 Free I/O + * ---------------- ------------- ---------------------------------- + * + * 1 Used for the RED LED + * 2 Used for the BLUE LED + * 3 Used for the RED LED and for OTG FS Overcurrent. It may be okay to use + * for the parallel interface if PC0 is held high (or floating). PC0 enables + * the STMPS2141STR IC power switch that drives the OTG FS host VBUS. + * 4 Also the reset pin for the CS43L22 audio Codec. */ #define GPIO_LCD_RESET (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\ |