From 9d490482d893b4ff7ea91c58bae2990fc8ce72c2 Mon Sep 17 00:00:00 2001 From: Alan Carvalho de Assis Date: Sun, 13 Sep 2015 15:50:02 -0600 Subject: [PATCH] Configure stm32f4discovery board to support MAX31855 driver --- configs/stm32f4discovery/include/board.h | 14 ++- configs/stm32f4discovery/src/Makefile | 4 + configs/stm32f4discovery/src/stm32_bringup.c | 4 + configs/stm32f4discovery/src/stm32_max31855.c | 101 ++++++++++++++++++ configs/stm32f4discovery/src/stm32_spi.c | 10 ++ .../stm32f4discovery/src/stm32f4discovery.h | 3 + 6 files changed, 131 insertions(+), 5 deletions(-) create mode 100644 configs/stm32f4discovery/src/stm32_max31855.c diff --git a/configs/stm32f4discovery/include/board.h b/configs/stm32f4discovery/include/board.h index b0fa9644ae..c53cca9593 100644 --- a/configs/stm32f4discovery/include/board.h +++ b/configs/stm32f4discovery/include/board.h @@ -1,7 +1,7 @@ /************************************************************************************ * configs/stm32f4discovery/include/board.h * - * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -255,10 +255,8 @@ * for USART6. This is the preferred serial console for use with the STM32F4DIS-BB. */ -#ifdef CONFIG_STM32F4DISBB -# define GPIO_USART6_RX GPIO_USART6_RX_1 -# define GPIO_USART6_TX GPIO_USART6_TX_1 -#endif +#define GPIO_USART6_RX GPIO_USART6_RX_1 +#define GPIO_USART6_TX GPIO_USART6_TX_1 /* PWM * @@ -274,6 +272,12 @@ #define GPIO_SPI1_MOSI GPIO_SPI1_MOSI_1 #define GPIO_SPI1_SCK GPIO_SPI1_SCK_1 +/* SPI2 - Test MAX31855 on SPI2 PB10 = SCK, PB14 = MISO */ + +#define GPIO_SPI2_MISO GPIO_SPI2_MISO_1 +#define GPIO_SPI2_MOSI GPIO_SPI2_MOSI_1 +#define GPIO_SPI2_SCK GPIO_SPI2_SCK_1 + /* I2C config to use with Nunchuk PB7 (SDA) and PB8 (SCL) */ #define GPIO_I2C1_SCL GPIO_I2C1_SCL_2 diff --git a/configs/stm32f4discovery/src/Makefile b/configs/stm32f4discovery/src/Makefile index 92e97ae433..2015245019 100644 --- a/configs/stm32f4discovery/src/Makefile +++ b/configs/stm32f4discovery/src/Makefile @@ -56,6 +56,10 @@ ifeq ($(CONFIG_BMP180),y) CSRCS += stm32_bmp180.c endif +ifeq ($(CONFIG_MAX31855),y) +CSRCS += stm32_max31855.c +endif + ifeq ($(CONFIG_STM32_SDIO),y) CSRCS += stm32_sdio.c endif diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c index 82fa73dd88..a21f360b63 100644 --- a/configs/stm32f4discovery/src/stm32_bringup.c +++ b/configs/stm32f4discovery/src/stm32_bringup.c @@ -166,5 +166,9 @@ int stm32_bringup(void) } #endif +#ifdef CONFIG_MAX31855 + ret = stm32_max31855initialize("/dev/temp0"); +#endif + return ret; } diff --git a/configs/stm32f4discovery/src/stm32_max31855.c b/configs/stm32f4discovery/src/stm32_max31855.c new file mode 100644 index 0000000000..c2b34cca59 --- /dev/null +++ b/configs/stm32f4discovery/src/stm32_max31855.c @@ -0,0 +1,101 @@ +/************************************************************************************ + * configs/stm32f4discovery/src/stm32_max31855.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 "stm32_spi.h" +#include "stm32f4discovery.h" + +#if defined(CONFIG_SPI) && defined(CONFIG_MAX31855) && defined(CONFIG_STM32_SPI2) + +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ + +#define MAX31855_SPI_PORTNO 2 /* On SPI2 */ + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +/************************************************************************************ + * Name: stm32_max31855initialize + * + * Description: + * Initialize and register the MAX31855 Temperature Sensor driver. + * + * Input parameters: + * devpath - The full path to the driver to register. E.g., "/dev/temp0" + * + * Returned Value: + * Zero (OK) on success; a negated errno value on failure. + * + ************************************************************************************/ + +int stm32_max31855initialize(FAR const char *devpath) +{ + FAR struct spi_dev_s *spi; + int ret; + + spi = up_spiinitialize(MAX31855_SPI_PORTNO); + + if (!spi) + { + return -ENODEV; + } + + /* Then register the barometer sensor */ + + ret = max31855_register(devpath, spi); + if (ret < 0) + { + sndbg("Error registering MAX31855\n"); + } + + return ret; +} + +#endif /* CONFIG_SPI && CONFIG_MAX31855 */ diff --git a/configs/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c index e985cc9112..bfd3fcb78f 100644 --- a/configs/stm32f4discovery/src/stm32_spi.c +++ b/configs/stm32f4discovery/src/stm32_spi.c @@ -97,6 +97,9 @@ void weak_function stm32_spiinitialize(void) #ifdef CONFIG_STM32_SPI1 (void)stm32_configgpio(GPIO_CS_MEMS); /* MEMS chip select */ #endif +#if defined(CONFIG_STM32_SPI2) && defined(CONFIG_MAX31855) + (void)stm32_configgpio(GPIO_MAX31855_CS); /* MAX31855 chip select */ +#endif #if defined(CONFIG_LCD_UG2864AMBAG01) || defined(CONFIG_LCD_UG2864HSWEG01) (void)stm32_configgpio(GPIO_OLED_CS); /* OLED chip select */ # if defined(CONFIG_LCD_UG2864AMBAG01) @@ -160,6 +163,13 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + +#if defined(CONFIG_MAX31855) + if (devid == SPIDEV_TEMPERATURE) + { + stm32_gpiowrite(GPIO_MAX31855_CS, !selected); + } +#endif } uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) diff --git a/configs/stm32f4discovery/src/stm32f4discovery.h b/configs/stm32f4discovery/src/stm32f4discovery.h index dca0b4a490..4a738b35b5 100644 --- a/configs/stm32f4discovery/src/stm32f4discovery.h +++ b/configs/stm32f4discovery/src/stm32f4discovery.h @@ -183,6 +183,9 @@ #define GPIO_CS_MEMS (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\ GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN3) +#define GPIO_MAX31855_CS (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\ + GPIO_OUTPUT_SET|GPIO_PORTD|GPIO_PIN8) + /* USB OTG FS * * PA9 OTG_FS_VBUS VBUS sensing (also connected to the green LED)