Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 23:05:19 +03:00
Code Issues Wiki Activity

CC3D - Fix builds that use l3gd20 - duplicate SPI code removed.

Browse source
This commit is contained in:
Dominic Clifton 2014-07-22 21:21:22 +01:00
parent 053a28dc62
commit f342560da2
2 changed files with 18 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/main/drivers/accgyro_l3gd20.c
View file

@ -65,10 +65,6 @@ extern int16_t debug[4];
#define BOOT ((uint8_t)0x80) #define BOOT ((uint8_t)0x80)
static volatile uint16_t spi1ErrorCount = 0;
static volatile uint16_t spi2ErrorCount = 0;
static volatile uint16_t spi3ErrorCount = 0;
#define SPI1_GPIO GPIOA #define SPI1_GPIO GPIOA
#define SPI1_SCK_PIN GPIO_Pin_5 #define SPI1_SCK_PIN GPIO_Pin_5
#define SPI1_SCK_PIN_SOURCE GPIO_PinSource5 #define SPI1_SCK_PIN_SOURCE GPIO_PinSource5
@ -80,20 +76,6 @@ static volatile uint16_t spi3ErrorCount = 0;
#define SPI1_MOSI_PIN_SOURCE GPIO_PinSource7 #define SPI1_MOSI_PIN_SOURCE GPIO_PinSource7
#define SPI1_MOSI_CLK RCC_AHBPeriph_GPIOA #define SPI1_MOSI_CLK RCC_AHBPeriph_GPIOA
uint32_t spiTimeoutUserCallback(SPI_TypeDef *SPIx)
{
if (SPIx == SPI1) {
spi1ErrorCount++;
return spi1ErrorCount;
} else if (SPIx == SPI2) {
spi2ErrorCount++;
return spi2ErrorCount;
} else {
spi3ErrorCount++;
return spi3ErrorCount;
}
}
static void l3gd20SpiInit(SPI_TypeDef *SPIx) static void l3gd20SpiInit(SPI_TypeDef *SPIx)
{ {
GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitTypeDef GPIO_InitStructure;
@ -146,29 +128,6 @@ static void l3gd20SpiInit(SPI_TypeDef *SPIx)
SPI_Cmd(SPI1, ENABLE); SPI_Cmd(SPI1, ENABLE);
} }
static uint8_t spiTransfer(SPI_TypeDef *SPIx, uint8_t data)
{
uint16_t spiTimeout;
spiTimeout = 0x1000;
while (SPI_I2S_GetFlagStatus(SPIx, SPI_I2S_FLAG_TXE) == RESET) {
if ((spiTimeout--) == 0) {
return spiTimeoutUserCallback(SPIx);
}
}
SPI_SendData8(SPIx, data);
spiTimeout = 0x1000;
while (SPI_I2S_GetFlagStatus(SPIx, SPI_I2S_FLAG_RXNE) == RESET) {
if ((spiTimeout--) == 0) {
return spiTimeoutUserCallback(SPIx);
}
}
return ((uint8_t) SPI_ReceiveData8(SPIx));
}
void l3gd20GyroInit(void) void l3gd20GyroInit(void)
{ {
@ -176,8 +135,8 @@ void l3gd20GyroInit(void)
GPIO_ResetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN); GPIO_ResetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN);
spiTransfer(L3GD20_SPI, CTRL_REG5_ADDR); spiTransferByte(L3GD20_SPI, CTRL_REG5_ADDR);
spiTransfer(L3GD20_SPI, BOOT); spiTransferByte(L3GD20_SPI, BOOT);
GPIO_SetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN); GPIO_SetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN);
@ -185,10 +144,10 @@ void l3gd20GyroInit(void)
GPIO_ResetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN); GPIO_ResetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN);
spiTransfer(L3GD20_SPI, CTRL_REG1_ADDR); spiTransferByte(L3GD20_SPI, CTRL_REG1_ADDR);
spiTransfer(L3GD20_SPI, MODE_ACTIVE | OUTPUT_DATARATE_3 | AXES_ENABLE | BANDWIDTH_3); spiTransferByte(L3GD20_SPI, MODE_ACTIVE | OUTPUT_DATARATE_3 | AXES_ENABLE | BANDWIDTH_3);
//spiTransfer(L3GD20_SPI, MODE_ACTIVE | OUTPUT_DATARATE_4 | AXES_ENABLE | BANDWIDTH_4); //spiTransferByte(L3GD20_SPI, MODE_ACTIVE | OUTPUT_DATARATE_4 | AXES_ENABLE | BANDWIDTH_4);
GPIO_SetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN); GPIO_SetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN);
@ -196,8 +155,8 @@ void l3gd20GyroInit(void)
GPIO_ResetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN); GPIO_ResetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN);
spiTransfer(L3GD20_SPI, CTRL_REG4_ADDR); spiTransferByte(L3GD20_SPI, CTRL_REG4_ADDR);
spiTransfer(L3GD20_SPI, BLOCK_DATA_UPDATE_CONTINUOUS | BLE_MSB | FULLSCALE_2000); spiTransferByte(L3GD20_SPI, BLOCK_DATA_UPDATE_CONTINUOUS | BLE_MSB | FULLSCALE_2000);
GPIO_SetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN); GPIO_SetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN);
@ -209,11 +168,11 @@ static void l3gd20GyroRead(int16_t *gyroData)
uint8_t buf[6]; uint8_t buf[6];
GPIO_ResetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN); GPIO_ResetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN);
spiTransfer(L3GD20_SPI, OUT_X_L_ADDR | READ_CMD | MULTIPLEBYTE_CMD); spiTransferByte(L3GD20_SPI, OUT_X_L_ADDR | READ_CMD | MULTIPLEBYTE_CMD);
uint8_t index; uint8_t index;
for (index = 0; index < sizeof(buf); index++) { for (index = 0; index < sizeof(buf); index++) {
buf[index] = spiTransfer(L3GD20_SPI, DUMMY_BYTE); buf[index] = spiTransferByte(L3GD20_SPI, DUMMY_BYTE);
} }
GPIO_SetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN); GPIO_SetBits(L3GD20_CS_GPIO, L3GD20_CS_PIN);

9
src/main/drivers/bus_spi.c
View file

@ -26,6 +26,9 @@
static volatile uint16_t spi1ErrorCount = 0; static volatile uint16_t spi1ErrorCount = 0;
static volatile uint16_t spi2ErrorCount = 0; static volatile uint16_t spi2ErrorCount = 0;
#ifdef STM32F303xC
static volatile uint16_t spi3ErrorCount = 0;
#endif
void initSpi1(void) void initSpi1(void)
{ {
@ -146,6 +149,12 @@ uint32_t spiTimeoutUserCallback(SPI_TypeDef *instance)
} else if (instance == SPI2) { } else if (instance == SPI2) {
spi2ErrorCount++; spi2ErrorCount++;
} }
#ifdef STM32F303xC
else {
spi3ErrorCount++;
return spi3ErrorCount;
}
#endif
return -1; return -1;
} }