Bodmer/TFT_eSPI
1
0
Fork 1
mirror of https://github.com/Bodmer/TFT_eSPI.git synced 2025-08-08 15:14:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make DMA wait handling consistent for ESP32 and STM32

Browse Source
This commit is contained in:
Bodmer
2020-11-19 00:36:59 +00:00
parent bf5bf1852e
commit df23e14675
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Processors/TFT_eSPI_ESP32.c
View File

@@ -538,13 +538,14 @@ void TFT_eSPI::dmaWait(void)
/***************************************************************************************
** Function name: pushImageDMA
** Function name: pushPixelsDMA
** Description: Push pixels to TFT (len must be less than 32767)
***************************************************************************************/
// This will byte swap the original image if setSwapBytes(true) was called by sketch.
void TFT_eSPI::pushPixelsDMA(uint16_t* image, uint32_t len)
{
if ((len == 0) || (!DMA_Enabled)) return;
dmaWait();
if(_swapBytes) {
@@ -592,7 +593,10 @@ void TFT_eSPI::pushImageDMA(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t
uint32_t len = dw*dh;
if (buffer == nullptr) { buffer = image; dmaWait(); }
if (buffer == nullptr) {
buffer = image;
dmaWait();
}
// If image is clipped, copy pixels into a contiguous block
if ( (dw != w) || (dh != h) ) {

9
Processors/TFT_eSPI_STM32.c
View File

@@ -421,7 +421,7 @@ void TFT_eSPI::dmaWait(void)
/***************************************************************************************
** Function name: pushImageDMA
** Function name: pushPixelsDMA
** Description: Push pixels to TFT (len must be less than 32767)
***************************************************************************************/
// This will byte swap the original image if setSwapBytes(true) was called by sketch.
@@ -462,11 +462,12 @@ void TFT_eSPI::pushImageDMA(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t
if (dw < 1 || dh < 1) return;
if (buffer == nullptr) buffer = image;
uint32_t len = dw*dh;
while (spiHal.State == HAL_SPI_STATE_BUSY_TX); // Check if SPI Tx is busy
if (buffer == nullptr) {
buffer = image;
while (spiHal.State == HAL_SPI_STATE_BUSY_TX); // Check if SPI Tx is busy
}
// If image is clipped, copy pixels into a contiguous block
if ( (dw != w) || (dh != h) ) {