diff --git a/Keywords.txt b/Keywords.txt index 784ec75..47a42a8 100644 --- a/Keywords.txt +++ b/Keywords.txt @@ -48,6 +48,7 @@ readcommand16 KEYWORD2 readcommand32 KEYWORD2 readPixel KEYWORD2 readRect KEYWORD2 +pushRect KEYWORD2 readRectRGB KEYWORD2 getRotation KEYWORD2 fontsLoaded KEYWORD2 diff --git a/TFT_eSPI.cpp b/TFT_eSPI.cpp index d805ade..0189854 100644 --- a/TFT_eSPI.cpp +++ b/TFT_eSPI.cpp @@ -164,10 +164,17 @@ void TFT_eSPI::init(void) #ifdef TFT_WR wrpinmask = (uint32_t) digitalPinToBitMask(TFT_WR); #endif + + #ifdef TFT_SPI_OVERLAP + // Overlap mode SD0=MISO, SD1=MOSI, CLK=SCLK must use D3 as CS + // pins(int8_t sck, int8_t miso, int8_t mosi, int8_t ss); + //SPI.pins( 6, 7, 8, 0); + SPI.pins(6, 7, 8, 0); + #endif - SPI.begin(); // This will set MISO to input + SPI.begin(); // This will set HMISO to input #else - #ifdef TFT_MOSI + #if defined (TFT_MOSI) && !defined (TFT_SPI_OVERLAP) SPI.begin(TFT_SCLK, TFT_MISO, TFT_MOSI, -1); #else SPI.begin(); @@ -183,8 +190,7 @@ void TFT_eSPI::init(void) SPI.setBitOrder(MSBFIRST); SPI.setDataMode(SPI_MODE0); SPI.setFrequency(SPI_FREQUENCY); - //SPI.setHwCs(1); // Use hardware SS toggling on GPIO15 (D8) - not supported - benefit is only ~0.8% performance boost - + #ifdef ESP32 // Unlock the SPI hal mutex and set the lock management flags SPI.beginTransaction(SPISettings(SPI_FREQUENCY, MSBFIRST, SPI_MODE0)); inTransaction = true; // Flag to stop intermediate spi_end calls @@ -197,6 +203,8 @@ void TFT_eSPI::init(void) #ifdef TFT_CS digitalWrite(TFT_CS, HIGH); // Chip select high (inactive) pinMode(TFT_CS, OUTPUT); +#else + SPI.setHwCs(1); // Use hardware SS toggling #endif // Set to output once again in case D6 (MISO) is used for DC diff --git a/TFT_eSPI.h b/TFT_eSPI.h index d85df05..25c86b6 100644 --- a/TFT_eSPI.h +++ b/TFT_eSPI.h @@ -86,6 +86,10 @@ #define DC_D GPOS=dcpinmask #endif +#if defined (TFT_SPI_OVERLAP) + #undef TFT_CS +#endif + #ifndef TFT_CS #define CS_L // No macro allocated so it generates no code #define CS_H // No macro allocated so it generates no code diff --git a/User_Setup.h b/User_Setup.h index 8154475..a106fd9 100644 --- a/User_Setup.h +++ b/User_Setup.h @@ -95,11 +95,13 @@ //#define TFT_MISO 19 //#define TFT_MOSI 23 //#define TFT_SCLK 18 -//#define TFT_CS 5 // Chip select control pin +//#define TFT_CS 15 // Chip select control pin //#define TFT_DC 2 // Data Command control pin //#define TFT_RST 4 // Reset pin (could connect to RST pin) //#define TFT_RST -1 // Set TFT_RST to -1 if display RESET is connected to ESP32 board RST +//#define TFT_WR 22 // Write strobe for modified Raspberry Pi TFT only + // ################################################################################## // // Section 2. Define the way the DC and/or CS lines are driven (ESP8266 only) diff --git a/User_Setup_Select.h b/User_Setup_Select.h index e83f73b..3d8c600 100644 --- a/User_Setup_Select.h +++ b/User_Setup_Select.h @@ -26,6 +26,7 @@ //#include // Setup file configured for my modified RPi TFT //#include // Setup file configured for my ST7735 128x128 display //#include // Setup file configured for my ILI9163 128x128 display +//#include // Setup file configured for my ST7735 //#include // Setup file template for copying/editting @@ -64,3 +65,11 @@ #define PIN_D8 15 #define PIN_D9 3 #define PIN_D10 1 + +#define PIN_MOSI 8 +#define PIN_MISO 7 +#define PIN_SCLK 6 +#define PIN_HWCS 0 + +#define PIN_D11 9 +#define PIN_D12 10 \ No newline at end of file diff --git a/User_Setups/Setup9_ST7735_Overlap.h b/User_Setups/Setup9_ST7735_Overlap.h new file mode 100644 index 0000000..cfca69a --- /dev/null +++ b/User_Setups/Setup9_ST7735_Overlap.h @@ -0,0 +1,163 @@ +// USER DEFINED SETTINGS +// +// The User_Setup header that will be called up is defined in User_Setup_Select.h +// +// Set driver type, fonts to be loaded, pins used and SPI control method etc +// +// If this file is editted correctly then all the library example sketches should +// run without the need to make any more changes for a particular hardware setup! + +// IMPORTANT +// This particular setup uses the SPI overlap capabiltiy of the ESP8266, this allows +// the FLASH SPI pins to be re-used with the TFT, saving pins for other functions. + +// ################################################################################## +// +// Section 0. Call up the right driver file and any options for it +// +// ################################################################################## + +// Only define one driver, the other ones must be commented out +//#define ILI9341_DRIVER +#define ST7735_DRIVER + +// For ST7735 and ILI9163 ONLY, define the pixel width and height in portrait orientation +#define TFT_WIDTH 128 +#define TFT_HEIGHT 160 +//#define TFT_HEIGHT 128 + +// For ST7735 ONLY, define the type of display, originally this was based on the +// colour of the tab on the screen protector film but this is not always true, so try +// out the different options below if the screen does not display graphics correctly, +// e.g. colours wrong, mirror images, or tray pixels at the edges. +// Comment out ALL BUT ONE of these options for a ST7735 display driver, save this +// this User_Setup file, then rebuild and upload the sketch to the board again: + +//#define ST7735_INITB +//#define ST7735_GREENTAB +//#define ST7735_GREENTAB2 +//#define ST7735_GREENTAB3 +#define ST7735_REDTAB +//#define ST7735_BLACKTAB + +// ################################################################################## +// +// Section 1. Define the pins that are used to interface with the display here +// +// ################################################################################## + +// We must use hardware SPI, a minimum of 3 GPIO pins is needed. +// Typical setup for NodeMCU ESP-12 with SPI overlap is : +// +// Display SDO/MISO to NodeMCU SD0 (or leave disconnected if not reading TFT) +// Display LED to NodeMCU pin VIN (or 5V, see below) +// Display SCK to NodeMCU pin CLK +// Display SDI/MOSI to NodeMCU pin SD1 +// Display DC (or AO)to NodeMCU pin D8 +// Display RESET to NodeMCU pin D4 (or RST, see below) +// Display CS to NodeMCU pin D3 +// Display GND to NodeMCU pin GND (0V) +// Display VCC to NodeMCU 5V or 3.3V +// +// The TFT RESET pin can be connected to the NodeMCU RST pin or 3.3V to free up a control pin +// +// The NodeMCU D0 pin can be used for RST +// +// See Section 2. below if DC is connected to D0 +// +// Note: only some versions of the NodeMCU provide the USB 5V on the VIN pin +// If 5V is not available at a pin you can use 3.3V but backlight brightness +// will be lower. + +// ###### EDIT THE PIN NUMBERS IN THE LINES FOLLOWING TO SUIT YOUR SETUP ###### + +// ModeMCU +// Do not define TFT_CS in overlap mode, TFT chip select must connect to pin D3 +#define TFT_CS PIN_D3 +#define TFT_DC PIN_D5 // Data Command control pin +#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 + +// ESP32 Dev board +//#define TFT_CS 5 // Chip select control pin +//#define TFT_DC 2 // Data Command control pin +//#define TFT_RST 4 // Reset pin (could connect to Arduino RESET pin) +//#define TFT_RST -1 // Set TFT_RST to -1 if display RESET is connected to ESP32 board RST + +// ################################################################################## +// +// Section 2. Define the way the DC and/or CS lines are driven +// +// ################################################################################## + +// Normally the library uses direct register access for the DC and CS lines for speed +// If D0 (GPIO16) is used for CS or DC then a different slower method must be used +// Uncomment one line if D0 is used for DC or CS +// DC on D0 = 6% performance penalty at 40MHz SPI running graphics test +// CS on D0 = 2% performance penalty at 40MHz SPI running graphics test + +// #define D0_USED_FOR_DC +// #define D0_USED_FOR_CS + +// ################################################################################## +// +// Section 3. Define the fonts that are to be used here +// +// ################################################################################## + +// Comment out the #defines below with // to stop that font being loaded +// The ESP8366 had plenty of memory so commenting out fonts is not normally necessary +// If all fonts are loaded the extra FLASH space required is about 17Kbytes... +// To save FLASH space only enable the fonts you need! + +#define LOAD_GLCD // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH +#define LOAD_FONT2 // Font 2. Small 16 pixel high font, needs ~3534 bytes in FLASH, 96 characters +#define LOAD_FONT4 // Font 4. Medium 26 pixel high font, needs ~5848 bytes in FLASH, 96 characters +#define LOAD_FONT6 // Font 6. Large 48 pixel font, needs ~2666 bytes in FLASH, only characters 1234567890:-.apm +#define LOAD_FONT7 // Font 7. 7 segment 48 pixel font, needs ~2438 bytes in FLASH, only characters 1234567890:. +#define LOAD_FONT8 // Font 8. Large 75 pixel font needs ~3256 bytes in FLASH, only characters 1234567890:-. +#define LOAD_GFXFF // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts + +// ################################################################################## +// +// Section 4. Not used +// +// ################################################################################## + + +// ################################################################################## +// +// Section 5. Other options +// +// ################################################################################## + +// Define the SPI clock frequency +// With an ILI9341 display 40MHz works OK, 80MHz sometimes fails +// With a ST7735 display more than 27MHz may not work (spurious pixels and lines) + +// #define SPI_FREQUENCY 1000000 +// #define SPI_FREQUENCY 5000000 +// #define SPI_FREQUENCY 10000000 +// #define SPI_FREQUENCY 20000000 + #define SPI_FREQUENCY 27000000 // Maximum for my ST7735. It is actually 26.67MHz = 80/3 +// #define SPI_FREQUENCY 40000000 // Maximum to use SPIFFS +// #define SPI_FREQUENCY 80000000 + + +// Comment out the following #define if "SPI Transactions" do not need to be +// supported. Tranaction support is required if other SPI devices are connected. +// When commented out the code size will be smaller and sketches will +// run slightly faster, so leave it commented out unless you need it! +// Transaction support is needed to work with SD library but not needed with TFT_SdFat + +// #define SUPPORT_TRANSACTIONS + +// If this next #define is not commented out then the SPI pins used by the program FLASH +// can be shared with the TFT, this frees up the HSPI SCK, MOSI and MISO pins. +// The TFT must be connected as follows for this to work: +// TFT Chip Select to GPIO0 (pin D3 on a NodeMCU) +// TFT MOSI/SDA to GPIO8/SDD1 (pin SD1 on a NodeMCU) +// TFT MISO to GPIO7/SDD0 (pin SD0 on a NodeMCU) - does not need to be connected +// TFT SCK to GPIO6/SDCLK (pin CLK on a NodeMCU) + +#define TFT_SPI_OVERLAP \ No newline at end of file