Skip to content

GitLab

T
TFT_eSPI
Commit 235f89e7 authored by Bodmer's avatar Bodmer
Browse files
Options

Allow ESP32 pin numbers greater than 31 for CS and DC

parent eded971f
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 5 deletions
TFT_eSPI.h
View file @ 235f89e7
...@@ -99,14 +99,19 @@ ...@@ -99,14 +99,19 @@
#define DC_D digitalWrite(TFT_DC, HIGH) #define DC_D digitalWrite(TFT_DC, HIGH)
#elif defined (ESP32) #elif defined (ESP32)
#if defined (ESP32_PARALLEL) #if defined (ESP32_PARALLEL)
#define DC_C GPIO.out_w1tc = (1 << TFT_DC) // Too fast for ST7735 #define DC_C GPIO.out_w1tc = (1 << TFT_DC)
#define DC_D GPIO.out_w1ts = (1 << TFT_DC) #define DC_D GPIO.out_w1ts = (1 << TFT_DC)
//#define DC_C digitalWrite(TFT_DC, LOW) //#define DC_C digitalWrite(TFT_DC, LOW)
//#define DC_D digitalWrite(TFT_DC, HIGH) //#define DC_D digitalWrite(TFT_DC, HIGH)
#else
#if TFT_DC >= 32 || TFT_DC <= -1
#define DC_C digitalWrite(TFT_DC, LOW)
#define DC_D digitalWrite(TFT_DC, HIGH)
#else #else
#define DC_C GPIO.out_w1ts = (1 << TFT_DC); GPIO.out_w1tc = (1 << TFT_DC) #define DC_C GPIO.out_w1ts = (1 << TFT_DC); GPIO.out_w1tc = (1 << TFT_DC)
#define DC_D GPIO.out_w1tc = (1 << TFT_DC); GPIO.out_w1ts = (1 << TFT_DC) #define DC_D GPIO.out_w1tc = (1 << TFT_DC); GPIO.out_w1ts = (1 << TFT_DC)
#endif #endif
#endif
#else #else
#define DC_C GPOC=dcpinmask #define DC_C GPOC=dcpinmask
#define DC_D GPOS=dcpinmask #define DC_D GPOS=dcpinmask
...@@ -128,10 +133,15 @@ ...@@ -128,10 +133,15 @@
#if defined (ESP32_PARALLEL) #if defined (ESP32_PARALLEL)
#define CS_L // The TFT CS is set permanently low during init() #define CS_L // The TFT CS is set permanently low during init()
#define CS_H #define CS_H
#else
#if TFT_CS >= 32 || TFT_CS <= -1
#define CS_L digitalWrite(TFT_DC, LOW)
#define CS_H digitalWrite(TFT_DC, HIGH)
#else #else
#define CS_L GPIO.out_w1ts = (1 << TFT_CS);GPIO.out_w1tc = (1 << TFT_CS) #define CS_L GPIO.out_w1ts = (1 << TFT_CS);GPIO.out_w1tc = (1 << TFT_CS)
#define CS_H GPIO.out_w1tc = (1 << TFT_CS);GPIO.out_w1ts = (1 << TFT_CS) #define CS_H GPIO.out_w1tc = (1 << TFT_CS);GPIO.out_w1ts = (1 << TFT_CS)
#endif #endif
#endif
#else #else
#define CS_L GPOC=cspinmask #define CS_L GPOC=cspinmask
#define CS_H GPOS=cspinmask #define CS_H GPOS=cspinmask
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment