diff --git a/boards/arm/stm32/common/include/stm32_ms5611.h b/boards/arm/stm32/common/include/stm32_ms5611.h new file mode 100644 index 00000000000..d4e9f348b8e --- /dev/null +++ b/boards/arm/stm32/common/include/stm32_ms5611.h @@ -0,0 +1,80 @@ +/**************************************************************************** + * boards/arm/stm32/common/include/stm32_ms5611.h + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MS5611_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MS5611_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Type Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Types + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +#ifdef __cplusplus +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Name: board_ms5611_initialize + * + * Description: + * Initialize and register the MS5611 Pressure Sensor driver. + * + * Input Parameters: + * devno - The device number, used to build the device path as /dev/pressN + * busno - The I2C bus number + * + * Returned Value: + * Zero (OK) on success; a negated errno value on failure. + * + ****************************************************************************/ + +int board_ms5611_initialize(int devno, int busno); + +#undef EXTERN +#ifdef __cplusplus +} +#endif + +#endif /* __BOARDS_ARN_STM32_COMMON_INCLUDE_BOARD_MS5611_H */ diff --git a/boards/arm/stm32/common/src/Make.defs b/boards/arm/stm32/common/src/Make.defs index 8fee81a4e8b..7120c81d34c 100644 --- a/boards/arm/stm32/common/src/Make.defs +++ b/boards/arm/stm32/common/src/Make.defs @@ -22,6 +22,10 @@ ifeq ($(CONFIG_SENSORS_BMP180),y) CSRCS += stm32_bmp180.c endif +ifeq ($(CONFIG_SENSORS_MS5611),y) + CSRCS += stm32_ms5611.c +endif + ifeq ($(CONFIG_LEDS_APA102),y) CSRCS += stm32_apa102.c endif diff --git a/boards/arm/stm32/common/src/stm32_ms5611.c b/boards/arm/stm32/common/src/stm32_ms5611.c new file mode 100644 index 00000000000..c016d01c81c --- /dev/null +++ b/boards/arm/stm32/common/src/stm32_ms5611.c @@ -0,0 +1,85 @@ +/**************************************************************************** + * boards/arm/stm32/common/src/stm32_ms5611.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include + +#include +#include +#include + +#include "stm32_i2c.h" + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: board_ms5611_initialize + * + * Description: + * Initialize and register the MS5611 Pressure Sensor driver. + * + * Input Parameters: + * devno - The device number, used to build the device path as /dev/pressN + * busno - The I2C bus number + * + * Returned Value: + * Zero (OK) on success; a negated errno value on failure. + * + ****************************************************************************/ + +int board_ms5611_initialize(int devno, int busno) +{ + struct i2c_master_s *i2c; + char devpath[12]; + int ret; + + sninfo("Initializing MS5611!\n"); + + /* Initialize I2C */ + + i2c = stm32_i2cbus_initialize(busno); + if (i2c != NULL) + { + /* Then try to register the barometer sensor in I2C0 */ + + snprintf(devpath, sizeof(devpath), "/dev/press%d", devno); + + ret = ms5611_register(i2c, devno, MS5611_ADDR0); + if (ret < 0) + { + snerr("ERROR: Error registering MS5611 in I2C%d\n", busno); + } + } + else + { + ret = -ENODEV; + } + + return ret; +} + diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c b/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c index 322ff1f2ad2..5a2fcb6a5f5 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c @@ -72,6 +72,10 @@ #include "stm32_bmp180.h" #endif +#ifdef CONFIG_SENSORS_MS5611 +#include "stm32_ms5611.h" +#endif + #ifdef CONFIG_SENSORS_MAX6675 #include "stm32_max6675.h" #endif @@ -209,6 +213,17 @@ int stm32_bringup(void) } #endif +#ifdef CONFIG_SENSORS_MS5611 + /* Initialize the MS5611 pressure sensor. */ + + ret = board_ms5611_initialize(0, 1); + if (ret < 0) + { + syslog(LOG_ERR, "Failed to initialize MS5611, error %d\n", ret); + return ret; + } +#endif + #ifdef CONFIG_SENSORS_BH1750FVI ret = board_bh1750_initialize(0, 1); if (ret < 0)