From de734ba31007f86af13ae4d2a82fad4dcaffd52a Mon Sep 17 00:00:00 2001 From: Alan Carvalho de Assis Date: Fri, 15 Apr 2016 08:20:33 -0600 Subject: [PATCH] configs/stm32f4discovery: Integrate BH1750FVI driver in the STM32F4Discovery board --- ChangeLog | 2 + configs/stm32f4discovery/src/Makefile | 4 + .../stm32f4discovery/src/stm32_bh1750fvi.c | 105 ++++++++++++++++++ configs/stm32f4discovery/src/stm32_bringup.c | 4 + .../stm32f4discovery/src/stm32f4discovery.h | 13 +++ 5 files changed, 128 insertions(+) create mode 100644 configs/stm32f4discovery/src/stm32_bh1750fvi.c diff --git a/ChangeLog b/ChangeLog index f7d144c4ab..d2717377b9 100755 --- a/ChangeLog +++ b/ChangeLog @@ -11653,3 +11653,5 @@ frequency. Noted by Henry Zhang (2015-04-15). * drivers/sensors/h1750fvi.c: Add a character driver for Rohm Ambient Light Sensor BH1750FVI. From Alan Carvalho de Assi (2016-04-15). + * configs/stm32f4discovery: Integrate BH1750FVI driver in the + STM32F4Discovery board. From Alan Carvalho de Assi (2016-04-15). diff --git a/configs/stm32f4discovery/src/Makefile b/configs/stm32f4discovery/src/Makefile index 7e3b47a826..b607925bce 100644 --- a/configs/stm32f4discovery/src/Makefile +++ b/configs/stm32f4discovery/src/Makefile @@ -52,6 +52,10 @@ ifeq ($(CONFIG_STM32_OTGFS),y) CSRCS += stm32_usb.c endif +ifeq ($(CONFIG_BH1750FVI),y) +CSRCS += stm32_bh1750fvi.c +endif + ifeq ($(CONFIG_BMP180),y) CSRCS += stm32_bmp180.c endif diff --git a/configs/stm32f4discovery/src/stm32_bh1750fvi.c b/configs/stm32f4discovery/src/stm32_bh1750fvi.c new file mode 100644 index 0000000000..5455c05ea3 --- /dev/null +++ b/configs/stm32f4discovery/src/stm32_bh1750fvi.c @@ -0,0 +1,105 @@ +/************************************************************************************ + * configs/stm32f4discovery/src/stm32_bh1750fvi.c + * + * Copyright (C) 2016 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 "stm32_i2c.h" +#include "stm32f4discovery.h" + +#if defined(CONFIG_I2C) && defined(CONFIG_BH1750FVI) + +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ + +#define BH1750FVI_I2C_PORTNO 1 /* On I2C1 */ + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +/************************************************************************************ + * Name: stm32_bh1750initialize + * + * Description: + * Initialize and register the MPL115A Pressure Sensor driver. + * + * Input parameters: + * devpath - The full path to the driver to register. E.g., "/dev/light0" + * + * Returned Value: + * Zero (OK) on success; a negated errno value on failure. + * + ************************************************************************************/ + +int stm32_bh1750initialize(FAR const char *devpath) +{ + FAR struct i2c_master_s *i2c; + int ret; + + sndbg("Initializing BH1750FVI!\n"); + + /* Initialize I2C */ + + i2c = stm32_i2cbus_initialize(BH1750FVI_I2C_PORTNO); + + if (!i2c) + { + return -ENODEV; + } + + /* Then register the barometer sensor */ + + ret = bh1750fvi_register(devpath, i2c, BH1750FVI_I2C_ADDR); + if (ret < 0) + { + sndbg("Error registering BM180\n"); + } + + return ret; +} + +#endif /* CONFIG_I2C && CONFIG_BH1750FVI && CONFIG_STM32_I2C1 */ diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c index 856307b5c8..fd4e793751 100644 --- a/configs/stm32f4discovery/src/stm32_bringup.c +++ b/configs/stm32f4discovery/src/stm32_bringup.c @@ -98,6 +98,10 @@ int stm32_bringup(void) #endif int ret = OK; +#ifdef CONFIG_BH1750FVI + stm32_bh1750initialize("/dev/light0"); +#endif + #ifdef CONFIG_ZEROCROSS /* Configure the zero-crossing driver */ diff --git a/configs/stm32f4discovery/src/stm32f4discovery.h b/configs/stm32f4discovery/src/stm32f4discovery.h index ffbb25ee53..3d3400920b 100644 --- a/configs/stm32f4discovery/src/stm32f4discovery.h +++ b/configs/stm32f4discovery/src/stm32f4discovery.h @@ -355,6 +355,19 @@ void weak_function stm32_spidev_initialize(void); +/**************************************************************************** + * Name: stm32_bh1750initialize + * + * Description: + * Called to configure an I2C and to register BH1750FVI for the stm32f4discovery + * board. + * + ****************************************************************************/ + +#ifdef CONFIG_BH1750FVI +int stm32_bh1750initialize(FAR const char *devpath); +#endif + /**************************************************************************** * Name: stm32_bmp180initialize *