sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configs/stm32f4disovery: Add support for JLX12864G display on STM32F4 Discovery board

Browse Source
This commit is contained in:
Alan Carvalho de Assis 2017-11-23 08:41:16 -06:00 committed by Gregory Nutt
parent 7fa2196f1e
commit e4fcf00fc5
6 changed files with 199 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configs/stm32f4discovery/include/board.h
View File

@ -47,12 +47,6 @@
# include <stdbool.h>
#endif
#ifdef __KERNEL__
# include "stm32_rcc.h"
# include "stm32_sdio.h"
# include "stm32.h"
#endif
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/

4
configs/stm32f4discovery/src/Makefile
View File

@ -68,6 +68,10 @@ ifeq ($(CONFIG_SENSORS_BMP180),y)
CSRCS += stm32_bmp180.c
endif
ifeq ($(CONFIG_LCD_ST7567),y)
CSRCS += stm32_st7567.c
endif
ifeq ($(CONFIG_SENSORS_MAX31855),y)
CSRCS += stm32_max31855.c
endif

10
configs/stm32f4discovery/src/stm32_bringup.c
View File

@ -133,6 +133,16 @@ int stm32_bringup(void)
}
#endif
#ifdef CONFIG_VIDEO_FB
/* Initialize and register the framebuffer driver */
ret = fb_register(0, 0);
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: fb_register() failed: %d\n", ret);
}
#endif
#ifdef HAVE_SDIO
/* Initialize the SDIO block driver */

21
configs/stm32f4discovery/src/stm32_spi.c
View File

@ -75,6 +75,9 @@ void weak_function stm32_spidev_initialize(void)
#if defined(CONFIG_STM32_SPI2) && defined(CONFIG_SENSORS_MAX31855)
(void)stm32_configgpio(GPIO_MAX31855_CS); /* MAX31855 chip select */
#endif
#if defined(CONFIG_LCD_ST7567)
(void)stm32_configgpio(STM32_LCD_CS); /* ST7567 chip select */
#endif
#if defined(CONFIG_STM32_SPI2) && defined(CONFIG_SENSORS_MAX6675)
(void)stm32_configgpio(GPIO_MAX6675_CS); /* MAX6675 chip select */
#endif
@ -120,6 +123,12 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#ifdef CONFIG_LCD_ST7567
if (devid == SPIDEV_DISPLAY(0))
{
stm32_gpiowrite(STM32_LCD_CS, !selected);
}
#endif
#if defined(CONFIG_LCD_UG2864AMBAG01) || defined(CONFIG_LCD_UG2864HSWEG01) || \
defined(CONFIG_LCD_SSD1351)
if (devid == SPIDEV_DISPLAY(0))
@ -203,6 +212,18 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid)
#ifdef CONFIG_STM32_SPI1
int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
#ifdef CONFIG_LCD_ST7567
if (devid == SPIDEV_DISPLAY(0))
{
/* This is the Data/Command control pad which determines whether the
* data bits are data or a command.
*/
(void)stm32_gpiowrite(STM32_LCD_RS, !cmd);
return OK;
}
#endif
#if defined(CONFIG_LCD_UG2864AMBAG01) || defined(CONFIG_LCD_UG2864HSWEG01) || \
defined(CONFIG_LCD_SSD1351)
if (devid == SPIDEV_DISPLAY(0))

153
configs/stm32f4discovery/src/stm32_st7567.c Normal file
View File

@ -0,0 +1,153 @@
/****************************************************************************
* configs/stm32f4discovery/src/stm32_st7567.c
*
* Copyright (C) 2016 Uniquix Tecnologia. All rights reserved.
* Author: Alan Carvalho de Assis <acassis@gmail.com>
*
* I used the JLX12864G-086 LCD module based on ST7567 controller.
*
* Based on configs/zkit-arm-1769/src/lpc17_lcd.c
*
* Copyright (C) 2013 Zilogic Systems. All rights reserved.
* Author: Manikandan <code@zilogic.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdio.h>
#include <stdbool.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h>
#include <nuttx/lcd/lcd.h>
#include <nuttx/lcd/st7567.h>
#include "up_arch.h"
#include "up_internal.h"
#include "stm32_gpio.h"
#include "stm32_spi.h"
#include "stm32f4discovery.h"
#ifdef CONFIG_LCD_ST7567
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define LCD_SPI_PORTNO 1 /* On SPI1 */
#ifndef CONFIG_LCD_CONTRAST
# define CONFIG_LCD_CONTRAST 0x1f
#endif
/****************************************************************************
* Private Data
****************************************************************************/
FAR struct spi_dev_s *g_spidev;
FAR struct lcd_dev_s *g_lcddev;
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: board_lcd_initialize
****************************************************************************/
int board_lcd_initialize(void)
{
stm32_configgpio(STM32_LCD_RST);
stm32_configgpio(STM32_LCD_RS);
stm32_gpiowrite(STM32_LCD_RST, 1);
stm32_gpiowrite(STM32_LCD_RS, 1);
g_spidev = stm32_spibus_initialize(LCD_SPI_PORTNO);
if (!g_spidev)
{
lcderr("ERROR: Failed to initialize SPI port %d\n", LCD_SPI_PORTNO);
return 0;
}
stm32_gpiowrite(STM32_LCD_RST, 0);
up_mdelay(1);
stm32_gpiowrite(STM32_LCD_RST, 1);
return 1;
}
/****************************************************************************
* Name: board_lcd_getdev
****************************************************************************/
FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
{
g_lcddev = st7567_initialize(g_spidev, lcddev);
if (!g_lcddev)
{
lcderr("ERROR: Failed to bind SPI port 1 to LCD %d: %d\n", lcddev);
}
else
{
lcdinfo("SPI port 1 bound to LCD %d\n", lcddev);
/* And turn the LCD on (CONFIG_LCD_MAXPOWER should be 1) */
(void)g_lcddev->setpower(g_lcddev, CONFIG_LCD_MAXPOWER);
/* Set contrast to right value, otherwise background too dark */
(void)g_lcddev->setcontrast(g_lcddev, CONFIG_LCD_CONTRAST);
return g_lcddev;
}
return NULL;
}
/****************************************************************************
* Name: board_lcd_uninitialize
****************************************************************************/
void board_lcd_uninitialize(void)
{
/* TO-FIX */
}
#endif /* CONFIG_LCD_ST7567 */

11
configs/stm32f4discovery/src/stm32f4discovery.h
View File

@ -322,6 +322,17 @@
# define GPIO_OLED_DC GPIO_OLED_A0
#endif
/* Display JLX12864G */
#define STM32_LCD_RST (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\
GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN6)
#define STM32_LCD_CS (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\
GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN7)
#define STM32_LCD_RS (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\
GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN8)
/* STM32F4DIS-BB MicroSD
*
* ---------- ------------- ------------------------------