diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-06-23 14:39:56 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-06-23 14:39:56 -0600 |
| commit | 9d4f3f645e606d812e3bec76a10940691b30b5ff (patch) | |
| tree | ec970f690586d7ce93d937df8d6389bc1ecbdf57 /nuttx/configs/stm32f4discovery/src | |
| parent | 333edc2da8d4bad41a3ea553bf635cbad5119427 (diff) | |
| download | px4-nuttx-9d4f3f645e606d812e3bec76a10940691b30b5ff.tar.gz px4-nuttx-9d4f3f645e606d812e3bec76a10940691b30b5ff.tar.bz2 px4-nuttx-9d4f3f645e606d812e3bec76a10940691b30b5ff.zip | |
Add support for the UG-2843HHSWEG04 OLED and for the SAM4L Xplained Pro OLED module that uses that OLED.
Diffstat (limited to 'nuttx/configs/stm32f4discovery/src')
| -rw-r--r-- | nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h | 4 | ||||
| -rw-r--r-- | nuttx/configs/stm32f4discovery/src/up_ug2864hsweg01.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h b/nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h index 982ef38d4..2df40c570 100644 --- a/nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h +++ b/nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h @@ -96,7 +96,7 @@ #define GPIO_CS_MEMS (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\ GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN3) -/* USB OTG FS +/* USB OTG FS * * PA9 OTG_FS_VBUS VBUS sensing (also connected to the green LED) * PC0 OTG_FS_PowerSwitchOn @@ -134,7 +134,7 @@ * (1) Required because of on-board MEMS * ------------------------------------------------------------------------- */ - + #if defined(CONFIG_LCD_UG2864AMBAG01) || defined(CONFIG_LCD_UG2864HSWEG01) # define GPIO_OLED_RESET (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\ GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN6) diff --git a/nuttx/configs/stm32f4discovery/src/up_ug2864hsweg01.c b/nuttx/configs/stm32f4discovery/src/up_ug2864hsweg01.c index b6fe354d3..fbf414276 100644 --- a/nuttx/configs/stm32f4discovery/src/up_ug2864hsweg01.c +++ b/nuttx/configs/stm32f4discovery/src/up_ug2864hsweg01.c @@ -44,7 +44,7 @@ #include <nuttx/spi.h> #include <nuttx/lcd/lcd.h> -#include <nuttx/lcd/ug-2864hsweg01.h> +#include <nuttx/lcd/ssd1306.h> #include "stm32_gpio.h" #include "stm32f4discovery-internal.h" @@ -140,7 +140,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno) { /* Bind the SPI port to the OLED */ - dev = ug2864hsweg01_initialize(spi, devno); + dev = ssd1306_initialize(spi, devno); if (!dev) { lcddbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno); |