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

Changes per @ledvinap 's comment

This commit is contained in:
jflyper 2017-07-11 18:43:59 +09:00
parent 815dd0a188
commit 84da61ff19
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/drivers/bus_spi.c
View File

@ -168,7 +168,7 @@ uint32_t spiTimeoutUserCallback(SPI_TypeDef *instance)
} }
// return uint8_t value or -1 when failure // return uint8_t value or -1 when failure
uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t data) uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t txByte)
{ {
uint16_t spiTimeout = 1000; uint16_t spiTimeout = 1000;
@ -177,9 +177,9 @@ uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t data)
return spiTimeoutUserCallback(instance); return spiTimeoutUserCallback(instance);
#ifdef STM32F303xC #ifdef STM32F303xC
SPI_SendData8(instance, data); SPI_SendData8(instance, txByte);
#else #else
SPI_I2S_SendData(instance, data); SPI_I2S_SendData(instance, txByte);
#endif #endif
spiTimeout = 1000; spiTimeout = 1000;
while (SPI_I2S_GetFlagStatus(instance, SPI_I2S_FLAG_RXNE) == RESET) while (SPI_I2S_GetFlagStatus(instance, SPI_I2S_FLAG_RXNE) == RESET)

8
src/main/drivers/bus_spi_hal.c
View File

@ -295,10 +295,12 @@ static bool spiBusReadBuffer(const busDevice_t *bus, uint8_t *out, int len)
} }
// return uint8_t value or -1 when failure // return uint8_t value or -1 when failure
uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t data) uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t txByte)
{ {
spiTransfer(instance, &data, &data, 1); uint8_t rxByte;
return data;
spiTransfer(instance, &rxByte, &txByte, 1);
return rxByte;
} }
// return uint8_t value or -1 when failure // return uint8_t value or -1 when failure