Merge branch 'master' of https://github.com/Bodmer/TFT_eSPI

User_Setups/Setup36_RPi_touch_ST7796.h

 // See SetupX_Template.h for all options available
 
 #define RPI_DISPLAY_TYPE
-#define ST7796_DRIVER // 20MHz maximum SPI
+#define ILI9341_DRIVER // 20MHz maximum SPI
 
 
 #define TFT_MISO 19

examples/160 x 128/TFT_Clock_Digital/TFT_Clock_Digital.ino

@@ -99,7 +99,7 @@ void loop() {
       // Font 7 is to show a pseudo 7 segment display.
       // Font 7 only contains characters [space] 0 1 2 3 4 5 6 7 8 9 0 : .
       tft.drawString("88:88",xpos,ypos,7); // Overwrite the text to clear it
-      tft.setTextColor(0xFBE0, TFT_BLACK); // Orange
+      tft.setTextColor(0xFBE0); // Orange
       omm = mm;
 
       if (hh<10) xpos+= tft.drawChar('0',xpos,ypos,7);