Seich
/
TFT_eSPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove incomplete bit-banging implementation 

This was never completed and is not used in ESP8266 code.
To implement 3-wire mode for ESP32, it will in any case be better to use
a similar implementation as for ESP8266 with 9-bit hardware SPI.
This commit is contained in:
Kristian Nielsen 2017-07-31 12:34:51 +02:00
parent 4b546e1811
commit e99e5a856b
3 changed files with 9 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
TFT_eSPI.cpp
View File

@ -123,16 +123,6 @@ TFT_eSPI::TFT_eSPI(int16_t w, int16_t h)
} }
#endif #endif
#ifdef TFT_DAT
digitalWrite(TFT_DAT, HIGH);
pinMode(TFT_DAT, OUTPUT);
#endif
#ifdef TFT_SCK
digitalWrite(TFT_SCK, LOW);
pinMode(TFT_SCK, OUTPUT);
#endif
_width = w; // Set by specific xxxxx_Defines.h file or by users sketch _width = w; // Set by specific xxxxx_Defines.h file or by users sketch
_height = h; // Set by specific xxxxx_Defines.h file or by users sketch _height = h; // Set by specific xxxxx_Defines.h file or by users sketch
rotation = 0; rotation = 0;
@ -215,17 +205,7 @@ void TFT_eSPI::init(void)
SPI.pins(6, 7, 8, 0); SPI.pins(6, 7, 8, 0);
#endif #endif
#ifdef TFT_DAT
cspinmask = (uint32_t) digitalPinToBitMask(TFT_CS);
#endif
#ifdef TFT_SCK
cspinmask = (uint32_t) digitalPinToBitMask(TFT_CS);
#endif
#if !defined(IFACE_3WIRE) || defined(IFACE_3WIRE_ESP8266)
SPI.begin(); // This will set HMISO to input SPI.begin(); // This will set HMISO to input
#endif
#else #else
#if defined (TFT_MOSI) && !defined (TFT_SPI_OVERLAP) #if defined (TFT_MOSI) && !defined (TFT_SPI_OVERLAP)
// ToDo: handle 3-wire interface on ESP32. // ToDo: handle 3-wire interface on ESP32.
@ -405,6 +385,11 @@ void TFT_eSPI::spiwrite(uint8_t c)
#endif #endif
/***************************************************************************************
** Function name: docommand
** Description: Send command, with optional input data in IN buffer and
** optional read out result to OUT buffer
***************************************************************************************/
#ifdef IFACE_3WIRE #ifdef IFACE_3WIRE
#ifdef IFACE_3WIRE_ESP8266 #ifdef IFACE_3WIRE_ESP8266
void TFT_eSPI::docommand(uint8_t c, uint8_t *in, uint32_t in_len, uint8_t *out, uint32_t out_len) void TFT_eSPI::docommand(uint8_t c, uint8_t *in, uint32_t in_len, uint8_t *out, uint32_t out_len)
@ -461,93 +446,7 @@ void TFT_eSPI::docommand(uint8_t c, uint8_t *in, uint32_t in_len, uint8_t *out,
} }
#else #else
void TFT_eSPI::docommand(uint8_t c, uint8_t *in, uint32_t in_len, uint8_t *out, uint32_t out_len) #error 3WIRE protocol currently only implemented for ESP8266
{
uint32_t i;
uint32_t val;
DAT_O;
CS_L;
delay_ns(ST7787_T_CSS);
/* Write the command byte. */
/* First shift out the data/command bit ('0' for command). */
SCK_L;
DAT_L;
delay_ns(ST7787_T_SLW);
SCK_H;
delay_ns(ST7787_T_SHW);
/* Then shift out the bits, MSB-to-LSB. */
val = c;
for (i = 8; i; --i) {
SCK_L;
if ((val>>7) & 1)
DAT_H;
else
DAT_L;
val <<= 1;
delay_ns(ST7787_T_SLW);
SCK_H;
delay_ns(ST7787_T_SHW);
}
/* Write any command data. */
if (in_len) {
do {
val = *in++;
/* Data/command bit ('1' for data). */
SCK_L;
DAT_H;
delay_ns(ST7787_T_SLW);
SCK_H;
delay_ns(ST7787_T_SHW);
for (i = 8; i; --i) {
SCK_L;
if ((val>>7) & 1)
DAT_H;
else
DAT_L;
val <<= 1;
delay_ns(ST7787_T_SLW);
SCK_H;
delay_ns(ST7787_T_SHW);
}
} while (--in_len > 0);
}
DAT_I;
/* Read reply. */
if (out_len) {
/* Dummy bit (according to data sheet, data/command placeholder?). */
SCK_L;
delay_ns(ST7787_T_SLR);
SCK_H;
delay_ns(ST7787_T_SHR);
do {
val = 0;
for (i = 8; i; --i) {
SCK_L;
delay_ns(ST7787_T_SLR);
val = (val << 1);
if (DAT_V)
val = val | 1;
SCK_H;
delay_ns(ST7787_T_SHR);
}
*out++ = val;
} while (--out_len > 0);
}
SCK_L;
delay_ns(ST7787_T_SCC);
CS_H;
delay_ns(ST7787_T_CHW);
}
#endif #endif
#endif #endif
@ -618,41 +517,7 @@ void TFT_eSPI::writedata(uint8_t c)
} }
#else #else
void TFT_eSPI::writedata(uint8_t c) #error 3WIRE protocol currently only implemented for ESP8266
{
uint32_t i;
uint32_t val;
DAT_O;
CS_L;
delay_ns(ST7787_T_CSS);
/* Data/command bit ('1' for data). */
val = c;
SCK_L;
DAT_H;
delay_ns(ST7787_T_SLW);
SCK_H;
delay_ns(ST7787_T_SHW);
for (i = 8; i; --i) {
SCK_L;
if ((val>>7) & 1)
DAT_H;
else
DAT_L;
val <<= 1;
delay_ns(ST7787_T_SLW);
SCK_H;
delay_ns(ST7787_T_SHW);
}
DAT_I;
delay_ns(ST7787_T_SCC);
CS_H;
delay_ns(ST7787_T_CHW);
}
#endif #endif
#else /* !IFACE_3WIRE */ #else /* !IFACE_3WIRE */
void TFT_eSPI::writedata(uint8_t c) void TFT_eSPI::writedata(uint8_t c)
@ -4426,60 +4291,7 @@ void spiWriteBlock(uint16_t color, uint32_t repeat)
} }
#else #else
void spiWriteBlock(uint16_t color, uint32_t repeat) #error 3WIRE protocol currently only implemented for ESP8266
{
uint32_t i;
uint32_t val;
DAT_O;
delay_ns(ST7787_T_CSS);
while (repeat-- > 0)
{
val = color >> 8;
/* Data/command bit ('1' for data). */
SCK_L;
DAT_H;
delay_ns(ST7787_T_SLW);
SCK_H;
delay_ns(ST7787_T_SHW);
for (i = 8; i; --i) {
SCK_L;
if ((val>>7) & 1)
DAT_H;
else
DAT_L;
val <<= 1;
delay_ns(ST7787_T_SLW);
SCK_H;
delay_ns(ST7787_T_SHW);
}
val = color & 0xff;
/* Data/command bit ('1' for data). */
SCK_L;
DAT_H;
delay_ns(ST7787_T_SLW);
SCK_H;
delay_ns(ST7787_T_SHW);
for (i = 8; i; --i) {
SCK_L;
if ((val>>7) & 1)
DAT_H;
else
DAT_L;
val <<= 1;
delay_ns(ST7787_T_SLW);
SCK_H;
delay_ns(ST7787_T_SHW);
}
}
DAT_I;
}
#endif /* IFACE_3WIRE */ #endif /* IFACE_3WIRE */
#elif defined (ESP8266) && (SPI_FREQUENCY != 80000000) #elif defined (ESP8266) && (SPI_FREQUENCY != 80000000)
void spiWriteBlock(uint16_t color, uint32_t repeat) void spiWriteBlock(uint16_t color, uint32_t repeat)

23
TFT_eSPI.h
View File

@ -129,19 +129,6 @@
#endif #endif
#endif #endif
#ifdef TFT_DAT
#define DAT_I pinMode(TFT_DAT, INPUT)
#define DAT_O pinMode(TFT_DAT, OUTPUT)
#define DAT_L digitalWrite(TFT_DAT, LOW)
#define DAT_H digitalWrite(TFT_DAT, HIGH)
#define DAT_V digitalRead(TFT_DAT)
#endif
#ifdef TFT_SCK
#define SCK_L digitalWrite(TFT_SCK, LOW)
#define SCK_H digitalWrite(TFT_SCK, HIGH)
#endif
#ifdef LOAD_GFXFF #ifdef LOAD_GFXFF
// We can include all the free fonts and they will only be built into // We can include all the free fonts and they will only be built into
// the sketch if they are used // the sketch if they are used
@ -483,16 +470,6 @@ inline void spi_end() __attribute__((always_inline));
}; };
static inline void delay_ns(int32_t d)
{
while (d > 0)
{
asm volatile ("nop ; nop ; nop ; nop" : : : "memory");
d -= 25;
}
/* ToDo */
}
#endif #endif
/*************************************************** /***************************************************

2
User_Setup.h
View File

@ -85,8 +85,6 @@
//#define TFT_DC PIN_D3 // Data Command control pin //#define TFT_DC PIN_D3 // Data Command control pin
#define TFT_RST PIN_D4 // Reset pin (could connect to NodeMCU RST, see next line) #define TFT_RST PIN_D4 // Reset pin (could connect to NodeMCU RST, see next line)
//#define TFT_RST -1 // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V //#define TFT_RST -1 // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V
#define TFT_SCK PIN_D5
#define TFT_DAT PIN_D7
//#define TFT_WR PIN_D2 // Write strobe for modified Raspberry Pi TFT only //#define TFT_WR PIN_D2 // Write strobe for modified Raspberry Pi TFT only