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

Restore hwspi._mode at the end of all DMA transfers

Browse Source
This commit is contained in:
Phillip Burgess 2019-05-17 23:32:23 -07:00
parent 5fa33d0020
commit a103ad28a2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Adafruit_SPITFT.cpp
View File

@ -528,8 +528,8 @@ void Adafruit_SPITFT::initSPI(uint32_t freq, uint8_t spiMode) {
hwspi.settings = SPISettings(freq, MSBFIRST, spiMode);
#else
hwspi._freq = freq; // Save freq value for later
hwspi._mode = spiMode; // Save spiMode value for later
#endif
hwspi._mode = spiMode; // Save spiMode value for later
// Call hwspi._spi->begin() ONLY if this is among the 'established'
// SPI interfaces in variant.h. For DIY roll-your-own SERCOM SPIs,
// begin() and pinPeripheral() calls MUST be made in one's calling
@ -1033,7 +1033,7 @@ void Adafruit_SPITFT::writePixels(uint16_t *colors, uint32_t len,
#if defined(__SAMD51__) || defined(_SAMD21_)
if(connection == TFT_HARD_SPI) {
// See SAMD51/21 note in writeColor()
hwspi._spi->setDataMode(SPI_MODE0);
hwspi._spi->setDataMode(hwspi._mode);
} else {
pinPeripheral(tft8._wr, PIO_OUTPUT); // Switch WR back to GPIO
}
@ -1062,7 +1062,7 @@ void Adafruit_SPITFT::dmaWait(void) {
#if defined(__SAMD51__) || defined(_SAMD21_)
if(connection == TFT_HARD_SPI) {
// See SAMD51/21 note in writeColor()
hwspi._spi->setDataMode(SPI_MODE0);
hwspi._spi->setDataMode(hwspi._mode);
} else {
pinPeripheral(tft8._wr, PIO_OUTPUT); // Switch WR back to GPIO
}
@ -1188,7 +1188,7 @@ void Adafruit_SPITFT::writeColor(uint16_t color, uint32_t len) {
// state on completion. Workaround is to explicitly set it back...
// (5/17/2019: apparently SAMD21 too, in certain cases, observed
// with ST7789 display.)
hwspi._spi->setDataMode(SPI_MODE0);
hwspi._spi->setDataMode(hwspi._mode);
} else {
pinPeripheral(tft8._wr, PIO_OUTPUT); // Switch WR back to GPIO
}

2
Adafruit_SPITFT.h
View File

@ -395,8 +395,8 @@ class Adafruit_SPITFT : public Adafruit_GFX {
SPISettings settings; ///< SPI transaction settings
#else
uint32_t _freq; ///< SPI bitrate (if no SPI transactions)
uint32_t _mode; ///< SPI data mode (if no SPI transactions)
#endif
uint32_t _mode; ///< SPI data mode (transactions or no)
} hwspi; ///< Hardware SPI values
struct { // Values specific to SOFTWARE SPI:
#if defined(USE_FAST_PINIO)