From d09cf2d23a60d331d375a865e4e0343761bfeff9 Mon Sep 17 00:00:00 2001 From: Alan Carvalho de Assis Date: Sat, 24 Nov 2018 18:49:10 -0600 Subject: [PATCH] configs/stm32f4discovery: Add board support to display ST7032i --- configs/stm32f4discovery/src/Makefile | 4 + configs/stm32f4discovery/src/stm32_bringup.c | 69 +++++++++++- configs/stm32f4discovery/src/stm32_st7032.c | 102 ++++++++++++++++++ .../stm32f4discovery/src/stm32f4discovery.h | 10 ++ 4 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 configs/stm32f4discovery/src/stm32_st7032.c diff --git a/configs/stm32f4discovery/src/Makefile b/configs/stm32f4discovery/src/Makefile index 4fc416a4f3..c73582ae95 100644 --- a/configs/stm32f4discovery/src/Makefile +++ b/configs/stm32f4discovery/src/Makefile @@ -101,6 +101,10 @@ ifeq ($(CONFIG_LCD_MAX7219),y) CSRCS += stm32_max7219.c endif +ifeq ($(CONFIG_LCD_ST7032),y) + CSRCS += stm32_st7032.c +endif + ifeq ($(CONFIG_PCA9635PW),y) CSRCS += stm32_pca9635.c endif diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c index f20c765fe0..64bdde98ab 100644 --- a/configs/stm32f4discovery/src/stm32_bringup.c +++ b/configs/stm32f4discovery/src/stm32_bringup.c @@ -84,6 +84,59 @@ * Public Functions ****************************************************************************/ +/**************************************************************************** + * Name: stm32_i2c_register + * + * Description: + * Register one I2C drivers for the I2C tool. + * + ****************************************************************************/ + +#if defined(CONFIG_I2C) && defined(CONFIG_SYSTEM_I2CTOOL) +static void stm32_i2c_register(int bus) +{ + FAR struct i2c_master_s *i2c; + int ret; + + i2c = stm32_i2cbus_initialize(bus); + if (i2c == NULL) + { + syslog(LOG_ERR, "ERROR: Failed to get I2C%d interface\n", bus); + } + else + { + ret = i2c_register(i2c, bus); + if (ret < 0) + { + syslog(LOG_ERR, "ERROR: Failed to register I2C%d driver: %d\n", + bus, ret); + stm32_i2cbus_uninitialize(i2c); + } + } +} +#endif + +/**************************************************************************** + * Name: stm32_i2ctool + * + * Description: + * Register I2C drivers for the I2C tool. + * + ****************************************************************************/ + +#if defined(CONFIG_I2C) && defined(CONFIG_SYSTEM_I2CTOOL) +static void stm32_i2ctool(void) +{ + stm32_i2c_register(1); +#if 0 + stm32_i2c_register(1); + stm32_i2c_register(2); +#endif +} +#else +# define stm32_i2ctool() +#endif + /**************************************************************************** * Name: stm32_bringup * @@ -105,6 +158,10 @@ int stm32_bringup(void) #endif int ret = OK; +#if defined(CONFIG_I2C) && defined(CONFIG_SYSTEM_I2CTOOL) + stm32_i2ctool(); +#endif + #ifdef CONFIG_SENSORS_BMP180 stm32_bmp180initialize("/dev/press0"); #endif @@ -131,6 +188,14 @@ int stm32_bringup(void) } #endif +#ifdef CONFIG_LCD_ST7032 + ret = stm32_st7032init("/dev/disp0"); + if (ret < 0) + { + syslog(LOG_ERR, "ERROR: st7032_register failed: %d\n", ret); + } +#endif + #ifdef CONFIG_RGBLED /* Configure the RGB LED driver */ @@ -169,8 +234,8 @@ int stm32_bringup(void) #endif #ifdef HAVE_USBHOST - /* Initialize USB host operation. stm32_usbhost_initialize() starts a thread - * will monitor for USB connection and disconnection events. + /* Initialize USB host operation. stm32_usbhost_initialize() starts a + * thread will monitor for USB connection and disconnection events. */ ret = stm32_usbhost_initialize(); diff --git a/configs/stm32f4discovery/src/stm32_st7032.c b/configs/stm32f4discovery/src/stm32_st7032.c new file mode 100644 index 0000000000..fb523643d7 --- /dev/null +++ b/configs/stm32f4discovery/src/stm32_st7032.c @@ -0,0 +1,102 @@ +/**************************************************************************** + * configs/stm32f4discovery/src/stm32_st7032.c + * + * Copyright (C) 2018 Alan Carvalho de Assis. All rights reserved. + * Author: Alan Carvalho de Assis + * + * 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 + +#include +#include + +#include +#include + +#include "stm32.h" +#include "stm32f4discovery.h" + +#if defined(CONFIG_I2C) && defined(CONFIG_STM32_I2C1) && \ + defined(CONFIG_LCD_ST7032) + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +#define ST7032_I2C_PORTNO 1 /* On I2C1 */ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: stm32_st7032init + * + * Description: + * Initialize the st7032 display + * + * Input Parameters: + * devpath - The full path to the driver to register. E.g., "/dev/disp0" + * + * Returned Value: + * Zero (OK) on success; a negated errno value on failure. + * + ****************************************************************************/ + +int stm32_st7032init(FAR const char *devpath) +{ + FAR struct i2c_master_s *i2c; + int ret; + + i2c = stm32_i2cbus_initialize(ST7032_I2C_PORTNO); + if (i2c == NULL) + { + return -ENODEV; + } + + /* Register the ST7032 Driver at the specified location. */ + + ret = st7032_register(devpath, i2c); + if (ret < 0) + { + lcderr("ERROR: st7032_register(%s) failed: %d\n", + devpath, ret); + return ret; + } + + return OK; +} + +#endif /* CONFIG_I2C && CONFIG_LEDS_ST7032 */ diff --git a/configs/stm32f4discovery/src/stm32f4discovery.h b/configs/stm32f4discovery/src/stm32f4discovery.h index 3c458649e0..80c269039c 100644 --- a/configs/stm32f4discovery/src/stm32f4discovery.h +++ b/configs/stm32f4discovery/src/stm32f4discovery.h @@ -511,6 +511,16 @@ int nunchuck_initialize(FAR char *devname); int stm32_max7219init(FAR const char *devpath); #endif +/**************************************************************************** + * Name: stm32_st7032init + * + * Description: + * Initialize and register the Sitronix ST7032i + * + ****************************************************************************/ + +int stm32_st7032init(FAR const char *devpath); + /**************************************************************************** * Name: stm32_usbinitialize *