Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SPI: improvements for SPI library #912

Merged
merged 6 commits into from
Feb 12, 2020
Merged

SPI: improvements for SPI library #912

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c83128
SPI: improvements for SPI library
stas2z Feb 3, 2020
d55eb70
spi_tranfer: factorize common code to simplify maintenance
ABOSTM Feb 6, 2020
da74ede
Merge pull request #1 from ABOSTM/SPI_IMPROVEMENT
stas2z Feb 7, 2020
4e8df33
SPI: H7 and MP1 fix
stas2z Feb 10, 2020
63d541b
SPI: Dedicated start/stop transfer for STM32H7 and STM32MP1
ABOSTM Feb 11, 2020
b30668f
Merge pull request #2 from ABOSTM/SPI_IMPROVEMENT
stas2z Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions libraries/SPI/src/SPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ void SPIClass::beginTransaction(uint8_t _pin, SPISettings settings)
spiSettings[idx].clk = settings.clk;
spiSettings[idx].dMode = settings.dMode;
spiSettings[idx].bOrder = settings.bOrder;
spiSettings[idx].noReceive = settings.noReceive;

if ((_pin != CS_PIN_CONTROLLED_BY_USER) && (_spi.pin_ssel == NC)) {
pinMode(_pin, OUTPUT);
Expand Down Expand Up @@ -262,9 +263,8 @@ byte SPIClass::transfer(uint8_t _pin, uint8_t data, SPITransferMode _mode)
if (_pin > NUM_DIGITAL_PINS) {
return rx_buffer;
}

uint8_t idx = pinIdx(_pin, GET_IDX);
if (_pin != _CSPinConfig) {
uint8_t idx = pinIdx(_pin, GET_IDX);
if (idx >= NB_SPI_SETTINGS) {
return rx_buffer;
}
Expand All @@ -278,7 +278,7 @@ byte SPIClass::transfer(uint8_t _pin, uint8_t data, SPITransferMode _mode)
digitalWrite(_pin, LOW);
}

spi_transfer(&_spi, &data, &rx_buffer, sizeof(uint8_t), SPI_TRANSFER_TIMEOUT);
spi_transfer(&_spi, &data, &rx_buffer, sizeof(uint8_t), SPI_TRANSFER_TIMEOUT, spiSettings[idx].noReceive);

if ((_pin != CS_PIN_CONTROLLED_BY_USER) && (_mode == SPI_LAST) && (_spi.pin_ssel == NC)) {
digitalWrite(_pin, HIGH);
Expand Down Expand Up @@ -330,7 +330,8 @@ uint16_t SPIClass::transfer16(uint8_t _pin, uint16_t data, SPITransferMode _mode
digitalWrite(_pin, LOW);
}

spi_transfer(&_spi, (uint8_t *)&data, (uint8_t *)&rx_buffer, sizeof(uint16_t), SPI_TRANSFER_TIMEOUT);
spi_transfer(&_spi, (uint8_t *)&data, (uint8_t *)&rx_buffer, sizeof(uint16_t),
SPI_TRANSFER_TIMEOUT, spiSettings[idx].noReceive);

if ((_pin != CS_PIN_CONTROLLED_BY_USER) && (_mode == SPI_LAST) && (_spi.pin_ssel == NC)) {
digitalWrite(_pin, HIGH);
Expand Down Expand Up @@ -363,9 +364,8 @@ void SPIClass::transfer(uint8_t _pin, void *_buf, size_t _count, SPITransferMode
if ((_count == 0) || (_buf == NULL) || (_pin > NUM_DIGITAL_PINS)) {
return;
}

uint8_t idx = pinIdx(_pin, GET_IDX);
if (_pin != _CSPinConfig) {
uint8_t idx = pinIdx(_pin, GET_IDX);
if (idx >= NB_SPI_SETTINGS) {
return;
}
Expand All @@ -379,7 +379,8 @@ void SPIClass::transfer(uint8_t _pin, void *_buf, size_t _count, SPITransferMode
digitalWrite(_pin, LOW);
}

spi_transfer(&_spi, ((uint8_t *)_buf), ((uint8_t *)_buf), _count, SPI_TRANSFER_TIMEOUT);
spi_transfer(&_spi, ((uint8_t *)_buf), ((uint8_t *)_buf), _count,
SPI_TRANSFER_TIMEOUT, spiSettings[idx].noReceive);

if ((_pin != CS_PIN_CONTROLLED_BY_USER) && (_mode == SPI_LAST) && (_spi.pin_ssel == NC)) {
digitalWrite(_pin, HIGH);
Expand All @@ -406,9 +407,8 @@ void SPIClass::transfer(byte _pin, void *_bufout, void *_bufin, size_t _count, S
if ((_count == 0) || (_bufout == NULL) || (_bufin == NULL) || (_pin > NUM_DIGITAL_PINS)) {
return;
}

uint8_t idx = pinIdx(_pin, GET_IDX);
if (_pin != _CSPinConfig) {
uint8_t idx = pinIdx(_pin, GET_IDX);
if (idx >= NB_SPI_SETTINGS) {
return;
}
Expand All @@ -422,7 +422,8 @@ void SPIClass::transfer(byte _pin, void *_bufout, void *_bufin, size_t _count, S
digitalWrite(_pin, LOW);
}

spi_transfer(&_spi, ((uint8_t *)_bufout), ((uint8_t *)_bufin), _count, SPI_TRANSFER_TIMEOUT);
spi_transfer(&_spi, ((uint8_t *)_bufout), ((uint8_t *)_bufin), _count,
SPI_TRANSFER_TIMEOUT, spiSettings[idx].noReceive);

if ((_pin != CS_PIN_CONTROLLED_BY_USER) && (_mode == SPI_LAST) && (_spi.pin_ssel == NC)) {
digitalWrite(_pin, HIGH);
Expand Down
11 changes: 9 additions & 2 deletions libraries/SPI/src/SPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ extern "C" {
#define SPI_MODE2 0x02
#define SPI_MODE3 0x03

#define SPI_TRANSMITRECEIVE 0x0
#define SPI_TRANSMITONLY 0x1

// Transfer mode
enum SPITransferMode {
SPI_CONTINUE, /* Transfer not finished: CS pin kept active */
Expand All @@ -57,7 +60,9 @@ enum SPITransferMode {
#define NO_CONFIG ((int16_t)(-1))

// Defines a default timeout delay in milliseconds for the SPI transfer
#define SPI_TRANSFER_TIMEOUT 1000
#ifndef SPI_TRANSFER_TIMEOUT
#define SPI_TRANSFER_TIMEOUT 1000
#endif

/*
* Defines the number of settings saved per SPI instance. Must be in range 1 to 254.
Expand All @@ -69,10 +74,11 @@ enum SPITransferMode {

class SPISettings {
public:
SPISettings(uint32_t clock, BitOrder bitOrder, uint8_t dataMode)
SPISettings(uint32_t clock, BitOrder bitOrder, uint8_t dataMode, bool noRecv = SPI_TRANSMITRECEIVE)
{
clk = clock;
bOrder = bitOrder;
noReceive = noRecv;

if (SPI_MODE0 == dataMode) {
dMode = SPI_MODE_0;
Expand Down Expand Up @@ -102,6 +108,7 @@ class SPISettings {
//SPI_MODE2 1 0
//SPI_MODE3 1 1
friend class SPIClass;
bool noReceive;
};

class SPIClass {
Expand Down
52 changes: 24 additions & 28 deletions libraries/SPI/src/utility/spi_com.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include "utility/spi_com.h"
#include "PinAF_STM32F1.h"
#include "pinconfig.h"
#include "stm32yyxx_ll_spi.h"

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -381,22 +382,7 @@ void spi_deinit(spi_t *obj)
*/
spi_status_e spi_send(spi_t *obj, uint8_t *Data, uint16_t len, uint32_t Timeout)
{
spi_status_e ret = SPI_OK;
HAL_StatusTypeDef hal_status;

if ((obj == NULL) || (len == 0)) {
return SPI_ERROR;
}

hal_status = HAL_SPI_Transmit(&(obj->handle), Data, len, Timeout);

if (hal_status == HAL_TIMEOUT) {
ret = SPI_TIMEOUT;
} else if (hal_status != HAL_OK) {
ret = SPI_ERROR;
}

return ret;
return spi_transfer(obj, Data, Data, len, Timeout, 1 /* SPI_TRANSMITONLY */);
}

/**
Expand All @@ -407,24 +393,34 @@ spi_status_e spi_send(spi_t *obj, uint8_t *Data, uint16_t len, uint32_t Timeout)
* @param rx_buffer : data to receive
* @param len : length in byte of the data to send and receive
* @param Timeout: Timeout duration in tick
* @param skipRecieve: skip recieving data after transmit or not
stas2z marked this conversation as resolved.
Show resolved Hide resolved
* @retval status of the send operation (0) in case of error
*/
spi_status_e spi_transfer(spi_t *obj, uint8_t *tx_buffer,
uint8_t *rx_buffer, uint16_t len, uint32_t Timeout)
spi_status_e spi_transfer(spi_t *obj, uint8_t *tx_buffer, uint8_t *rx_buffer,
uint16_t len, uint32_t Timeout, bool skipReceive)
{
spi_status_e ret = SPI_OK;
HAL_StatusTypeDef hal_status;
uint32_t tickstart, size = len;
SPI_TypeDef *_SPI = obj->handle.Instance;

if ((obj == NULL) || (len == 0)) {
return SPI_ERROR;
if ((obj == NULL) || (len == 0) || (Timeout == 0U)) {
return Timeout > 0U ? SPI_ERROR : SPI_TIMEOUT;
}

hal_status = HAL_SPI_TransmitReceive(&(obj->handle), tx_buffer, rx_buffer, len, Timeout);

if (hal_status == HAL_TIMEOUT) {
ret = SPI_TIMEOUT;
} else if (hal_status != HAL_OK) {
ret = SPI_ERROR;
tickstart = HAL_GetTick();
while (size--) {
while (!LL_SPI_IsActiveFlag_TXE(_SPI))
stas2z marked this conversation as resolved.
Show resolved Hide resolved
;
LL_SPI_TransmitData8(_SPI, *tx_buffer++);

if (!skipReceive) {
while (!LL_SPI_IsActiveFlag_RXNE(_SPI))
stas2z marked this conversation as resolved.
Show resolved Hide resolved
;
*rx_buffer++ = LL_SPI_ReceiveData8(_SPI);
}
if ((Timeout != HAL_MAX_DELAY) && (HAL_GetTick() - tickstart >= Timeout)) {
ret = SPI_TIMEOUT;
break;
}
}

return ret;
Expand Down
2 changes: 1 addition & 1 deletion libraries/SPI/src/utility/spi_com.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb);
void spi_deinit(spi_t *obj);
spi_status_e spi_send(spi_t *obj, uint8_t *Data, uint16_t len, uint32_t Timeout);
spi_status_e spi_transfer(spi_t *obj, uint8_t *tx_buffer,
uint8_t *rx_buffer, uint16_t len, uint32_t Timeout);
uint8_t *rx_buffer, uint16_t len, uint32_t Timeout, bool skipReceive);
uint32_t spi_getClkFreq(spi_t *obj);

#ifdef __cplusplus
Expand Down