From b4a901ef9acc32e481075c912368c264b24298e9 Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Wed, 17 Feb 2021 03:41:37 +0100
Subject: [PATCH] Update driver path

---
 src/drv/hasp_drv_touch.cpp       | 30 +++++++++++++++---------------
 src/drv/touch/hasp_drv_ft5206.h  |  4 ++--
 src/drv/touch/hasp_drv_ft6336u.h |  2 +-
 src/drv/touch/hasp_drv_gt911.h   |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/drv/hasp_drv_touch.cpp b/src/drv/hasp_drv_touch.cpp
index bb311480..28bafd31 100644
--- a/src/drv/hasp_drv_touch.cpp
+++ b/src/drv/hasp_drv_touch.cpp
@@ -3,23 +3,23 @@
 #include "lvgl.h"
 
 #if TOUCH_DRIVER == 2046
-    #if defined(USE_FSMC)
-    #else
-        #include "tft_espi_drv.h"
-    #endif
+#if defined(USE_FSMC)
+#else
+#include "tft_espi_drv.h"
+#endif
 
 #elif TOUCH_DRIVER == 2046
-    #include "indev/XPT2046.h"
+#include "indev/XPT2046.h"
 #elif TOUCH_DRIVER == 0x2046B
-    #include "hasp_drv_xpt2046.h"
+#include "drv/touch/hasp_drv_xpt2046.h"
 #elif TOUCH_DRIVER == 911
-    #include "hasp_drv_gt911.h"
+#include "drv/touch/hasp_drv_gt911.h"
 #elif TOUCH_DRIVER == 0xADC
-    #include "hasp_drv_ft6336u.h"
+#include "drv/touch/hasp_drv_ft6336u.h"
 #elif TOUCH_DRIVER == 5206
-    #include "hasp_drv_ft5206.h"
+#include "drv/touch/hasp_drv_ft5206.h"
 #elif TOUCH_DRIVER == 6336
-    #include "hasp_drv_ft6336u.h"
+#include "drv/touch/hasp_drv_ft6336u.h"
 #else
 //#include "tp_i2c.h"
 //#include "ft6x36.h"
@@ -34,12 +34,12 @@ void drv_touch_init(uint8_t rotation)
     drv_touch_rotation = rotation;
 
 #if TOUCH_DRIVER == 2046 // XPT2046 Resistive touch panel driver
-    #if defined(USE_FSMC)
+#if defined(USE_FSMC)
     xpt2046_init(rotation);
-    #else
-        // The display driver takes care of all initializations
-        // tft_espi_init(rotation);
-    #endif
+#else
+    // The display driver takes care of all initializations
+    // tft_espi_init(rotation);
+#endif
 
 #elif TOUCH_DRIVER == 911
     GT911_init();
diff --git a/src/drv/touch/hasp_drv_ft5206.h b/src/drv/touch/hasp_drv_ft5206.h
index 88c6eb3f..9f1d9786 100644
--- a/src/drv/touch/hasp_drv_ft5206.h
+++ b/src/drv/touch/hasp_drv_ft5206.h
@@ -6,9 +6,9 @@
 
 #if TOUCH_DRIVER == 5206
 
-    #define FT5206_address 0x38
+#define FT5206_address 0x38
 
-    #include "log/hasp_debug.h" // for TAG_DRVR
+#include "hasp_debug.h" // for TAG_DRVR
 
 bool FT5206_getXY(int16_t * touchX, int16_t * touchY, bool debug);
 void FT5206_init();
diff --git a/src/drv/touch/hasp_drv_ft6336u.h b/src/drv/touch/hasp_drv_ft6336u.h
index ac1dd47a..652ca87b 100644
--- a/src/drv/touch/hasp_drv_ft6336u.h
+++ b/src/drv/touch/hasp_drv_ft6336u.h
@@ -6,7 +6,7 @@
 
 #if TOUCH_DRIVER == 6336
 
-    #include "log/hasp_debug.h" // for TAG_DRVR
+#include "hasp_debug.h" // for TAG_DRVR
 
 bool FT6336U_getXY(int16_t * touchX, int16_t * touchY, bool debug);
 void FT6336U_init();
diff --git a/src/drv/touch/hasp_drv_gt911.h b/src/drv/touch/hasp_drv_gt911.h
index ec36b69b..761ae081 100644
--- a/src/drv/touch/hasp_drv_gt911.h
+++ b/src/drv/touch/hasp_drv_gt911.h
@@ -6,7 +6,7 @@
 
 #if TOUCH_DRIVER == 911
 
-    #include "log/hasp_debug.h" // for TAG_DRVR
+#include "hasp_debug.h" // for TAG_DRVR
 
 bool GT911_getXY(int16_t * touchX, int16_t * touchY, bool debug);
 void GT911_init();