From 28d663f6b680a0d540cea654ceba7c02d3d0b5ca Mon Sep 17 00:00:00 2001
From: Carlos Diaz <carlos.santiago.diaz@gmail.com>
Date: Wed, 2 Feb 2022 16:51:28 -0600
Subject: [PATCH] Moving ESP-IDF specific files to `lv_port` (#175)

* Move disp_spi.c and tp_spi.c to lv_port

* Move esp_lcd_backlight to lv_port

* Move disp_spi.h and tp_spi.h to lv_port
---
 CMakeLists.txt                            | 8 +++++---
 {lvgl_tft => lv_port}/disp_spi.c          | 0
 {lvgl_tft => lv_port}/disp_spi.h          | 0
 {lvgl_tft => lv_port}/esp_lcd_backlight.c | 0
 {lvgl_touch => lv_port}/tp_spi.c          | 0
 {lvgl_touch => lv_port}/tp_spi.h          | 0
 lvgl_helpers.c                            | 4 ++--
 7 files changed, 7 insertions(+), 5 deletions(-)
 rename {lvgl_tft => lv_port}/disp_spi.c (100%)
 rename {lvgl_tft => lv_port}/disp_spi.h (100%)
 rename {lvgl_tft => lv_port}/esp_lcd_backlight.c (100%)
 rename {lvgl_touch => lv_port}/tp_spi.c (100%)
 rename {lvgl_touch => lv_port}/tp_spi.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3bfc8f7..3f6cd98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ if(ESP_PLATFORM)
 file(GLOB SOURCES *.c)
 set(LVGL_INCLUDE_DIRS . lvgl_tft)
 list(APPEND SOURCES "lvgl_tft/disp_driver.c")
-list(APPEND SOURCES "lvgl_tft/esp_lcd_backlight.c")
+list(APPEND SOURCES "lv_port/esp_lcd_backlight.c")
 
 # This are the source files used for mcu abstraction
 set(LV_PORT_PATH "lv_port")
@@ -34,7 +34,7 @@ list(APPEND SOURCES "${LV_PORT_PATH}/lv_port_display_espressif.c")
     list(APPEND SOURCES "lvgl_tft/pcd8544.c")
 
 if(CONFIG_LV_TFT_DISPLAY_PROTOCOL_SPI)
-    list(APPEND SOURCES "lvgl_tft/disp_spi.c")
+    list(APPEND SOURCES "lv_port/disp_spi.c")
 endif()
 
 # Add touch driver to compilation only if it is selected in menuconfig
@@ -61,7 +61,7 @@ if(CONFIG_LV_TOUCH_CONTROLLER)
     endif()
 
     if(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_SPI)
-        list(APPEND SOURCES "lvgl_touch/tp_spi.c")
+        list(APPEND SOURCES "lv_port/tp_spi.c")
     endif()
 endif()
 
@@ -69,6 +69,8 @@ if(CONFIG_LV_I2C)
     list(APPEND SOURCES "lvgl_i2c/i2c_manager.c")
 endif()
 
+list(APPEND LVGL_INCLUDE_DIRS lv_port)
+
 idf_component_register(SRCS ${SOURCES}
                        INCLUDE_DIRS ${LVGL_INCLUDE_DIRS}
                        REQUIRES lvgl)
diff --git a/lvgl_tft/disp_spi.c b/lv_port/disp_spi.c
similarity index 100%
rename from lvgl_tft/disp_spi.c
rename to lv_port/disp_spi.c
diff --git a/lvgl_tft/disp_spi.h b/lv_port/disp_spi.h
similarity index 100%
rename from lvgl_tft/disp_spi.h
rename to lv_port/disp_spi.h
diff --git a/lvgl_tft/esp_lcd_backlight.c b/lv_port/esp_lcd_backlight.c
similarity index 100%
rename from lvgl_tft/esp_lcd_backlight.c
rename to lv_port/esp_lcd_backlight.c
diff --git a/lvgl_touch/tp_spi.c b/lv_port/tp_spi.c
similarity index 100%
rename from lvgl_touch/tp_spi.c
rename to lv_port/tp_spi.c
diff --git a/lvgl_touch/tp_spi.h b/lv_port/tp_spi.h
similarity index 100%
rename from lvgl_touch/tp_spi.h
rename to lv_port/tp_spi.h
diff --git a/lvgl_helpers.c b/lvgl_helpers.c
index b382fb4..f6a539f 100644
--- a/lvgl_helpers.c
+++ b/lvgl_helpers.c
@@ -14,8 +14,8 @@
 #include "esp_log.h"
 #include "esp_idf_version.h"
 
-#include "lvgl_tft/disp_spi.h"
-#include "lvgl_touch/tp_spi.h"
+#include "disp_spi.h"
+#include "tp_spi.h"
 
 #include "lvgl_spi_conf.h"