diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-08 18:05:39 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-08 18:05:39 +0000 |
| commit | 2b35c03044dc6acfe720522f943ee07df1b65897 (patch) | |
| tree | 650add1a35440c714b3daec9984c70df0c2263c9 /nuttx/configs/stm32f4discovery | |
| parent | 868a65c8dccc93a42e78aa504775c9ef927d865b (diff) | |
| download | px4-nuttx-2b35c03044dc6acfe720522f943ee07df1b65897.tar.gz px4-nuttx-2b35c03044dc6acfe720522f943ee07df1b65897.tar.bz2 px4-nuttx-2b35c03044dc6acfe720522f943ee07df1b65897.zip | |
Support for non-common vectors from Freddie Chopin
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5323 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/stm32f4discovery')
| -rw-r--r-- | nuttx/configs/stm32f4discovery/README.txt | 30 | ||||
| -rw-r--r-- | nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h | 30 | ||||
| -rw-r--r-- | nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c | 33 |
3 files changed, 56 insertions, 37 deletions
diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt index 896bf3662..900e93a97 100644 --- a/nuttx/configs/stm32f4discovery/README.txt +++ b/nuttx/configs/stm32f4discovery/README.txt @@ -715,18 +715,24 @@ the display contents: Here is how I have the OLED connected. But you can change this with the settings in include/board.h and src/stm324fdiscovery-internal.h: - Connector CON10 J1: STM32F4Discovery - - 1 3v3 P2 3V - 3 RESET P2 PB6 (Arbitrary selection) - 5 CS P3 PB7 (Arbitrary selection) - 7 A0 P2 PB8 (Arbitrary selection) - 9 LED+ (N/C) ----- - 2 5V Vcc P2 5V - 4 DI P1 PA7 (GPIO_SPI1_MOSI == GPIO_SPI1_MOSI_1) - 6 SCLK P1 PA5 (GPIO_SPI1_SCK == GPIO_SPI1_SCK_1) - 8 LED- (N/C) ------ - 10 GND P2 GND + --------------------------+---------------------------------------------- + Connector CON10 J1: | STM32F4Discovery + --------------+-----------+---------------------------------------------- + CON10 J1: | CON20 J2: | P1/P2: + --------------+-----------+---------------------------------------------- + 1 3v3 | 3,4 3v3 | P2 3V + 3 /RESET | 8 /RESET | P2 PB6 (Arbitrary selection) + 5 /CS | 7 /CS | P3 PB7 (Arbitrary selection) + 7 A0 | 9 A0 | P2 PB8 (Arbitrary selection) + 9 LED+ (N/C) | ----- | ----- + 2 5V Vcc | 1,2 Vcc | P2 5V + 4 DI | 18 D1/SI | P1 PA7 (GPIO_SPI1_MOSI == GPIO_SPI1_MOSI_1 (1)) + 6 SCLK | 19 D0/SCL | P1 PA5 (GPIO_SPI1_SCK == GPIO_SPI1_SCK_1 (1)) + 8 LED- (N/C) | ----- | ------ + 10 GND | 20 GND | P2 GND + --------------+-----------+---------------------------------------------- + (1) Required because of on-board MEMS + ------------------------------------------------------------------------- STM32F4Discovery-specific Configuration Options =============================================== diff --git a/nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h b/nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h index 0539442ca..73a42d3fd 100644 --- a/nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h +++ b/nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h @@ -115,18 +115,24 @@ /* UG-2864AMBAG01 OLED Display: * - * Connector CON10 J1: STM32F4Discovery - * - * 1 3v3 P2 3V - * 3 RESET P2 PB6 (Arbitrary selection) - * 5 CS P3 PB7 (Arbitrary selection) - * 7 A0 P2 PB8 (Arbitrary selection) - * 9 LED+ (N/C) ----- - * 2 5V Vcc P2 5V - * 4 DI P1 PA7 (GPIO_SPI1_MOSI == GPIO_SPI1_MOSI_1) - * 6 SCLK P1 PA5 (GPIO_SPI1_SCK == GPIO_SPI1_SCK_1) - * 8 LED- (N/C) ------ - * 10 GND P2 GND + * --------------------------+---------------------------------------------- + * Connector CON10 J1: | STM32F4Discovery + * --------------+-----------+---------------------------------------------- + * CON10 J1: | CON20 J2: | P1/P2: + * --------------+-----------+---------------------------------------------- + * 1 3v3 | 3,4 3v3 | P2 3V + * 3 /RESET | 8 /RESET | P2 PB6 (Arbitrary selection) + * 5 /CS | 7 /CS | P3 PB7 (Arbitrary selection) + * 7 A0 | 9 A0 | P2 PB8 (Arbitrary selection) + * 9 LED+ (N/C) | ----- | ----- + * 2 5V Vcc | 1,2 Vcc | P2 5V + * 4 DI | 18 D1/SI | P1 PA7 (GPIO_SPI1_MOSI == GPIO_SPI1_MOSI_1 (1)) + * 6 SCLK | 19 D0/SCL | P1 PA5 (GPIO_SPI1_SCK == GPIO_SPI1_SCK_1 (1)) + * 8 LED- (N/C) | ----- | ------ + * 10 GND | 20 GND | P2 GND + * --------------+-----------+---------------------------------------------- + * (1) Required because of on-board MEMS + * ------------------------------------------------------------------------- */ #ifdef CONFIG_LCD_UG2864AMBAG01 diff --git a/nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c b/nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c index a012d7384..eabb77129 100644 --- a/nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c +++ b/nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c @@ -66,20 +66,27 @@ #endif /* Pin Configuration ********************************************************/ -/* Connector CON10 J1: STM32F4Discovery +/* UG-2864AMBAG01 OLED Display: * - * 1 3v3 P2 3V - * 3 RESET P2 PB6 (Arbitrary selection) - * 5 CS P3 PB7 (Arbitrary selection) - * 7 A0 P2 PB8 (Arbitrary selection) - * 9 LED+ (N/C) ----- - * 2 5V Vcc P2 5V - * 4 DI P1 PA7 (GPIO_SPI1_MOSI == GPIO_SPI1_MOSI_1) - * 6 SCLK P1 PA5 (GPIO_SPI1_SCK == GPIO_SPI1_SCK_1) - * 8 LED- (N/C) ------ - * 10 GND P2 GND - * - * Note that the OLED CS and A0 are managed in the up_spi.c file. + * --------------------------+---------------------------------------------- + * Connector CON10 J1: | STM32F4Discovery + * --------------+-----------+---------------------------------------------- + * CON10 J1: | CON20 J2: | P1/P2: + * --------------+-----------+---------------------------------------------- + * 1 3v3 | 3,4 3v3 | P2 3V + * 3 /RESET | 8 /RESET | P2 PB6 (Arbitrary selection) + * 5 /CS | 7 /CS | P3 PB7 (Arbitrary selection)(2) + * 7 A0 | 9 A0 | P2 PB8 (Arbitrary selection)(2) + * 9 LED+ (N/C) | ----- | ----- + * 2 5V Vcc | 1,2 Vcc | P2 5V + * 4 DI | 18 D1/SI | P1 PA7 (GPIO_SPI1_MOSI == GPIO_SPI1_MOSI_1 (1)) + * 6 SCLK | 19 D0/SCL | P1 PA5 (GPIO_SPI1_SCK == GPIO_SPI1_SCK_1 (2)) + * 8 LED- (N/C) | ----- | ------ + * 10 GND | 20 GND | P2 GND + * --------------+-----------+---------------------------------------------- + * (1) Required because of on-board MEMS + * (2) Note that the OLED CS and A0 are managed in the up_spi.c file. + * ------------------------------------------------------------------------- */ /* Definitions in stm32f4discovery-internal.h */ |