Skip to content

chore(stm32): manage SPI API changes #461

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore(stm32): manage SPI API changes #461

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
12 changes: 12 additions & 0 deletions src/SpiDriver/SdSpiSTM32Core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,13 @@ void SdSpiArduinoDriver::end() { m_spi->end(); }
uint8_t SdSpiArduinoDriver::receive() { return m_spi->transfer(0XFF); }
//------------------------------------------------------------------------------
uint8_t SdSpiArduinoDriver::receive(uint8_t* buf, size_t count) {
#if defined(STM32_CORE_VERSION) && STM32_CORE_VERSION > 0x02070000
m_spi->transfer(NULL, buf, count);
#else
// Must send 0XFF - SD looks at send data for command.
memset(buf, 0XFF, count);
m_spi->transfer(buf, count);
#endif
return 0;
}
//------------------------------------------------------------------------------
Expand All @@ -57,9 +61,17 @@ void SdSpiArduinoDriver::send(const uint8_t* buf, size_t count) {
if (count > 512) {
return;
}
#if defined(STM32_CORE_VERSION)
#if STM32_CORE_VERSION > 0x02070000
m_spi->transfer(buf, NULL, count);
#elif STM32_CORE_VERSION == 0x02070000
#error "STM32 core version 2.7.0 is not compatible due to SPI API changes."
#endif
#else
// Not easy to avoid receive so use tmp RX buffer.
uint8_t rxBuf[512];
// Discard const - STM32 not const correct.
m_spi->transfer(const_cast<uint8_t*>(buf), rxBuf, count);
#endif
}
#endif // defined(SD_USE_CUSTOM_SPI) && defined(STM32_CORE_VERSION)