jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-07-28 14:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[spi] Cater for non-word-aligned buffers on esp8266 (#9108)

Browse Source
This commit is contained in:
Clyde Stubbs 2025-06-17 12:30:09 +10:00 committed by Jesse Hills
parent 62abfbec9e
commit fd83628c49
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
esphome/components/spi/spi_arduino.cpp
View File

@ -3,7 +3,6 @@
namespace esphome { namespace esphome {
namespace spi { namespace spi {
#ifdef USE_ARDUINO #ifdef USE_ARDUINO
static const char *const TAG = "spi-esp-arduino"; static const char *const TAG = "spi-esp-arduino";
@ -38,17 +37,31 @@ class SPIDelegateHw : public SPIDelegate {
void write16(uint16_t data) override { this->channel_->transfer16(data); } void write16(uint16_t data) override { this->channel_->transfer16(data); }
#ifdef USE_RP2040
void write_array(const uint8_t *ptr, size_t length) override { void write_array(const uint8_t *ptr, size_t length) override {
// avoid overwriting the supplied buffer if (length == 1) {
uint8_t *rxbuf = new uint8_t[length]; // NOLINT(cppcoreguidelines-owning-memory) this->channel_->transfer(*ptr);
memcpy(rxbuf, ptr, length); return;
this->channel_->transfer((void *) rxbuf, length); }
delete[] rxbuf; // NOLINT(cppcoreguidelines-owning-memory) #ifdef USE_RP2040
} // avoid overwriting the supplied buffer. Use vector for automatic deallocation
auto rxbuf = std::vector<uint8_t>(length);
memcpy(rxbuf.data(), ptr, length);
this->channel_->transfer((void *) rxbuf.data(), length);
#elif defined(USE_ESP8266)
// ESP8266 SPI library requires the pointer to be word aligned, but the data may not be
// so we need to copy the data to a temporary buffer
if (reinterpret_cast<uintptr_t>(ptr) & 0x3) {
ESP_LOGVV(TAG, "SPI write buffer not word aligned, copying to temporary buffer");
auto txbuf = std::vector<uint8_t>(length);
memcpy(txbuf.data(), ptr, length);
this->channel_->writeBytes(txbuf.data(), length);
} else {
this->channel_->writeBytes(ptr, length);
}
#else #else
void write_array(const uint8_t *ptr, size_t length) override { this->channel_->writeBytes(ptr, length); } this->channel_->writeBytes(ptr, length);
#endif #endif
}
void read_array(uint8_t *ptr, size_t length) override { this->channel_->transfer(ptr, length); } void read_array(uint8_t *ptr, size_t length) override { this->channel_->transfer(ptr, length); }