Cansat
/
esp32_Adafruit_BusIO
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93 from eringerli/cs-transaction-management 

better transaction management
This commit is contained in:
Limor "Ladyada" Fried 2022-05-02 18:29:00 -04:00 committed by GitHub
parent 204c1de9ab f82f699c64
commit b949d28bde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
Adafruit_SPIDevice.cpp
View File

@ -282,6 +282,36 @@ void Adafruit_SPIDevice::endTransaction(void) {
} }
} }
/*!
* @brief Assert/Deassert the CS pin if it is defined
* @param value The state the CS is set to
*/
void Adafruit_SPIDevice::setChipSelect(int value) {
if (_cs != -1) {
digitalWrite(_cs, value);
}
}
/*!
* @brief Write a buffer or two to the SPI device, with transaction
* management.
* @brief Manually begin a transaction (calls beginTransaction if hardware
* SPI) with asserting the CS pin
*/
void Adafruit_SPIDevice::beginTransactionWithAssertingCS() {
beginTransaction();
setChipSelect(LOW);
}
/*!
* @brief Manually end a transaction (calls endTransaction if hardware SPI)
* with deasserting the CS pin
*/
void Adafruit_SPIDevice::endTransactionWithDeassertingCS() {
setChipSelect(HIGH);
endTransaction();
}
/*! /*!
* @brief Write a buffer or two to the SPI device, with transaction * @brief Write a buffer or two to the SPI device, with transaction
* management. * management.
@ -296,11 +326,8 @@ void Adafruit_SPIDevice::endTransaction(void) {
bool Adafruit_SPIDevice::write(const uint8_t *buffer, size_t len, bool Adafruit_SPIDevice::write(const uint8_t *buffer, size_t len,
const uint8_t *prefix_buffer, const uint8_t *prefix_buffer,
size_t prefix_len) { size_t prefix_len) {
if (_spi) { beginTransactionWithAssertingCS();
_spi->beginTransaction(*_spiSetting);
}
setChipSelect(LOW);
// do the writing // do the writing
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
if (_spi) { if (_spi) {
@ -320,11 +347,7 @@ bool Adafruit_SPIDevice::write(const uint8_t *buffer, size_t len,
transfer(buffer[i]); transfer(buffer[i]);
} }
} }
setChipSelect(HIGH); endTransactionWithDeassertingCS();
if (_spi) {
_spi->endTransaction();
}
#ifdef DEBUG_SERIAL #ifdef DEBUG_SERIAL
DEBUG_SERIAL.print(F("\tSPIDevice Wrote: ")); DEBUG_SERIAL.print(F("\tSPIDevice Wrote: "));
@ -361,17 +384,10 @@ bool Adafruit_SPIDevice::write(const uint8_t *buffer, size_t len,
*/ */
bool Adafruit_SPIDevice::read(uint8_t *buffer, size_t len, uint8_t sendvalue) { bool Adafruit_SPIDevice::read(uint8_t *buffer, size_t len, uint8_t sendvalue) {
memset(buffer, sendvalue, len); // clear out existing buffer memset(buffer, sendvalue, len); // clear out existing buffer
if (_spi) {
_spi->beginTransaction(*_spiSetting);
}
setChipSelect(LOW); beginTransactionWithAssertingCS();
transfer(buffer, len); transfer(buffer, len);
setChipSelect(HIGH); endTransactionWithDeassertingCS();
if (_spi) {
_spi->endTransaction();
}
#ifdef DEBUG_SERIAL #ifdef DEBUG_SERIAL
DEBUG_SERIAL.print(F("\tSPIDevice Read: ")); DEBUG_SERIAL.print(F("\tSPIDevice Read: "));
@ -405,11 +421,7 @@ bool Adafruit_SPIDevice::read(uint8_t *buffer, size_t len, uint8_t sendvalue) {
bool Adafruit_SPIDevice::write_then_read(const uint8_t *write_buffer, bool Adafruit_SPIDevice::write_then_read(const uint8_t *write_buffer,
size_t write_len, uint8_t *read_buffer, size_t write_len, uint8_t *read_buffer,
size_t read_len, uint8_t sendvalue) { size_t read_len, uint8_t sendvalue) {
if (_spi) { beginTransactionWithAssertingCS();
_spi->beginTransaction(*_spiSetting);
}
setChipSelect(LOW);
// do the writing // do the writing
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
if (_spi) { if (_spi) {
@ -455,11 +467,7 @@ bool Adafruit_SPIDevice::write_then_read(const uint8_t *write_buffer,
DEBUG_SERIAL.println(); DEBUG_SERIAL.println();
#endif #endif
setChipSelect(HIGH); endTransactionWithDeassertingCS();
if (_spi) {
_spi->endTransaction();
}
return true; return true;
} }
@ -475,29 +483,11 @@ bool Adafruit_SPIDevice::write_then_read(const uint8_t *write_buffer,
* writes * writes
*/ */
bool Adafruit_SPIDevice::write_and_read(uint8_t *buffer, size_t len) { bool Adafruit_SPIDevice::write_and_read(uint8_t *buffer, size_t len) {
if (_spi) { beginTransactionWithAssertingCS();
_spi->beginTransaction(*_spiSetting);
}
setChipSelect(LOW);
transfer(buffer, len); transfer(buffer, len);
setChipSelect(HIGH); endTransactionWithDeassertingCS();
if (_spi) {
_spi->endTransaction();
}
return true; return true;
} }
/*!
* @brief Assert/Deassert the CS pin if it is defined
* @param value The state the CS is set to
*/
void Adafruit_SPIDevice::setChipSelect(int value) {
if (_cs == -1)
return;
digitalWrite(_cs, value);
}
#endif // SPI exists #endif // SPI exists

2
Adafruit_SPIDevice.h
View File

@ -88,6 +88,8 @@ public:
void transfer(uint8_t *buffer, size_t len); void transfer(uint8_t *buffer, size_t len);
void beginTransaction(void); void beginTransaction(void);
void endTransaction(void); void endTransaction(void);
void beginTransactionWithAssertingCS();
void endTransactionWithDeassertingCS();
private: private:
SPIClass *_spi; SPIClass *_spi;