From 446bed67bda943b5fae385dd794e22a35bff80e8 Mon Sep 17 00:00:00 2001
From: Baoshi <mail@ba0sh1.com>
Date: Mon, 11 Jan 2021 22:31:57 +0800
Subject: [PATCH] Move st7796 driver file into lvgl_tft folder. Add missing
 Kconfig options. Fix ft6x36 compilation error.

---
 lvgl_tft/Kconfig                | 5 ++++-
 st7796s.c => lvgl_tft/st7796s.c | 0
 st7796s.h => lvgl_tft/st7796s.h | 0
 lvgl_touch/ft6x36.h             | 8 +++++++-
 4 files changed, 11 insertions(+), 2 deletions(-)
 rename st7796s.c => lvgl_tft/st7796s.c (100%)
 rename st7796s.h => lvgl_tft/st7796s.h (100%)

diff --git a/lvgl_tft/Kconfig b/lvgl_tft/Kconfig
index 6bd6ae0..b682935 100644
--- a/lvgl_tft/Kconfig
+++ b/lvgl_tft/Kconfig
@@ -483,7 +483,8 @@ menu "LVGL TFT Display controller"
                     LV_TFT_DISPLAY_CONTROLLER_IL3820 || \
                     LV_TFT_DISPLAY_CONTROLLER_RA8875 || \
                     LV_TFT_DISPLAY_CONTROLLER_JD79653A || \
-                    LV_TFT_DISPLAY_CONTROLLER_UC8151D
+                    LV_TFT_DISPLAY_CONTROLLER_UC8151D || \
+                    LV_TFT_DISPLAY_CONTROLLER_ST7796S
         default LV_DISPLAY_ORIENTATION_LANDSCAPE \
                     if !LV_TFT_DISPLAY_CONTROLLER_JD79653A || \
                         !LV_TFT_DISPLAY_CONTROLLER_UC8151D
@@ -525,6 +526,8 @@ menu "LVGL TFT Display controller"
         default 240 if ( LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_WROVER4 ) && (LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED)
         default 320 if ( LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_WROVER4 ) && (LV_DISPLAY_ORIENTATION_LANDSCAPE)
         default 320 if ( LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_WROVER4 ) && (LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
+        default 480 if LV_PREDEFINED_DISPLAY_WT32_SC01 && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
+        default 320 if LV_PREDEFINED_DISPLAY_WT32_SC01 && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED)        
         default 480 if LV_PREDEFINED_DISPLAY_ERTFT0356 || LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
         default 64 if ( LV_PREDEFINED_DISPLAY_WEMOS_LOLIN || LV_PREDEFINED_DISPLAY_M5STICK ) && LV_DISPLAY_ORIENTATION_PORTRAIT
         default 128 if ( LV_PREDEFINED_DISPLAY_WEMOS_LOLIN || LV_PREDEFINED_DISPLAY_M5STICK ) && LV_DISPLAY_ORIENTATION_LANDSCAPE
diff --git a/st7796s.c b/lvgl_tft/st7796s.c
similarity index 100%
rename from st7796s.c
rename to lvgl_tft/st7796s.c
diff --git a/st7796s.h b/lvgl_tft/st7796s.h
similarity index 100%
rename from st7796s.h
rename to lvgl_tft/st7796s.h
diff --git a/lvgl_touch/ft6x36.h b/lvgl_touch/ft6x36.h
index 9674639..da466b6 100644
--- a/lvgl_touch/ft6x36.h
+++ b/lvgl_touch/ft6x36.h
@@ -21,7 +21,13 @@
 
 #define __FT6X06_H
 
-#include <lvgl/src/lv_hal/lv_hal.h>
+#include <stdint.h>
+#include <stdbool.h>
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {