diff --git a/configs/stm32f4discovery/include/board.h b/configs/stm32f4discovery/include/board.h index 379c306f9b4..b0fa9644ae4 100644 --- a/configs/stm32f4discovery/include/board.h +++ b/configs/stm32f4discovery/include/board.h @@ -274,6 +274,11 @@ #define GPIO_SPI1_MOSI GPIO_SPI1_MOSI_1 #define GPIO_SPI1_SCK GPIO_SPI1_SCK_1 +/* I2C config to use with Nunchuk PB7 (SDA) and PB8 (SCL) */ + +#define GPIO_I2C1_SCL GPIO_I2C1_SCL_2 +#define GPIO_I2C1_SDA GPIO_I2C1_SDA_1 + /* Timer Inputs/Outputs (see the README.txt file for options) */ #define GPIO_TIM2_CH1IN GPIO_TIM2_CH1IN_2 diff --git a/configs/stm32f4discovery/src/Makefile b/configs/stm32f4discovery/src/Makefile index 1728d45180b..2adf164f4b3 100644 --- a/configs/stm32f4discovery/src/Makefile +++ b/configs/stm32f4discovery/src/Makefile @@ -56,6 +56,10 @@ ifeq ($(CONFIG_STM32_OTGFS),y) CSRCS += stm32_usb.c endif +ifeq ($(CONFIG_BMP180),y) +CSRCS += stm32_bmp180.c +endif + ifeq ($(CONFIG_STM32_SDIO),y) CSRCS += stm32_sdio.c endif diff --git a/configs/stm32f4discovery/src/stm32_bmp180.c b/configs/stm32f4discovery/src/stm32_bmp180.c new file mode 100644 index 00000000000..2ccd9241ef3 --- /dev/null +++ b/configs/stm32f4discovery/src/stm32_bmp180.c @@ -0,0 +1,104 @@ +/************************************************************************************ + * configs/stm32f4discovery/src/stm32_bmp180.c + * + * Copyright (C) 2015 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_BMP180) + +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ + +#define MPL115A_I2C_PORTNO 1 /* On I2C1 */ + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +/************************************************************************************ + * Name: stm32_bmp180initialize + * + * Description: + * Initialize and register the MPL115A Pressure Sensor driver. + * + * Input parameters: + * devpath - The full path to the driver to register. E.g., "/dev/press0" + * + * Returned Value: + * Zero (OK) on success; a negated errno value on failure. + * + ************************************************************************************/ + +int stm32_bmp180initialize(FAR const char *devpath) +{ + FAR struct i2c_dev_s *i2c; + int ret; + + sndbg("Initializing BMP180!\n"); + + /* Initialize I2C */ + + i2c = up_i2cinitialize(BMP180_I2C_PORTNO); + + if (!i2c) + { + return -ENODEV; + } + + /* Then register the barometer sensor */ + + ret = bmp180_register(devpath, i2c); + if (ret < 0) + { + sndbg("Error registering BM180\n"); + } + + return ret; +} + +#endif /* CONFIG_I2C && CONFIG_MPL115A && CONFIG_STM32_I2C1 */ diff --git a/configs/stm32f4discovery/src/stm32_nsh.c b/configs/stm32f4discovery/src/stm32_nsh.c index 17de9254bf8..8b4c94c6ffb 100644 --- a/configs/stm32f4discovery/src/stm32_nsh.c +++ b/configs/stm32f4discovery/src/stm32_nsh.c @@ -66,6 +66,10 @@ int board_app_initialize(void) { +#ifdef CONFIG_BMP180 + stm32_bmp180initialize("/dev/press0"); +#endif + #ifdef CONFIG_BOARD_INITIALIZE /* Board initialization already performed by board_initialize() */ diff --git a/configs/stm32f4discovery/src/stm32f4discovery.h b/configs/stm32f4discovery/src/stm32f4discovery.h index d907e1e4d21..3bafb7aa31a 100644 --- a/configs/stm32f4discovery/src/stm32f4discovery.h +++ b/configs/stm32f4discovery/src/stm32f4discovery.h @@ -281,6 +281,19 @@ void weak_function stm32_spiinitialize(void); +/**************************************************************************** + * Name: stm32_bmp180initialize + * + * Description: + * Called to configure an I2C and to register BMP180 for the stm32f4discovery + * board. + * + ****************************************************************************/ + +#ifdef CONFIG_BMP180 +int stm32_bmp180initialize(FAR const char *devpath); +#endif + /**************************************************************************** * Name: stm32_bringup *