Skip to content

Commit 9871857

Browse files
committed
feat(SPI): remove skip receive from SPISettings
This parameter should not be part of SPISettings. Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 91f8897 commit 9871857

File tree

3 files changed

+7
-18
lines changed

3 files changed

+7
-18
lines changed

libraries/SPI/README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ User have 2 possibilities about the management of the CS pin:
77
* the CS pin is managed directly by the user code before to transfer the data (like the Arduino SPI library)
88
* the user uses a hardware CS pin linked to the SPI peripheral
99

10-
### New SPISetting parameter
11-
12-
* `noReceive`: value can be `SPI_TRANSMITRECEIVE` or `SPI_TRANSMITONLY`. It allows to skip receive data after transmitting. Default `SPI_TRANSMITRECEIVE`.
13-
1410
### New API functions
1511

1612
* `SPIClass::SPIClass(uint8_t mosi, uint8_t miso, uint8_t sclk, uint8_t ssel)`: alternative class constructor

libraries/SPI/src/SPI.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void SPIClass::setClockDivider(uint8_t divider)
160160
*/
161161
uint8_t SPIClass::transfer(uint8_t data)
162162
{
163-
spi_transfer(&_spi, &data, sizeof(uint8_t), SPI_TRANSFER_TIMEOUT, _spiSettings.noReceive);
163+
spi_transfer(&_spi, &data, sizeof(uint8_t), SPI_TRANSFER_TIMEOUT, false);
164164
return data;
165165
}
166166

@@ -179,7 +179,7 @@ uint16_t SPIClass::transfer16(uint16_t data)
179179
data = tmp;
180180
}
181181
spi_transfer(&_spi, (uint8_t *)&data, sizeof(uint16_t),
182-
SPI_TRANSFER_TIMEOUT, _spiSettings.noReceive);
182+
SPI_TRANSFER_TIMEOUT, false);
183183

184184
if (_spiSettings.bitOrder) {
185185
tmp = ((data & 0xff00) >> 8) | ((data & 0xff) << 8);
@@ -200,7 +200,7 @@ void SPIClass::transfer(void *buf, size_t count)
200200
{
201201
if ((count != 0) && (buf != NULL)) {
202202
spi_transfer(&_spi, ((uint8_t *)buf), count,
203-
SPI_TRANSFER_TIMEOUT, _spiSettings.noReceive);
203+
SPI_TRANSFER_TIMEOUT, false);
204204
}
205205
}
206206

libraries/SPI/src/SPI.h

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,35 +38,29 @@ extern "C" {
3838
#define SPI_CLOCK_DIV64 64
3939
#define SPI_CLOCK_DIV128 128
4040

41-
#define SPI_TRANSMITRECEIVE 0x0
42-
#define SPI_TRANSMITONLY 0x1
43-
4441
// Defines a default timeout delay in milliseconds for the SPI transfer
4542
#ifndef SPI_TRANSFER_TIMEOUT
4643
#define SPI_TRANSFER_TIMEOUT 1000
4744
#endif
4845

4946
class SPISettings {
5047
public:
51-
constexpr SPISettings(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, bool noRecv = SPI_TRANSMITRECEIVE)
48+
constexpr SPISettings(uint32_t clock, BitOrder bitOrder, SPIMode dataMode)
5249
: clockFreq(clock),
5350
bitOrder(bitOrder),
54-
dataMode(dataMode),
55-
noReceive(noRecv)
51+
dataMode(dataMode)
5652
{ }
5753
constexpr SPISettings()
5854
: clockFreq(SPI_SPEED_CLOCK_DEFAULT),
5955
bitOrder(MSBFIRST),
60-
dataMode(SPI_MODE0),
61-
noReceive(SPI_TRANSMITRECEIVE)
56+
dataMode(SPI_MODE0)
6257
{ }
6358

6459
bool operator==(const SPISettings &rhs) const
6560
{
6661
if ((this->clockFreq == rhs.clockFreq) &&
6762
(this->bitOrder == rhs.bitOrder) &&
68-
(this->dataMode == rhs.dataMode) &&
69-
(this->noReceive == rhs.noReceive)) {
63+
(this->dataMode == rhs.dataMode)) {
7064
return true;
7165
}
7266
return false;
@@ -81,7 +75,6 @@ class SPISettings {
8175
uint32_t clockFreq; //specifies the spi bus maximum clock speed
8276
BitOrder bitOrder; //bit order (MSBFirst or LSBFirst)
8377
SPIMode dataMode; //one of the data mode
84-
bool noReceive;
8578

8679
friend class SPIClass;
8780
};

0 commit comments

Comments
 (0)