alex/Adafruit-GFX-Library
1
0
Fork 0
mirror of https://github.com/adafruit/Adafruit-GFX-Library.git synced 2024-10-03 18:18:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #360 from Daft-Freak/patch-1

Browse Source 
Call spi_write_blocking directly for RP2040
This commit is contained in:
Paint Your Dragon 2021-09-17 10:55:25 -07:00 committed by GitHub
commit c1e5056dcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Adafruit_SPITFT.cpp
View File

@ -1021,6 +1021,21 @@ void Adafruit_SPITFT::writePixels(uint16_t *colors, uint32_t len, bool block,
swapBytes(colors, len); // big-to-little endian to restore pixel buffer swapBytes(colors, len); // big-to-little endian to restore pixel buffer
} }
return;
#elif defined(ARDUINO_ARCH_RP2040)
spi_inst_t *pi_spi = hwspi._spi == &SPI ? spi0 : spi1;
if (!bigEndian) {
// switch to 16-bit writes
hw_write_masked(&spi_get_hw(pi_spi)->cr0, 15 << SPI_SSPCR0_DSS_LSB,
SPI_SSPCR0_DSS_BITS);
spi_write16_blocking(pi_spi, colors, len);
// switch back to 8-bit
hw_write_masked(&spi_get_hw(pi_spi)->cr0, 7 << SPI_SSPCR0_DSS_LSB,
SPI_SSPCR0_DSS_BITS);
} else {
spi_write_blocking(pi_spi, (uint8_t *)colors, len * 2);
}
return; return;
#elif defined(USE_SPI_DMA) && \ #elif defined(USE_SPI_DMA) && \
(defined(__SAMD51__) || defined(ARDUINO_SAMD_ZERO)) (defined(__SAMD51__) || defined(ARDUINO_SAMD_ZERO))
@ -1326,7 +1341,13 @@ void Adafruit_SPITFT::writeColor(uint16_t color, uint32_t len) {
hwspi._spi->write(lo); hwspi._spi->write(lo);
} }
} while (len); } while (len);
#else // !ESP8266 #elif defined(ARDUINO_ARCH_RP2040)
spi_inst_t *pi_spi = hwspi._spi == &SPI ? spi0 : spi1;
color = __builtin_bswap16(color);
while (len--)
spi_write_blocking(pi_spi, (uint8_t *)&color, 2);
#else // !ESP8266 && !ARDUINO_ARCH_RP2040
while (len--) { while (len--) {
#if defined(__AVR__) #if defined(__AVR__)
AVR_WRITESPI(hi); AVR_WRITESPI(hi);
@ -2079,6 +2100,9 @@ void Adafruit_SPITFT::spiWrite(uint8_t b) {
AVR_WRITESPI(b); AVR_WRITESPI(b);
#elif defined(ESP8266) || defined(ESP32) #elif defined(ESP8266) || defined(ESP32)
hwspi._spi->write(b); hwspi._spi->write(b);
#elif defined(ARDUINO_ARCH_RP2040)
spi_inst_t *pi_spi = hwspi._spi == &SPI ? spi0 : spi1;
spi_write_blocking(pi_spi, &b, 1);
#else #else
hwspi._spi->transfer(b); hwspi._spi->transfer(b);
#endif #endif
@ -2385,6 +2409,10 @@ void Adafruit_SPITFT::SPI_WRITE16(uint16_t w) {
AVR_WRITESPI(w); AVR_WRITESPI(w);
#elif defined(ESP8266) || defined(ESP32) #elif defined(ESP8266) || defined(ESP32)
hwspi._spi->write16(w); hwspi._spi->write16(w);
#elif defined(ARDUINO_ARCH_RP2040)
spi_inst_t *pi_spi = hwspi._spi == &SPI ? spi0 : spi1;
w = __builtin_bswap16(w);
spi_write_blocking(pi_spi, (uint8_t *)&w, 2);
#else #else
// MSB, LSB because TFTs are generally big-endian // MSB, LSB because TFTs are generally big-endian
hwspi._spi->transfer(w >> 8); hwspi._spi->transfer(w >> 8);
@ -2437,6 +2465,10 @@ void Adafruit_SPITFT::SPI_WRITE32(uint32_t l) {
AVR_WRITESPI(l); AVR_WRITESPI(l);
#elif defined(ESP8266) || defined(ESP32) #elif defined(ESP8266) || defined(ESP32)
hwspi._spi->write32(l); hwspi._spi->write32(l);
#elif defined(ARDUINO_ARCH_RP2040)
spi_inst_t *pi_spi = hwspi._spi == &SPI ? spi0 : spi1;
l = __builtin_bswap32(l);
spi_write_blocking(pi_spi, (uint8_t *)&l, 4);
#else #else
hwspi._spi->transfer(l >> 24); hwspi._spi->transfer(l >> 24);
hwspi._spi->transfer(l >> 16); hwspi._spi->transfer(l >> 16);