kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

more dma in tft driver

Browse Source
This commit is contained in:
KubaPro010
2026-01-18 23:05:06 +01:00
parent f9b53f170e
commit a3addcb21c
2 changed files with 95 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
lib/TFT_eSPI/TFT_eSPI.cpp
View File

@@ -1,16 +1,36 @@
#include "TFT_eSPI.h"
#include <Arduino.h>
#include <SPI.h>
#include "soc/dport_access.h"
#include "soc/dport_reg.h"
SPIClass spi = SPIClass(VSPI);
spi_device_handle_t dmaHAL;
spi_host_device_t spi_host = VSPI_HOST;
volatile uint32_t* _spi_cmd = (volatile uint32_t*)(SPI_CMD_REG(VSPI));
volatile uint32_t* _spi_ctrl = (volatile uint32_t*)(SPI_CTRL_REG(VSPI));
volatile uint32_t* _spi_user = (volatile uint32_t*)(SPI_USER_REG(VSPI));
volatile uint32_t* _spi_mosi_dlen = (volatile uint32_t*)(SPI_MOSI_DLEN_REG(VSPI));
volatile uint32_t* _spi_miso_dlen = (volatile uint32_t*)(SPI_MISO_DLEN_REG(VSPI));
volatile uint32_t* _spi_w = (volatile uint32_t*)(SPI_W0_REG(VSPI));
volatile uint32_t* _spi_clock = (volatile uint32_t*)(SPI_CLOCK_REG(VSPI));
uint8_t transfer(uint8_t val) {
*_spi_miso_dlen = 7;
tft_Write_8(val);
return *_spi_w & 0xff;
}
#define MSB_16_SET(var, val) { (var) = (((val) & 0xFF00) >> 8) | (((val) & 0xFF) << 8); }
uint16_t transfer16(uint16_t val) {
if(!(*_spi_ctrl & SPI_WR_BIT_ORDER)) MSB_16_SET(val, val);
*_spi_miso_dlen = 15;
tft_Write_16S(val);
uint16_t out = *_spi_w & 0xffff;
if(!(*_spi_ctrl & SPI_RD_BIT_ORDER)) MSB_16_SET(out, out);
return out;
}
void TFT_eSPI::pushBlock(uint16_t color, uint32_t len) {
@@ -238,7 +258,7 @@ bool TFT_eSPI::initDMA(bool ctrl_cs)
inline void TFT_eSPI::begin_tft_write() {
if (locked) {
locked = false; // Flag to show SPI access now unlocked
spi.beginTransaction(SPISettings(spi_write_speed * 1000000, MSBFIRST, SPI_MODE0));
SPI_SET_CLOCK_FREQ(spi_write_speed * 1000000);
CS_L;
SET_BUS_WRITE_MODE;
}
@@ -247,7 +267,7 @@ inline void TFT_eSPI::begin_tft_write() {
void TFT_eSPI::begin_nin_write() {
if (locked) {
locked = false; // Flag to show SPI access now unlocked
spi.beginTransaction(SPISettings(spi_write_speed * 1000000, MSBFIRST, SPI_MODE0));
SPI_SET_CLOCK_FREQ(spi_write_speed * 1000000);
CS_L;
SET_BUS_WRITE_MODE;
}
@@ -255,24 +275,22 @@ void TFT_eSPI::begin_nin_write() {
inline void TFT_eSPI::end_tft_write() {
if(!inTransaction) { // Flag to stop ending transaction during multiple graphics calls
if (!locked) { // Locked when beginTransaction has been called
if (!locked) { // Locked when has been called
locked = true; // Flag to show SPI access now locked
SPI_BUSY_CHECK; // Check send complete and clean out unused rx data
CS_H;
SET_BUS_READ_MODE; // In case bus has been configured for tx only
spi.endTransaction();
}
}
}
inline void TFT_eSPI::end_nin_write() {
if(!inTransaction) { // Flag to stop ending transaction during multiple graphics calls
if (!locked) { // Locked when beginTransaction has been called
if (!locked) { // Locked when has been called
locked = true; // Flag to show SPI access now locked
SPI_BUSY_CHECK; // Check send complete and clean out unused rx data
CS_H;
SET_BUS_READ_MODE; // In case SPI has been configured for tx only
spi.endTransaction();
}
}
}
@@ -281,7 +299,7 @@ inline void TFT_eSPI::begin_tft_read() {
dmaWait();
if (locked) {
locked = false;
spi.beginTransaction(SPISettings(SPI_READ_FREQUENCY, MSBFIRST, SPI_MODE0));
SPI_SET_CLOCK_FREQ(SPI_READ_FREQUENCY);
CS_L;
}
SET_BUS_READ_MODE;
@@ -292,7 +310,6 @@ inline void TFT_eSPI::end_tft_read() {
if (!locked) {
locked = true;
CS_H;
spi.endTransaction();
}
}
SET_BUS_WRITE_MODE;
@@ -432,16 +449,13 @@ if (TOUCH_CS >= 0) {
}
}
void TFT_eSPI::init()
{
#define OR_REGISTER(register, value) WRITE_PERI_REG(register, READ_PERI_REG(register) | value)
void TFT_eSPI::init() {
if (booted) {
initBus();
#if defined (TFT_MOSI) && !defined (TFT_SPI_OVERLAP)
spi.begin(TFT_SCLK, TFT_MISO, TFT_MOSI, -1); // This will set MISO to input
#else
spi.begin(); // This will set MISO to input
#endif
spi.begin(TFT_SCLK, TFT_MISO, TFT_MOSI, -1); // This will set MISO to input
lockTransaction = false;
inTransaction = false;
locked = true;
@@ -3013,14 +3027,14 @@ void TFT_eSPI::drawGlyph(uint16_t code, uint16_t font) {
inline void TFT_eSPI::begin_touch_read_write() {
dmaWait();
CS_H; // Just in case it has been left low
if (locked) {locked = false; spi.beginTransaction(SPISettings(SPI_TOUCH_FREQUENCY, MSBFIRST, SPI_MODE0));}
if (locked) {locked = false; SPI_SET_CLOCK_FREQ(SPI_TOUCH_FREQUENCY);}
SET_BUS_READ_MODE;
gpio_set_level((gpio_num_t)TOUCH_CS, 0);
}
inline void TFT_eSPI::end_touch_read_write() {
gpio_set_level((gpio_num_t)TOUCH_CS, 1);
if(!inTransaction) {if (!locked) {locked = true; spi.endTransaction();}}
if(!inTransaction) {if (!locked) {locked = true;}}
}
uint8_t TFT_eSPI::getTouchRaw(uint16_t *x, uint16_t *y){
@@ -3028,31 +3042,31 @@ uint8_t TFT_eSPI::getTouchRaw(uint16_t *x, uint16_t *y){
begin_touch_read_write();
spi.transfer(0xd0);
spi.transfer(0);
spi.transfer(0xd0);
spi.transfer(0);
spi.transfer(0xd0);
spi.transfer(0);
spi.transfer(0xd0);
transfer(0xd0);
transfer(0);
transfer(0xd0);
transfer(0);
transfer(0xd0);
transfer(0);
transfer(0xd0);
tmp = spi.transfer(0); // Read first 8 bits
tmp = transfer(0); // Read first 8 bits
tmp = tmp <<5;
tmp |= 0x1f & (spi.transfer(0x90)>>3); // Read last 8 bits and start new XP conversion
tmp |= 0x1f & (transfer(0x90)>>3); // Read last 8 bits and start new XP conversion
*x = tmp;
// Start XP sample request for y position, read 4 times and keep last sample
spi.transfer(0); // Read first 8 bits
spi.transfer(0x90); // Read last 8 bits and start new XP conversion
spi.transfer(0); // Read first 8 bits
spi.transfer(0x90); // Read last 8 bits and start new XP conversion
spi.transfer(0); // Read first 8 bits
spi.transfer(0x90); // Read last 8 bits and start new XP conversion
transfer(0); // Read first 8 bits
transfer(0x90); // Read last 8 bits and start new XP conversion
transfer(0); // Read first 8 bits
transfer(0x90); // Read last 8 bits and start new XP conversion
transfer(0); // Read first 8 bits
transfer(0x90); // Read last 8 bits and start new XP conversion
tmp = spi.transfer(0); // Read first 8 bits
tmp = transfer(0); // Read first 8 bits
tmp = tmp <<5;
tmp |= 0x1f & (spi.transfer(0)>>3); // Read last 8 bits
tmp |= 0x1f & (transfer(0)>>3); // Read last 8 bits
*y = tmp;
@@ -3071,9 +3085,9 @@ uint16_t TFT_eSPI::getTouchRawZ() {
// Z sample request
int16_t tz = 0xFFF;
spi.transfer(0xb0); // Start new Z1 conversion
tz += spi.transfer16(0xc0) >> 3; // Read Z1 and start Z2 conversion
tz -= spi.transfer16(0x00) >> 3; // Read Z2
transfer(0xb0); // Start new Z1 conversion
tz += transfer16(0xc0) >> 3; // Read Z1 and start Z2 conversion
tz -= transfer16(0x00) >> 3; // Read Z2
end_touch_read_write();

43
lib/TFT_eSPI/TFT_eSPI.h
View File

@@ -7,6 +7,47 @@
#define SPI_READ_FREQUENCY 20000000
#define SPI_TOUCH_FREQUENCY 2500000
#define SPI_SET_CLOCK_FREQ(target_freq_hz) \
do { \
uint32_t sys_freq = getApbFrequency(); \
if(sys_freq == target_freq_hz) { \
*_spi_clock = 1 << 31;\
return; \
} \
uint32_t pre_div = 1; \
uint32_t cnt_n = 1; \
\
/* Find optimal dividers: sys_freq / pre_div / cnt_n = target_freq */ \
uint32_t total_div = (sys_freq + (target_freq_hz) - 1) / (target_freq_hz); \
\
/* Try to balance pre_div and cnt_n for best accuracy */ \
for (uint32_t p = 1; p <= 0x2000; p++) { \
uint32_t c = (total_div + p - 1) / p; \
if (c >= 1 && c <= 0x40) { \
pre_div = p; \
cnt_n = c; \
break; \
} \
} \
\
/* Adjust to register format (values are minus one) */ \
pre_div = (pre_div > 1) ? (pre_div - 1) : 0; \
cnt_n = (cnt_n > 1) ? (cnt_n - 1) : 0; \
\
/* Calculate cnt_h for 50% duty cycle */ \
uint32_t cnt_h = (cnt_n > 0) ? ((cnt_n + 1) / 2 - 1) : 0; \
\
/* Build register value */ \
uint32_t reg_val = 0; \
reg_val |= (0 << 31); /* SPI_CLK_EQU_SYSCLK = 0 (use dividers) */ \
reg_val |= (pre_div << 18); /* SPI_CLKDIV_PRE */ \
reg_val |= (cnt_n << 12); /* SPI_CLKCNT_N */ \
reg_val |= (cnt_h << 6); /* SPI_CLKCNT_H */ \
reg_val |= (cnt_n << 0); /* SPI_CLKCNT_L = SPI_CLKCNT_N */ \
\
*_spi_clock = reg_val; \
} while(0)
#define TFT_WIDTH 240
#define TFT_HEIGHT 320
@@ -72,7 +113,7 @@
// Write same value twice
#define tft_Write_32D(C) TFT_WRITE_BITS((uint16_t)((C)<<8 | (C)>>8)<<16 | (uint16_t)((C)<<8 | (C)>>8), 32)
#define tft_Read_8() spi.transfer(0)
#define tft_Read_8() transfer(0)
#define DAT8TO32(P) ( (uint32_t)P[0]<<8 | P[1] | P[2]<<24 | P[3]<<16 )