Skip to content

[SPI] Fix CS pin check #1219

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

Merged
merged 1 commit into from
Oct 26, 2020
Merged

[SPI] Fix CS pin check #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 15 additions & 47 deletions libraries/SPI/src/SPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,7 @@ SPIClass::SPIClass(uint8_t mosi, uint8_t miso, uint8_t sclk, uint8_t ssel) : _CS
*/
void SPIClass::begin(uint8_t _pin)
{
uint8_t idx;

if (_pin > NUM_DIGITAL_PINS) {
return;
}

idx = pinIdx(_pin, ADD_NEW_PIN);
uint8_t idx = pinIdx(_pin, ADD_NEW_PIN);
if (idx >= NB_SPI_SETTINGS) {
return;
}
Expand Down Expand Up @@ -101,13 +95,7 @@ void SPIClass::begin(uint8_t _pin)
*/
void SPIClass::beginTransaction(uint8_t _pin, SPISettings settings)
{
uint8_t idx;

if (_pin > NUM_DIGITAL_PINS) {
return;
}

idx = pinIdx(_pin, ADD_NEW_PIN);
uint8_t idx = pinIdx(_pin, ADD_NEW_PIN);
if (idx >= NB_SPI_SETTINGS) {
return;
}
Expand All @@ -134,10 +122,6 @@ void SPIClass::beginTransaction(uint8_t _pin, SPISettings settings)
*/
void SPIClass::endTransaction(uint8_t _pin)
{
if (_pin > NUM_DIGITAL_PINS) {
return;
}

RemovePin(_pin);
_CSPinConfig = NO_CONFIG;
}
Expand All @@ -160,10 +144,6 @@ void SPIClass::end()
*/
void SPIClass::setBitOrder(uint8_t _pin, BitOrder _bitOrder)
{
if (_pin > NUM_DIGITAL_PINS) {
return;
}

uint8_t idx = pinIdx(_pin, GET_IDX);
if (idx >= NB_SPI_SETTINGS) {
return;
Expand All @@ -190,10 +170,6 @@ void SPIClass::setBitOrder(uint8_t _pin, BitOrder _bitOrder)
*/
void SPIClass::setDataMode(uint8_t _pin, uint8_t _mode)
{
if (_pin > NUM_DIGITAL_PINS) {
return;
}

uint8_t idx = pinIdx(_pin, GET_IDX);
if (idx >= NB_SPI_SETTINGS) {
return;
Expand Down Expand Up @@ -223,10 +199,6 @@ void SPIClass::setDataMode(uint8_t _pin, uint8_t _mode)
*/
void SPIClass::setClockDivider(uint8_t _pin, uint8_t _divider)
{
if (_pin > NUM_DIGITAL_PINS) {
return;
}

uint8_t idx = pinIdx(_pin, GET_IDX);
if (idx >= NB_SPI_SETTINGS) {
return;
Expand Down Expand Up @@ -260,14 +232,12 @@ byte SPIClass::transfer(uint8_t _pin, uint8_t data, SPITransferMode _mode)
{
uint8_t rx_buffer = 0;

if (_pin > NUM_DIGITAL_PINS) {
uint8_t idx = pinIdx(_pin, GET_IDX);
if (idx >= NB_SPI_SETTINGS) {
return rx_buffer;
}
uint8_t idx = pinIdx(_pin, GET_IDX);

if (_pin != _CSPinConfig) {
if (idx >= NB_SPI_SETTINGS) {
return rx_buffer;
}
spi_init(&_spi, spiSettings[idx].clk,
spiSettings[idx].dMode,
spiSettings[idx].bOrder);
Expand Down Expand Up @@ -305,10 +275,6 @@ uint16_t SPIClass::transfer16(uint8_t _pin, uint16_t data, SPITransferMode _mode
uint16_t rx_buffer = 0;
uint16_t tmp;

if (_pin > NUM_DIGITAL_PINS) {
return rx_buffer;
}

uint8_t idx = pinIdx(_pin, GET_IDX);
if (idx >= NB_SPI_SETTINGS) {
return rx_buffer;
Expand Down Expand Up @@ -361,14 +327,15 @@ uint16_t SPIClass::transfer16(uint8_t _pin, uint16_t data, SPITransferMode _mode
*/
void SPIClass::transfer(uint8_t _pin, void *_buf, size_t _count, SPITransferMode _mode)
{
if ((_count == 0) || (_buf == NULL) || (_pin > NUM_DIGITAL_PINS)) {
if ((_count == 0) || (_buf == NULL)) {
return;
}
uint8_t idx = pinIdx(_pin, GET_IDX);
if (idx >= NB_SPI_SETTINGS) {
return;
}
if (_pin != _CSPinConfig) {
if (idx >= NB_SPI_SETTINGS) {
return;
}

spi_init(&_spi, spiSettings[idx].clk,
spiSettings[idx].dMode,
spiSettings[idx].bOrder);
Expand Down Expand Up @@ -404,14 +371,15 @@ void SPIClass::transfer(uint8_t _pin, void *_buf, size_t _count, SPITransferMode
*/
void SPIClass::transfer(byte _pin, void *_bufout, void *_bufin, size_t _count, SPITransferMode _mode)
{
if ((_count == 0) || (_bufout == NULL) || (_bufin == NULL) || (_pin > NUM_DIGITAL_PINS)) {
if ((_count == 0) || (_bufout == NULL) || (_bufin == NULL)) {
return;
}
uint8_t idx = pinIdx(_pin, GET_IDX);
if (idx >= NB_SPI_SETTINGS) {
return;
}

if (_pin != _CSPinConfig) {
if (idx >= NB_SPI_SETTINGS) {
return;
}
spi_init(&_spi, spiSettings[idx].clk,
spiSettings[idx].dMode,
spiSettings[idx].bOrder);
Expand Down
4 changes: 2 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 @@ -248,7 +248,7 @@ class SPIClass {
{
uint8_t i;

if (_pin > NUM_DIGITAL_PINS) {
if ((_pin > NUM_DIGITAL_PINS) && (!digitalPinIsValid(_pin))) {
return NB_SPI_SETTINGS;
}

Expand All @@ -271,7 +271,7 @@ class SPIClass {

void RemovePin(uint8_t _pin)
{
if (_pin > NUM_DIGITAL_PINS) {
if ((_pin > NUM_DIGITAL_PINS) && (!digitalPinIsValid(_pin))) {
return;
}

Expand Down