Merge pull request #1 from xC0000005/tft_and_touch_screen

Add driver definition for LERDGE init sequence.
xC0000005 · Jun 27, 2020 · 6128419 · 6128419
2 parents 9052a5b + bd37801
commit 6128419
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Marlin/src/lcd/tft/tft.cpp b/Marlin/src/lcd/tft/tft.cpp
@@ -63,6 +63,9 @@ void TFT::init() {
     #elif TFT_DRIVER == ILI9488
       lcd_id = ILI9488;
       write_esc_sequence(ili9488_init);
+    #elif TFT_DRIVER == LERDGE_ST7796
+      lcd_id = ST7796;
+      write_esc_sequence(lerdge_st7796s_init);
     #else
       #error Unsupported TFT driver
     #endif

diff --git a/Marlin/src/lcd/tft/tft.h b/Marlin/src/lcd/tft/tft.h
@@ -40,13 +40,14 @@
   #error Unsupported display resolution!
 #endif
 
-#define ST7735  0x89F0
-#define ST7789  0x8552
-#define ST7796  0x7796
-#define ILI9328 0x9328
-#define ILI9341 0x9341
-#define ILI9488 0x9488
-#define AUTO    0xFFFF
+#define ST7735          0x89F0
+#define ST7789          0x8552
+#define ST7796          0x7796
+#define ILI9328         0x9328
+#define ILI9341         0x9341
+#define ILI9488         0x9488
+#define LERDGE_ST7796   0xFFFE
+#define AUTO            0xFFFF
 
 #ifndef TFT_BUFFER_SIZE
   #ifdef STM32F103xB