cleanup

User_Setup.h

@@ -1,282 +0,0 @@
-//                            USER DEFINED SETTINGS
-//   Set driver type, fonts to be loaded, pins used and SPI control method etc
-//
-//   See the User_Setup_Select.h file if you wish to be able to define multiple
-//   setups and then easily select which setup file is used by the compiler.
-//
-//   If this file is edited correctly then all the library example sketches should
-//   run without the need to make any more changes for a particular hardware setup!
-//   Note that some sketches are designed for a particular TFT pixel width/height
-
-
-// ##################################################################################
-//
-// Section 1. 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      // Define additional parameters below for this display
-//#define ILI9163_DRIVER     // Define additional parameters below for this display
-//#define S6D02A1_DRIVER
-//#define RPI_ILI9486_DRIVER // 20MHz maximum SPI
-//#define HX8357D_DRIVER
-//#define ILI9481_DRIVER
-//#define ILI9486_DRIVER
-//#define ILI9488_DRIVER     // WARNING: Do not connect ILI9488 display SDO to MISO if other devices share the SPI bus (TFT SDO does NOT tristate when CS is high)
-//#define ST7789_DRIVER      // Full configuration option, define additional parameters below for this display
-//#define ST7789_2_DRIVER    // Minimal configuration option, define additional parameters below for this display
-//#define R61581_DRIVER
-//#define RM68140_DRIVER
-
-// Some displays support SPI reads via the MISO pin, other displays have a single
-// bi-directional SDA pin and the library will try to read this via the MOSI line.
-// To use the SDA line for reading data from the TFT uncomment the following line:
-
-// #define TFT_SDA_READ      // This option is for ESP32 ONLY, tested with ST7789 display only
-
-// For ST7789 ONLY, define the colour order IF the blue and red are swapped on your display
-// Try ONE option at a time to find the correct colour order for your display
-
-//  #define TFT_RGB_ORDER TFT_RGB  // Colour order Red-Green-Blue
-//  #define TFT_RGB_ORDER TFT_BGR  // Colour order Blue-Green-Red
-
-// For M5Stack ESP32 module with integrated ILI9341 display ONLY, remove // in line below
-
-// #define M5STACK
-
-// For ST7789, ST7735 and ILI9163 ONLY, define the pixel width and height in portrait orientation
-// #define TFT_WIDTH  80
-// #define TFT_WIDTH  128
-// #define TFT_WIDTH  240 // ST7789 240 x 240 and 240 x 320
-// #define TFT_HEIGHT 160
-// #define TFT_HEIGHT 128
-// #define TFT_HEIGHT 240 // ST7789 240 x 240
-// #define TFT_HEIGHT 320 // ST7789 240 x 320
-
-// 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_GREENTAB128    // For 128 x 128 display
-// #define ST7735_GREENTAB160x80 // For 160 x 80 display (BGR, inverted, 26 offset)
-// #define ST7735_REDTAB
-// #define ST7735_BLACKTAB
-// #define ST7735_REDTAB160x80   // For 160 x 80 display with 24 pixel offset
-
-// If colours are inverted (white shows as black) then uncomment one of the next
-// 2 lines try both options, one of the options should correct the inversion.
-
-// #define TFT_INVERSION_ON
-// #define TFT_INVERSION_OFF
-
-// If a backlight control signal is available then define the TFT_BL pin in Section 2
-// below. The backlight will be turned ON when tft.begin() is called, but the library
-// needs to know if the LEDs are ON with the pin HIGH or LOW. If the LEDs are to be
-// driven with a PWM signal or turned OFF/ON then this must be handled by the user
-// sketch. e.g. with digitalWrite(TFT_BL, LOW);
-
-// #define TFT_BACKLIGHT_ON HIGH  // HIGH or LOW are options
-
-// ##################################################################################
-//
-// Section 2. 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 ESP8266 NodeMCU ESP-12 is :
-//
-// Display SDO/MISO  to NodeMCU pin D6 (or leave disconnected if not reading TFT)
-// Display LED       to NodeMCU pin VIN (or 5V, see below)
-// Display SCK       to NodeMCU pin D5
-// Display SDI/MOSI  to NodeMCU pin D7
-// Display DC (RS/AO)to NodeMCU pin D3
-// Display RESET     to NodeMCU pin D4 (or RST, see below)
-// Display CS        to NodeMCU pin D8 (or GND, see below)
-// 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 DC (Data Command) pin may be labeled AO or RS (Register Select)
-//
-// With some displays such as the ILI9341 the TFT CS pin can be connected to GND if no more
-// SPI devices (e.g. an SD Card) are connected, in this case comment out the #define TFT_CS
-// line below so it is NOT defined. Other displays such at the ST7735 require the TFT CS pin
-// to be toggled during setup, so in these cases the TFT_CS line must be defined and connected.
-//
-// The NodeMCU D0 pin can be used for RST
-//
-//
-// 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 ESP8266 SETUP ######
-
-// For NodeMCU - use pin numbers in the form PIN_Dx where Dx is the NodeMCU pin designation
-//#define TFT_CS   PIN_D8  // Chip select control pin D8
-//#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  -1    // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V
-
-//#define TFT_BL PIN_D1  // LED back-light (only for ST7789 with backlight control pin)
-
-//#define TOUCH_CS PIN_D2     // Chip select pin (T_CS) of touch screen
-
-//#define TFT_WR PIN_D2       // Write strobe for modified Raspberry Pi TFT only
-
-
-// ######  FOR ESP8266 OVERLAP MODE EDIT THE PIN NUMBERS IN THE FOLLOWING LINES  ######
-
-// Overlap mode shares the ESP8266 FLASH SPI bus with the TFT so has a performance impact
-// but saves pins for other functions.
-// Use NodeMCU SD0=MISO, SD1=MOSI, CLK=SCLK to connect to TFT in overlap mode
-
-// In ESP8266 overlap mode the following must be defined
-//#define TFT_SPI_OVERLAP
-
-// In ESP8266 overlap mode the 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
-
-
-// ###### EDIT THE PIN NUMBERS IN THE LINES FOLLOWING TO SUIT YOUR ESP32 SETUP   ######
-
-// For ESP32 Dev board (only tested with ILI9341 display)
-// The hardware SPI can be mapped to any pins
-
-#define TFT_MISO 19 // Matching T_DO
-#define TFT_MOSI 23 // Matching T_DIN
-#define TFT_SCLK 18 // Matching T_CLK
-#define TFT_CS   17  // Chip select control pin
-#define TFT_DC   16  // Data Command control pin
-#define TFT_RST   5  // 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_BL   32  // LED back-light (only for ST7789 with backlight control pin)
-
-#define TOUCH_CS 21     // Chip select pin (T_CS) of touch screen
-
-//#define TFT_WR 22    // Write strobe for modified Raspberry Pi TFT only
-
-// For the M5Stack module use these #define lines
-//#define TFT_MISO 19
-//#define TFT_MOSI 23
-//#define TFT_SCLK 18
-//#define TFT_CS   14  // Chip select control pin
-//#define TFT_DC   27  // Data Command control pin
-//#define TFT_RST  33  // Reset pin (could connect to Arduino RESET pin)
-//#define TFT_BL   32  // LED back-light (required for M5Stack)
-
-// ######       EDIT THE PINs BELOW TO SUIT YOUR ESP32 PARALLEL TFT SETUP        ######
-
-// The library supports 8 bit parallel TFTs with the ESP32, the pin
-// selection below is compatible with ESP32 boards in UNO format.
-// Wemos D32 boards need to be modified, see diagram in Tools folder.
-// Only ILI9481 and ILI9341 based displays have been tested!
-
-// Parallel bus is only supported on ESP32
-// Uncomment line below to use ESP32 Parallel interface instead of SPI
-
-//#define ESP32_PARALLEL
-
-// The ESP32 and TFT the pins used for testing are:
-//#define TFT_CS   33  // Chip select control pin (library pulls permanently low
-//#define TFT_DC   15  // Data Command control pin - must use a pin in the range 0-31
-//#define TFT_RST  32  // Reset pin, toggles on startup
-
-//#define TFT_WR    4  // Write strobe control pin - must use a pin in the range 0-31
-//#define TFT_RD    2  // Read strobe control pin
-
-//#define TFT_D0   12  // Must use pins in the range 0-31 for the data bus
-//#define TFT_D1   13  // so a single register write sets/clears all bits.
-//#define TFT_D2   26  // Pins can be randomly assigned, this does not affect
-//#define TFT_D3   25  // TFT screen update performance.
-//#define TFT_D4   17
-//#define TFT_D5   16
-//#define TFT_D6   27
-//#define TFT_D7   14
-
-
-// ##################################################################################
-//
-// 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 and ESP32 have 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_FONT8N // Font 8. Alternative to Font 8 above, slightly narrower, so 3 digits fit a 160 pixel TFT
-#define LOAD_GFXFF  // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts
-
-// Comment out the #define below to stop the SPIFFS filing system and smooth font code being loaded
-// this will save ~20kbytes of FLASH
-#define SMOOTH_FONT
-
-
-// ##################################################################################
-//
-// Section 4. Other options
-//
-// ##################################################################################
-
-// Define the SPI clock frequency, this affects the graphics rendering speed. Too
-// fast and the TFT driver will not keep up and display corruption appears.
-// With an ILI9341 display 40MHz works OK, 80MHz sometimes fails
-// With a ST7735 display more than 27MHz may not work (spurious pixels and lines)
-// With an ILI9163 display 27 MHz works OK.
-// The RPi typically only works at 20MHz maximum.
-
-// #define SPI_FREQUENCY   1000000
-//define SPI_FREQUENCY   5000000
-// #define SPI_FREQUENCY  10000000
-// #define SPI_FREQUENCY  20000000
-#define SPI_FREQUENCY  27000000 // Actually sets it to 26.67MHz = 80/3
-// #define SPI_FREQUENCY  40000000 // Maximum to use SPIFFS
-// #define SPI_FREQUENCY  80000000
-
-// Optional reduced SPI frequency for reading TFT
-#define SPI_READ_FREQUENCY  20000000
-//#define SPI_READ_FREQUENCY  5000000
-
-// The XPT2046 requires a lower SPI clock rate of 2.5MHz so we define that here:
-#define SPI_TOUCH_FREQUENCY  2500000
-
-// The ESP32 has 2 free SPI ports i.e. VSPI and HSPI, the VSPI is the default.
-// If the VSPI port is in use and pins are not accessible (e.g. TTGO T-Beam)
-// then uncomment the following line:
-//#define USE_HSPI_PORT
-
-// Comment out the following #define if "SPI Transactions" do not need to be
-// supported. 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
-// Transaction support is required if other SPI devices are connected.
-
-// Transactions are automatically enabled by the library for an ESP32 (to use HAL mutex)
-// so changing it here has no effect
-
-// #define SUPPORT_TRANSACTIONS

User_Setup_Select.h

@@ -1,180 +0,0 @@
-// This header file contains a list of user setup files and defines which one the
-// compiler uses when the IDE performs a Verify/Compile or Upload.
-//
-// Users can create configurations for different Espressif boards and TFT displays.
-// This makes selecting between hardware setups easy by "uncommenting" one line.
-
-// The advantage of this hardware configuration method is that the examples provided
-// with the library should work with different setups immediately without any other
-// changes being needed. It also improves the portability of users sketches to other
-// hardware configurations and compatible libraries.
-//
-// Create a shortcut to this file on your desktop to permit quick access for editing.
-// Re-compile and upload after making and saving any changes to this file.
-
-// Customised User_Setup files are stored in the "User_Setups" folder.
-
-#ifndef USER_SETUP_LOADED //  Lets PlatformIO users define settings in
-                          //  platformio.ini, see notes in "Tools" folder.
-
-// Only ONE line below should be uncommented.  Add extra lines and files as needed.
-
-//#include <User_Setup.h>           // Default setup is root library folder
-
-//#include <User_Setup_og_marauder.h>
-#include <User_Setup_marauder_mini.h>
-
-//#include <User_Setups/Setup1_ILI9341.h>  // Setup file configured for my ILI9341
-//#include <User_Setups/Setup2_ST7735.h>   // Setup file configured for my ST7735
-//#include <User_Setups/Setup3_ILI9163.h>  // Setup file configured for my ILI9163
-//#include <User_Setups/Setup4_S6D02A1.h>  // Setup file configured for my S6D02A1
-//#include <User_Setups/Setup5_RPi_ILI9486.h>        // Setup file configured for my stock RPi TFT
-//#include <User_Setups/Setup6_RPi_Wr_ILI9486.h>     // Setup file configured for my modified RPi TFT
-//#include <User_Setups/Setup7_ST7735_128x128.h>     // Setup file configured for my ST7735 128x128 display
-//#include <User_Setups/Setup8_ILI9163_128x128.h>    // Setup file configured for my ILI9163 128x128 display
-//#include <User_Setups/Setup9_ST7735_Overlap.h>     // Setup file configured for my ST7735
-//#include <User_Setups/Setup10_RPi_touch_ILI9486.h> // Setup file configured for ESP8266 and RPi TFT with touch
-
-//#include <User_Setups/Setup11_RPi_touch_ILI9486.h> // Setup file configured for ESP32 and RPi TFT with touch
-//#include <User_Setups/Setup12_M5Stack.h>           // Setup file for the ESP32 based M5Stack
-//#include <User_Setups/Setup13_ILI9481_Parallel.h>  // Setup file for the ESP32 with parallel bus TFT
-//#include <User_Setups/Setup14_ILI9341_Parallel.h>  // Setup file for the ESP32 with parallel bus TFT
-//#include <User_Setups/Setup15_HX8357D.h>           // Setup file configured for HX8357D (untested)
-//#include <User_Setups/Setup16_ILI9488_Parallel.h>  // Setup file for the ESP32 with parallel bus TFT
-//#include <User_Setups/Setup17_ePaper.h>            // Setup file for any Waveshare ePaper display
-//#include <User_Setups/Setup18_ST7789.h>            // Setup file configured for ST7789
-
-//#include <User_Setups/Setup19_RM68140_Parallel.h>	 // Setup file configured for RM68140 with parallel bus
-
-//#include <User_Setups/Setup20_ILI9488.h>           // Setup file for ESP8266 and ILI9488 SPI bus TFT
-//#include <User_Setups/Setup21_ILI9488.h>           // Setup file for ESP32 and ILI9488 SPI bus TFT
-
-//#include <User_Setups/Setup22_TTGO_T4.h>           // Setup file for ESP32 and TTGO T4 (BTC) ILI9341 SPI bus TFT
-//#include <User_Setups/Setup23_TTGO_TM.h>           // Setup file for ESP32 and TTGO TM ST7789 SPI bus TFT
-//#include <User_Setups/Setup24_ST7789.h>            // Setup file configured for ST7789 240 x 240
-//#include <User_Setups/Setup25_TTGO_T_Display.h>    // Setup file for ESP32 and TTGO T-Display ST7789V SPI bus TFT
-//#include <User_Setups/Setup26_TTGO_T_Wristband.h>  // Setup file for ESP32 and TTGO T-Wristband ST7735 SPI bus TFT
-
-//#include <User_Setups/Setup27_RPi_ST7796_ESP32.h>    // ESP32   RPi MHS-4.0 inch Display-B
-//#include <User_Setups/Setup28_RPi_ST7796_ESP8266.h>  // ESP8266 RPi MHS-4.0 inch Display-B
-
-//#include <User_Setups/Setup29_ILI9341_STM32.h>          // Setup for Nucleo board
-//#include <User_Setups/Setup30_ILI9341_Parallel_STM32.h> // Setup for Nucleo board and parallel display
-//#include <User_Setups/Setup31_ST7796_Parallel_STM32.h>  // Setup for Nucleo board and parallel display
-//#include <User_Setups/Setup32_ILI9341_STM32F103.h>      // Setup for "Blue Pill"
-
-//#include <User_Setups/Setup43_ST7735.h>            // Setup file configured for my ST7735S 80x160
-
-//#include <User_Setups/Setup135_ST7789.h>           // Setup file for ESP8266 and ST7789 135 x 240 TFT
-
-//#include <User_Setups/SetupX_Template.h>
-
-
-#endif // USER_SETUP_LOADED
-
-
-
-/////////////////////////////////////////////////////////////////////////////////////
-//                                                                                 //
-//     DON'T TINKER WITH ANY OF THE FOLLOWING LINES, THESE ADD THE TFT DRIVERS     //
-//       AND ESP8266 PIN DEFINITONS, THEY ARE HERE FOR BODMER'S CONVENIENCE!       //
-//                                                                                 //
-/////////////////////////////////////////////////////////////////////////////////////
-
-
-// Identical looking TFT displays may have a different colour ordering in the 16 bit colour
-#define TFT_BGR 0   // Colour order Blue-Green-Red
-#define TFT_RGB 1   // Colour order Red-Green-Blue
-
-// Legacy setup support, RPI_DISPLAY_TYPE replaces RPI_DRIVER
-#if defined (RPI_DRIVER)
-  #if !defined (RPI_DISPLAY_TYPE)
-    #define RPI_DISPLAY_TYPE
-  #endif
-#endif
-
-// Legacy setup support, RPI_ILI9486_DRIVER form is deprecated
-// Instead define RPI_DISPLAY_TYPE and also define driver (e.g. ILI9486_DRIVER) 
-#if defined (RPI_ILI9486_DRIVER)
-  #if !defined (ILI9486_DRIVER)
-    #define ILI9486_DRIVER
-  #endif
-  #if !defined (RPI_DISPLAY_TYPE)
-    #define RPI_DISPLAY_TYPE
-  #endif
-#endif
-
-// Load the right driver definition - do not tinker here !
-#if   defined (ILI9341_DRIVER)
-     #include <TFT_Drivers/ILI9341_Defines.h>
-     #define  TFT_DRIVER 0x9341
-#elif defined (ST7735_DRIVER)
-     #include <TFT_Drivers/ST7735_Defines.h>
-     #define  TFT_DRIVER 0x7735
-#elif defined (ILI9163_DRIVER)
-     #include <TFT_Drivers/ILI9163_Defines.h>
-     #define  TFT_DRIVER 0x9163
-#elif defined (S6D02A1_DRIVER)
-     #include <TFT_Drivers/S6D02A1_Defines.h>
-     #define  TFT_DRIVER 0x6D02
-#elif defined (ST7796_DRIVER)
-      #include "TFT_Drivers/ST7796_Defines.h"
-      #define  TFT_DRIVER 0x7796
-#elif defined (ILI9486_DRIVER)
-     #include <TFT_Drivers/ILI9486_Defines.h>
-     #define  TFT_DRIVER 0x9486
-#elif defined (ILI9481_DRIVER)
-     #include <TFT_Drivers/ILI9481_Defines.h>
-     #define  TFT_DRIVER 0x9481
-#elif defined (ILI9488_DRIVER)
-     #include <TFT_Drivers/ILI9488_Defines.h>
-     #define  TFT_DRIVER 0x9488
-#elif defined (HX8357D_DRIVER)
-     #include "TFT_Drivers/HX8357D_Defines.h"
-     #define  TFT_DRIVER 0x8357
-#elif defined (EPD_DRIVER)
-     #include "TFT_Drivers/EPD_Defines.h"
-     #define  TFT_DRIVER 0xE9D
-#elif defined (ST7789_DRIVER)
-     #include "TFT_Drivers/ST7789_Defines.h"
-     #define  TFT_DRIVER 0x7789
-#elif defined (R61581_DRIVER)
-     #include "TFT_Drivers/R61581_Defines.h"
-     #define  TFT_DRIVER 0x6158
-#elif defined (ST7789_2_DRIVER)
-     #include "TFT_Drivers/ST7789_2_Defines.h"
-     #define  TFT_DRIVER 0x778B
-#elif defined (RM68140_DRIVER)
-     #include "TFT_Drivers/RM68140_Defines.h"
-     #define  TFT_DRIVER 0x6814
-                              // <<<<<<<<<<<<<<<<<<<<<<<< ADD NEW DRIVER HERE
-                              // XYZZY_init.h and XYZZY_rotation.h must also be added in TFT_eSPI.c
-#elif defined (XYZZY_DRIVER)
-     #include "TFT_Drivers/XYZZY_Defines.h"
-     #define  TFT_DRIVER 0x0000
-#else
-     #define  TFT_DRIVER 0x0000
-#endif
-
-
-// These are the pins for ESP8266 boards
-//      Name   GPIO    NodeMCU      Function
-#define PIN_D0  16  // GPIO16       WAKE
-#define PIN_D1   5  // GPIO5        User purpose
-#define PIN_D2   4  // GPIO4        User purpose
-#define PIN_D3   0  // GPIO0        Low on boot means enter FLASH mode
-#define PIN_D4   2  // GPIO2        TXD1 (must be high on boot to go to UART0 FLASH mode)
-#define PIN_D5  14  // GPIO14       HSCLK
-#define PIN_D6  12  // GPIO12       HMISO
-#define PIN_D7  13  // GPIO13       HMOSI  RXD2
-#define PIN_D8  15  // GPIO15       HCS    TXD0 (must be low on boot to enter UART0 FLASH mode)
-#define PIN_D9   3  //              RXD0
-#define PIN_D10  1  //              TXD0
-
-#define PIN_MOSI 8  // SD1          FLASH and overlap mode
-#define PIN_MISO 7  // SD0
-#define PIN_SCLK 6  // CLK
-#define PIN_HWCS 0  // D3
-
-#define PIN_D11  9  // SD2
-#define PIN_D12 10  // SD4

User_Setup_marauder_mini.h

@@ -1,316 +0,0 @@
-//                            USER DEFINED SETTINGS
-//   Set driver type, fonts to be loaded, pins used and SPI control method etc
-//
-//   See the User_Setup_Select.h file if you wish to be able to define multiple
-//   setups and then easily select which setup file is used by the compiler.
-//
-//   If this file is edited correctly then all the library example sketches should
-//   run without the need to make any more changes for a particular hardware setup!
-//   Note that some sketches are designed for a particular TFT pixel width/height
-
-
-// ##################################################################################
-//
-// Section 1. Call up the right driver file and any options for it
-//
-// ##################################################################################
-
-// Display type -  only define if RPi display
-//#define RPI_DRIVER
-
-// Only define one driver, the other ones must be commented out
-//#define ILI9341_DRIVER // OG Marauder
-#define ST7735_DRIVER    // Marauder Mini  // Define additional parameters below for this display
-//#define ILI9163_DRIVER     // Define additional parameters below for this display
-//#define S6D02A1_DRIVER
-//#define RPI_ILI9486_DRIVER // 20MHz maximum SPI
-//#define HX8357D_DRIVER
-//#define ILI9481_DRIVER
-//#define ILI9486_DRIVER
-//#define ILI9488_DRIVER     // WARNING: Do not connect ILI9488 display SDO to MISO if other devices share the SPI bus (TFT SDO does NOT tristate when CS is high)
-//#define ST7789_DRIVER      // Full configuration option, define additional parameters below for this display
-//#define ST7789_2_DRIVER    // Minimal configuration option, define additional parameters below for this display
-//#define R61581_DRIVER
-//#define RM68140_DRIVER
-//#define ST7796_DRIVER
-
-// Some displays support SPI reads via the MISO pin, other displays have a single
-// bi-directional SDA pin and the library will try to read this via the MOSI line.
-// To use the SDA line for reading data from the TFT uncomment the following line:
-
-// #define TFT_SDA_READ      // This option is for ESP32 ONLY, tested with ST7789 display only
-
-// For ST7789 and ILI9341 ONLY, define the colour order IF the blue and red are swapped on your display
-// Try ONE option at a time to find the correct colour order for your display
-
-  #define TFT_RGB_ORDER TFT_RGB  // Colour order Red-Green-Blue
-//  #define TFT_RGB_ORDER TFT_BGR  // Colour order Blue-Green-Red
-
-// For M5Stack ESP32 module with integrated ILI9341 display ONLY, remove // in line below
-
-// #define M5STACK
-
-// For ST7789, ST7735 and ILI9163 ONLY, define the pixel width and height in portrait orientation
-// #define TFT_WIDTH  80
- #define TFT_WIDTH  128 // Marauder Mini
-// #define TFT_WIDTH  240 // ST7789 240 x 240 and 240 x 320
-// #define TFT_HEIGHT 160
- #define TFT_HEIGHT 128 // Marauder Mini
-// #define TFT_HEIGHT 240 // ST7789 240 x 240
-// #define TFT_HEIGHT 320 // ST7789 240 x 320
-
-// 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_GREENTAB128    // For 128 x 128 display
-// #define ST7735_GREENTAB160x80 // For 160 x 80 display (BGR, inverted, 26 offset)
-// #define ST7735_REDTAB
-// #define ST7735_BLACKTAB
-// #define ST7735_REDTAB160x80   // For 160 x 80 display with 24 pixel offset
-
-// If colours are inverted (white shows as black) then uncomment one of the next
-// 2 lines try both options, one of the options should correct the inversion.
-
-// #define TFT_INVERSION_ON
-// #define TFT_INVERSION_OFF
-
-// If a backlight control signal is available then define the TFT_BL pin in Section 2
-// below. The backlight will be turned ON when tft.begin() is called, but the library
-// needs to know if the LEDs are ON with the pin HIGH or LOW. If the LEDs are to be
-// driven with a PWM signal or turned OFF/ON then this must be handled by the user
-// sketch. e.g. with digitalWrite(TFT_BL, LOW);
-
- #define TFT_BACKLIGHT_ON LOW  // HIGH or LOW are options
-
-// ##################################################################################
-//
-// Section 2. 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 ESP8266 NodeMCU ESP-12 is :
-//
-// Display SDO/MISO  to NodeMCU pin D6 (or leave disconnected if not reading TFT)
-// Display LED       to NodeMCU pin VIN (or 5V, see below)
-// Display SCK       to NodeMCU pin D5
-// Display SDI/MOSI  to NodeMCU pin D7
-// Display DC (RS/AO)to NodeMCU pin D3
-// Display RESET     to NodeMCU pin D4 (or RST, see below)
-// Display CS        to NodeMCU pin D8 (or GND, see below)
-// 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 DC (Data Command) pin may be labeled AO or RS (Register Select)
-//
-// With some displays such as the ILI9341 the TFT CS pin can be connected to GND if no more
-// SPI devices (e.g. an SD Card) are connected, in this case comment out the #define TFT_CS
-// line below so it is NOT defined. Other displays such at the ST7735 require the TFT CS pin
-// to be toggled during setup, so in these cases the TFT_CS line must be defined and connected.
-//
-// The NodeMCU D0 pin can be used for RST
-//
-//
-// 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 ESP8266 SETUP ######
-
-// For NodeMCU - use pin numbers in the form PIN_Dx where Dx is the NodeMCU pin designation
-//#define TFT_CS   PIN_D8  // Chip select control pin D8
-//#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  -1    // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V
-
-//#define TFT_BL PIN_D1  // LED back-light (only for ST7789 with backlight control pin)
-
-//#define TOUCH_CS PIN_D2     // Chip select pin (T_CS) of touch screen
-
-//#define TFT_WR PIN_D2       // Write strobe for modified Raspberry Pi TFT only
-
-
-// ######  FOR ESP8266 OVERLAP MODE EDIT THE PIN NUMBERS IN THE FOLLOWING LINES  ######
-
-// Overlap mode shares the ESP8266 FLASH SPI bus with the TFT so has a performance impact
-// but saves pins for other functions. It is best not to connect MISO as some displays
-// do not tristate that line wjen chip select is high!
-// On NodeMCU 1.0 SD0=MISO, SD1=MOSI, CLK=SCLK to connect to TFT in overlap mode
-// On NodeMCU V3  S0 =MISO, S1 =MOSI, S2 =SCLK
-// In ESP8266 overlap mode the following must be defined
-
-//#define TFT_SPI_OVERLAP
-
-// In ESP8266 overlap mode the 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
-
-
-// ###### EDIT THE PIN NUMBERS IN THE LINES FOLLOWING TO SUIT YOUR ESP32 SETUP   ######
-
-// For ESP32 Dev board (only tested with ILI9341 display)
-// The hardware SPI can be mapped to any pins
-
-// Marauder Mini
-#define TFT_CS   17  // Chip select control pin D8
-#define TFT_DC   16  // Data Command control pin
-#define TFT_RST  5  // Reset pin (could connect to NodeMCU RST, see next line)
-#define TOUCH_CS -1
-//#define TFT_MISO 19
-//#define TFT_MOSI 23
-//#define TFT_SCLK 18
-//#define TFT_BL   32
-
-/*
-// ESP32 Marauder 
-#define TFT_MISO 19
-#define TFT_MOSI 23
-#define TFT_SCLK 18
-#define TFT_CS   17  // Chip select control pin
-#define TFT_DC   16  // Data Command control pin
-#define TFT_RST   5  // 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_BL   32  // LED back-light (only for ST7789 with backlight control pin)
-
-#define TOUCH_CS 21     // Chip select pin (T_CS) of touch screen
-*/
-/////////////////////////////
-
-// ESP32 Centauri
-/*
-#define TFT_MISO 19
-#define TFT_MOSI 23
-#define TFT_SCLK 18
-#define TFT_CS   27  // Chip select control pin
-#define TFT_DC   26  // Data Command control pin
-#define TFT_RST   5  // 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_BL   32  // LED back-light (only for ST7789 with backlight control pin)
-
-#define TOUCH_CS 21     // Chip select pin (T_CS) of touch screen
-*/
-/////////////////////////////
-
-//#define TFT_WR 22    // Write strobe for modified Raspberry Pi TFT only
-
-// For the M5Stack module use these #define lines
-//#define TFT_MISO 19
-//#define TFT_MOSI 23
-//#define TFT_SCLK 18
-//#define TFT_CS   14  // Chip select control pin
-//#define TFT_DC   27  // Data Command control pin
-//#define TFT_RST  33  // Reset pin (could connect to Arduino RESET pin)
-//#define TFT_BL   32  // LED back-light (required for M5Stack)
-
-// ######       EDIT THE PINs BELOW TO SUIT YOUR ESP32 PARALLEL TFT SETUP        ######
-
-// The library supports 8 bit parallel TFTs with the ESP32, the pin
-// selection below is compatible with ESP32 boards in UNO format.
-// Wemos D32 boards need to be modified, see diagram in Tools folder.
-// Only ILI9481 and ILI9341 based displays have been tested!
-
-// Parallel bus is only supported on ESP32
-// Uncomment line below to use ESP32 Parallel interface instead of SPI
-
-//#define ESP32_PARALLEL
-
-// The ESP32 and TFT the pins used for testing are:
-//#define TFT_CS   33  // Chip select control pin (library pulls permanently low
-//#define TFT_DC   15  // Data Command control pin - must use a pin in the range 0-31
-//#define TFT_RST  32  // Reset pin, toggles on startup
-
-//#define TFT_WR    4  // Write strobe control pin - must use a pin in the range 0-31
-//#define TFT_RD    2  // Read strobe control pin
-
-//#define TFT_D0   12  // Must use pins in the range 0-31 for the data bus
-//#define TFT_D1   13  // so a single register write sets/clears all bits.
-//#define TFT_D2   26  // Pins can be randomly assigned, this does not affect
-//#define TFT_D3   25  // TFT screen update performance.
-//#define TFT_D4   17
-//#define TFT_D5   16
-//#define TFT_D6   27
-//#define TFT_D7   14
-
-
-// ##################################################################################
-//
-// 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 and ESP32 have 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_FONT8N // Font 8. Alternative to Font 8 above, slightly narrower, so 3 digits fit a 160 pixel TFT
-#define LOAD_GFXFF  // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts
-
-// Comment out the #define below to stop the SPIFFS filing system and smooth font code being loaded
-// this will save ~20kbytes of FLASH
-#define SMOOTH_FONT
-
-
-// ##################################################################################
-//
-// Section 4. Other options
-//
-// ##################################################################################
-
-// Define the SPI clock frequency, this affects the graphics rendering speed. Too
-// fast and the TFT driver will not keep up and display corruption appears.
-// With an ILI9341 display 40MHz works OK, 80MHz sometimes fails
-// With a ST7735 display more than 27MHz may not work (spurious pixels and lines)
-// With an ILI9163 display 27 MHz works OK.
-
-// #define SPI_FREQUENCY   1000000
-//#define SPI_FREQUENCY   5000000
-// #define SPI_FREQUENCY  10000000
- #define SPI_FREQUENCY  20000000
-//#define SPI_FREQUENCY  27000000 // Marauder // Actually sets it to 26.67MHz = 80/3
-// #define SPI_FREQUENCY  40000000
-// #define SPI_FREQUENCY  80000000
-
-// Optional reduced SPI frequency for reading TFT
-#define SPI_READ_FREQUENCY  20000000
-
-// The XPT2046 requires a lower SPI clock rate of 2.5MHz so we define that here:
-#define SPI_TOUCH_FREQUENCY  2500000
-
-// The ESP32 has 2 free SPI ports i.e. VSPI and HSPI, the VSPI is the default.
-// If the VSPI port is in use and pins are not accessible (e.g. TTGO T-Beam)
-// then uncomment the following line:
-//#define USE_HSPI_PORT
-
-// Comment out the following #define if "SPI Transactions" do not need to be
-// supported. 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
-// Transaction support is required if other SPI devices are connected.
-
-// Transactions are automatically enabled by the library for an ESP32 (to use HAL mutex)
-// so changing it here has no effect
-
-// #define SUPPORT_TRANSACTIONS

User_Setup_og_marauder.h

@@ -1,316 +0,0 @@
-//                            USER DEFINED SETTINGS
-//   Set driver type, fonts to be loaded, pins used and SPI control method etc
-//
-//   See the User_Setup_Select.h file if you wish to be able to define multiple
-//   setups and then easily select which setup file is used by the compiler.
-//
-//   If this file is edited correctly then all the library example sketches should
-//   run without the need to make any more changes for a particular hardware setup!
-//   Note that some sketches are designed for a particular TFT pixel width/height
-
-
-// ##################################################################################
-//
-// Section 1. Call up the right driver file and any options for it
-//
-// ##################################################################################
-
-// Display type -  only define if RPi display
-//#define RPI_DRIVER
-
-// Only define one driver, the other ones must be commented out
-#define ILI9341_DRIVER // OG Marauder
-//#define ST7735_DRIVER    // Marauder Mini  // Define additional parameters below for this display
-//#define ILI9163_DRIVER     // Define additional parameters below for this display
-//#define S6D02A1_DRIVER
-//#define RPI_ILI9486_DRIVER // 20MHz maximum SPI
-//#define HX8357D_DRIVER
-//#define ILI9481_DRIVER
-//#define ILI9486_DRIVER
-//#define ILI9488_DRIVER     // WARNING: Do not connect ILI9488 display SDO to MISO if other devices share the SPI bus (TFT SDO does NOT tristate when CS is high)
-//#define ST7789_DRIVER      // Full configuration option, define additional parameters below for this display
-//#define ST7789_2_DRIVER    // Minimal configuration option, define additional parameters below for this display
-//#define R61581_DRIVER
-//#define RM68140_DRIVER
-//#define ST7796_DRIVER
-
-// Some displays support SPI reads via the MISO pin, other displays have a single
-// bi-directional SDA pin and the library will try to read this via the MOSI line.
-// To use the SDA line for reading data from the TFT uncomment the following line:
-
-// #define TFT_SDA_READ      // This option is for ESP32 ONLY, tested with ST7789 display only
-
-// For ST7789 and ILI9341 ONLY, define the colour order IF the blue and red are swapped on your display
-// Try ONE option at a time to find the correct colour order for your display
-
-//  #define TFT_RGB_ORDER TFT_RGB  // Colour order Red-Green-Blue
-//  #define TFT_RGB_ORDER TFT_BGR  // Colour order Blue-Green-Red
-
-// For M5Stack ESP32 module with integrated ILI9341 display ONLY, remove // in line below
-
-// #define M5STACK
-
-// For ST7789, ST7735 and ILI9163 ONLY, define the pixel width and height in portrait orientation
-// #define TFT_WIDTH  80
-// #define TFT_WIDTH  128 // Marauder Mini
-// #define TFT_WIDTH  240 // ST7789 240 x 240 and 240 x 320
-// #define TFT_HEIGHT 160
-// #define TFT_HEIGHT 128 // Marauder Mini
-// #define TFT_HEIGHT 240 // ST7789 240 x 240
-// #define TFT_HEIGHT 320 // ST7789 240 x 320
-
-// 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_GREENTAB128    // For 128 x 128 display
-// #define ST7735_GREENTAB160x80 // For 160 x 80 display (BGR, inverted, 26 offset)
-// #define ST7735_REDTAB
-// #define ST7735_BLACKTAB
-// #define ST7735_REDTAB160x80   // For 160 x 80 display with 24 pixel offset
-
-// If colours are inverted (white shows as black) then uncomment one of the next
-// 2 lines try both options, one of the options should correct the inversion.
-
-// #define TFT_INVERSION_ON
-// #define TFT_INVERSION_OFF
-
-// If a backlight control signal is available then define the TFT_BL pin in Section 2
-// below. The backlight will be turned ON when tft.begin() is called, but the library
-// needs to know if the LEDs are ON with the pin HIGH or LOW. If the LEDs are to be
-// driven with a PWM signal or turned OFF/ON then this must be handled by the user
-// sketch. e.g. with digitalWrite(TFT_BL, LOW);
-
-// #define TFT_BACKLIGHT_ON LOW  // HIGH or LOW are options
-
-// ##################################################################################
-//
-// Section 2. 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 ESP8266 NodeMCU ESP-12 is :
-//
-// Display SDO/MISO  to NodeMCU pin D6 (or leave disconnected if not reading TFT)
-// Display LED       to NodeMCU pin VIN (or 5V, see below)
-// Display SCK       to NodeMCU pin D5
-// Display SDI/MOSI  to NodeMCU pin D7
-// Display DC (RS/AO)to NodeMCU pin D3
-// Display RESET     to NodeMCU pin D4 (or RST, see below)
-// Display CS        to NodeMCU pin D8 (or GND, see below)
-// 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 DC (Data Command) pin may be labeled AO or RS (Register Select)
-//
-// With some displays such as the ILI9341 the TFT CS pin can be connected to GND if no more
-// SPI devices (e.g. an SD Card) are connected, in this case comment out the #define TFT_CS
-// line below so it is NOT defined. Other displays such at the ST7735 require the TFT CS pin
-// to be toggled during setup, so in these cases the TFT_CS line must be defined and connected.
-//
-// The NodeMCU D0 pin can be used for RST
-//
-//
-// 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 ESP8266 SETUP ######
-
-// For NodeMCU - use pin numbers in the form PIN_Dx where Dx is the NodeMCU pin designation
-//#define TFT_CS   PIN_D8  // Chip select control pin D8
-//#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  -1    // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V
-
-//#define TFT_BL PIN_D1  // LED back-light (only for ST7789 with backlight control pin)
-
-//#define TOUCH_CS PIN_D2     // Chip select pin (T_CS) of touch screen
-
-//#define TFT_WR PIN_D2       // Write strobe for modified Raspberry Pi TFT only
-
-
-// ######  FOR ESP8266 OVERLAP MODE EDIT THE PIN NUMBERS IN THE FOLLOWING LINES  ######
-
-// Overlap mode shares the ESP8266 FLASH SPI bus with the TFT so has a performance impact
-// but saves pins for other functions. It is best not to connect MISO as some displays
-// do not tristate that line wjen chip select is high!
-// On NodeMCU 1.0 SD0=MISO, SD1=MOSI, CLK=SCLK to connect to TFT in overlap mode
-// On NodeMCU V3  S0 =MISO, S1 =MOSI, S2 =SCLK
-// In ESP8266 overlap mode the following must be defined
-
-//#define TFT_SPI_OVERLAP
-
-// In ESP8266 overlap mode the 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
-
-
-// ###### EDIT THE PIN NUMBERS IN THE LINES FOLLOWING TO SUIT YOUR ESP32 SETUP   ######
-
-// For ESP32 Dev board (only tested with ILI9341 display)
-// The hardware SPI can be mapped to any pins
-
-// Marauder Mini
-/*
-#define TFT_CS   17  // Chip select control pin D8
-#define TFT_DC   16  // Data Command control pin
-#define TFT_RST  5  // Reset pin (could connect to NodeMCU RST, see next line)
-//#define TFT_MISO 19
-//#define TFT_MOSI 23
-//#define TFT_SCLK 18
-//#define TFT_BL   32
-*/
-
-// ESP32 Marauder 
-#define TFT_MISO 19
-#define TFT_MOSI 23
-#define TFT_SCLK 18
-#define TFT_CS   17  // Chip select control pin
-#define TFT_DC   16  // Data Command control pin
-#define TFT_RST   5  // 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_BL   32  // LED back-light (only for ST7789 with backlight control pin)
-
-#define TOUCH_CS 21     // Chip select pin (T_CS) of touch screen
-
-/////////////////////////////
-
-// ESP32 Centauri
-/*
-#define TFT_MISO 19
-#define TFT_MOSI 23
-#define TFT_SCLK 18
-#define TFT_CS   27  // Chip select control pin
-#define TFT_DC   26  // Data Command control pin
-#define TFT_RST   5  // 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_BL   32  // LED back-light (only for ST7789 with backlight control pin)
-
-#define TOUCH_CS 21     // Chip select pin (T_CS) of touch screen
-*/
-/////////////////////////////
-
-//#define TFT_WR 22    // Write strobe for modified Raspberry Pi TFT only
-
-// For the M5Stack module use these #define lines
-//#define TFT_MISO 19
-//#define TFT_MOSI 23
-//#define TFT_SCLK 18
-//#define TFT_CS   14  // Chip select control pin
-//#define TFT_DC   27  // Data Command control pin
-//#define TFT_RST  33  // Reset pin (could connect to Arduino RESET pin)
-//#define TFT_BL   32  // LED back-light (required for M5Stack)
-
-// ######       EDIT THE PINs BELOW TO SUIT YOUR ESP32 PARALLEL TFT SETUP        ######
-
-// The library supports 8 bit parallel TFTs with the ESP32, the pin
-// selection below is compatible with ESP32 boards in UNO format.
-// Wemos D32 boards need to be modified, see diagram in Tools folder.
-// Only ILI9481 and ILI9341 based displays have been tested!
-
-// Parallel bus is only supported on ESP32
-// Uncomment line below to use ESP32 Parallel interface instead of SPI
-
-//#define ESP32_PARALLEL
-
-// The ESP32 and TFT the pins used for testing are:
-//#define TFT_CS   33  // Chip select control pin (library pulls permanently low
-//#define TFT_DC   15  // Data Command control pin - must use a pin in the range 0-31
-//#define TFT_RST  32  // Reset pin, toggles on startup
-
-//#define TFT_WR    4  // Write strobe control pin - must use a pin in the range 0-31
-//#define TFT_RD    2  // Read strobe control pin
-
-//#define TFT_D0   12  // Must use pins in the range 0-31 for the data bus
-//#define TFT_D1   13  // so a single register write sets/clears all bits.
-//#define TFT_D2   26  // Pins can be randomly assigned, this does not affect
-//#define TFT_D3   25  // TFT screen update performance.
-//#define TFT_D4   17
-//#define TFT_D5   16
-//#define TFT_D6   27
-//#define TFT_D7   14
-
-
-// ##################################################################################
-//
-// 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 and ESP32 have 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_FONT8N // Font 8. Alternative to Font 8 above, slightly narrower, so 3 digits fit a 160 pixel TFT
-#define LOAD_GFXFF  // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts
-
-// Comment out the #define below to stop the SPIFFS filing system and smooth font code being loaded
-// this will save ~20kbytes of FLASH
-#define SMOOTH_FONT
-
-
-// ##################################################################################
-//
-// Section 4. Other options
-//
-// ##################################################################################
-
-// Define the SPI clock frequency, this affects the graphics rendering speed. Too
-// fast and the TFT driver will not keep up and display corruption appears.
-// With an ILI9341 display 40MHz works OK, 80MHz sometimes fails
-// With a ST7735 display more than 27MHz may not work (spurious pixels and lines)
-// With an ILI9163 display 27 MHz works OK.
-
-// #define SPI_FREQUENCY   1000000
-//#define SPI_FREQUENCY   5000000
-// #define SPI_FREQUENCY  10000000
-// #define SPI_FREQUENCY  20000000
-#define SPI_FREQUENCY  27000000 // Marauder // Actually sets it to 26.67MHz = 80/3
-// #define SPI_FREQUENCY  40000000
-// #define SPI_FREQUENCY  80000000
-
-// Optional reduced SPI frequency for reading TFT
-#define SPI_READ_FREQUENCY  20000000
-
-// The XPT2046 requires a lower SPI clock rate of 2.5MHz so we define that here:
-#define SPI_TOUCH_FREQUENCY  2500000
-
-// The ESP32 has 2 free SPI ports i.e. VSPI and HSPI, the VSPI is the default.
-// If the VSPI port is in use and pins are not accessible (e.g. TTGO T-Beam)
-// then uncomment the following line:
-//#define USE_HSPI_PORT
-
-// Comment out the following #define if "SPI Transactions" do not need to be
-// supported. 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
-// Transaction support is required if other SPI devices are connected.
-
-// Transactions are automatically enabled by the library for an ESP32 (to use HAL mutex)
-// so changing it here has no effect
-
-// #define SUPPORT_TRANSACTIONS