rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix up BMP280 SPI to use new IO

This commit is contained in:
blckmn 2016-06-19 21:45:30 +10:00 committed by blckmn
parent 71353066b8
commit 258e9c26b1
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/drivers/barometer_spi_bmp280.c
View File

@ -28,12 +28,14 @@
#include "barometer.h" #include "barometer.h"
#include "barometer_bmp280.h" #include "barometer_bmp280.h"
#define DISABLE_BMP280 GPIO_SetBits(BMP280_CS_GPIO, BMP280_CS_PIN) #define DISABLE_BMP280 IOHi(bmp280CsPin)
#define ENABLE_BMP280 GPIO_ResetBits(BMP280_CS_GPIO, BMP280_CS_PIN) #define ENABLE_BMP280 IOLo(bmp280CsPin)
extern int32_t bmp280_up; extern int32_t bmp280_up;
extern int32_t bmp280_ut; extern int32_t bmp280_ut;
static IO_t bmp280CsPin = IO_NONE;
bool bmp280WriteRegister(uint8_t reg, uint8_t data) bool bmp280WriteRegister(uint8_t reg, uint8_t data)
{ {
ENABLE_BMP280; ENABLE_BMP280;
@ -62,30 +64,11 @@ void bmp280SpiInit(void)
return; return;
} }
#ifdef STM32F303 bmp280CsPin = IOGetByTag(IO_TAG(BMP280_CS_PIN));
RCC_AHBPeriphClockCmd(BMP280_CS_GPIO_CLK_PERIPHERAL, ENABLE); IOInit(bmp280CsPin, OWNER_BARO, RESOURCE_SPI);
IOConfigGPIO(bmp280CsPin, IOCFG_OUT_PP);
GPIO_InitTypeDef GPIO_InitStructure; DISABLE_BMP280;
GPIO_InitStructure.GPIO_Pin = BMP280_CS_PIN;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_Init(BMP280_CS_GPIO, &GPIO_InitStructure);
#endif
#ifdef STM32F10X
RCC_APB2PeriphClockCmd(BMP280_CS_GPIO_CLK_PERIPHERAL, ENABLE);
gpio_config_t gpio;
gpio.mode = Mode_Out_PP;
gpio.pin = BMP280_CS_PIN;
gpio.speed = Speed_50MHz;
gpioInit(BMP280_CS_GPIO, &gpio);
#endif
GPIO_SetBits(BMP280_CS_GPIO, BMP280_CS_PIN);
spiSetDivisor(BMP280_SPI_INSTANCE, SPI_9MHZ_CLOCK_DIVIDER); spiSetDivisor(BMP280_SPI_INSTANCE, SPI_9MHZ_CLOCK_DIVIDER);