feedc0de/TFT_eSPI
1
0
Fork 0
forked from Bodmer/TFT_eSPI
Code Pull Requests Activity

Removed again lots of arduino bullshit

Browse Source
This commit is contained in:
0xFEEDC0DE64
2023-03-29 16:00:47 +02:00
parent 1d1ec84182
commit 6091596881
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Extensions/Smooth_font.cpp
View File

@@ -239,7 +239,6 @@ void TFT_eSPI::loadMetrics(void)
bitmapPtr += gWidth[gNum] * gHeight[gNum]; bitmapPtr += gWidth[gNum] * gHeight[gNum];
gNum++; gNum++;
yield();
} }
gFont.yAdvance = gFont.maxAscent + gFont.maxDescent; gFont.yAdvance = gFont.maxAscent + gFont.maxDescent;
@@ -574,7 +573,6 @@ void TFT_eSPI::showFont(uint32_t td)
setCursor(cursorX, cursorY); setCursor(cursorX, cursorY);
drawGlyph(gUnicode[i]); drawGlyph(gUnicode[i]);
cursorX += gxAdvance[i]; cursorX += gxAdvance[i];
yield();
} }
delay(timeDelay); delay(timeDelay);

8
TFT_eSPI.cpp
View File

@@ -42,7 +42,7 @@
#endif #endif
#include "freertos/task.h" #include "freertos/task.h"
#include "wiring_shift.h" #include "esp32-hal-spi.h"
#include "esp32-hal-gpio.h" #include "esp32-hal-gpio.h"
#include "esp32-hal-misc.h" #include "esp32-hal-misc.h"
@@ -91,7 +91,7 @@ inline void TFT_eSPI::begin_tft_write(void){
if (locked) { if (locked) {
locked = false; // Flag to show SPI access now unlocked locked = false; // Flag to show SPI access now unlocked
#if defined (SPI_HAS_TRANSACTION) && defined (SUPPORT_TRANSACTIONS) && !defined(TFT_PARALLEL_8_BIT) && !defined(RP2040_PIO_INTERFACE) #if defined (SPI_HAS_TRANSACTION) && defined (SUPPORT_TRANSACTIONS) && !defined(TFT_PARALLEL_8_BIT) && !defined(RP2040_PIO_INTERFACE)
spi.beginTransaction(SPISettings(SPI_FREQUENCY, MSBFIRST, TFT_SPI_MODE)); spi.beginTransaction(SPISettings(SPI_FREQUENCY, SPI_MSBFIRST, TFT_SPI_MODE));
#endif #endif
CS_L; CS_L;
SET_BUS_WRITE_MODE; // Some processors (e.g. ESP32) allow recycling the tx buffer when rx is not used SET_BUS_WRITE_MODE; // Some processors (e.g. ESP32) allow recycling the tx buffer when rx is not used
@@ -103,7 +103,7 @@ void TFT_eSPI::begin_nin_write(void){
if (locked) { if (locked) {
locked = false; // Flag to show SPI access now unlocked locked = false; // Flag to show SPI access now unlocked
#if defined (SPI_HAS_TRANSACTION) && defined (SUPPORT_TRANSACTIONS) && !defined(TFT_PARALLEL_8_BIT) && !defined(RP2040_PIO_INTERFACE) #if defined (SPI_HAS_TRANSACTION) && defined (SUPPORT_TRANSACTIONS) && !defined(TFT_PARALLEL_8_BIT) && !defined(RP2040_PIO_INTERFACE)
spi.beginTransaction(SPISettings(SPI_FREQUENCY, MSBFIRST, TFT_SPI_MODE)); spi.beginTransaction(SPISettings(SPI_FREQUENCY, SPI_MSBFIRST, TFT_SPI_MODE));
#endif #endif
CS_L; CS_L;
SET_BUS_WRITE_MODE; // Some processors (e.g. ESP32) allow recycling the tx buffer when rx is not used SET_BUS_WRITE_MODE; // Some processors (e.g. ESP32) allow recycling the tx buffer when rx is not used
@@ -155,7 +155,7 @@ inline void TFT_eSPI::begin_tft_read(void){
#if defined (SPI_HAS_TRANSACTION) && defined (SUPPORT_TRANSACTIONS) && !defined(TFT_PARALLEL_8_BIT) && !defined(RP2040_PIO_INTERFACE) #if defined (SPI_HAS_TRANSACTION) && defined (SUPPORT_TRANSACTIONS) && !defined(TFT_PARALLEL_8_BIT) && !defined(RP2040_PIO_INTERFACE)
if (locked) { if (locked) {
locked = false; locked = false;
spi.beginTransaction(SPISettings(SPI_READ_FREQUENCY, MSBFIRST, TFT_SPI_MODE)); spi.beginTransaction(SPISettings(SPI_READ_FREQUENCY, SPI_MSBFIRST, TFT_SPI_MODE));
CS_L; CS_L;
} }
#else #else