Merge branch 'bugfix/fix_io_interface_compilatoin_issues' into 'master'

bugfix(lcd): Fixed the compilation issues caused by the IO interface See merge request ae_group/esp-iot-solution!1201
espressif · Jan 13, 2025 · cf4f5a6 · cf4f5a6
2 parents 1d05c79 + 9ed372f
commit cf4f5a6
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 13 deletions.
diff --git a/components/display/lcd/esp_lcd_axs15231b/test_apps/main/test_esp_lcd_axs15231b.c b/components/display/lcd/esp_lcd_axs15231b/test_apps/main/test_esp_lcd_axs15231b.c
@@ -14,7 +14,7 @@
 #include "driver/i2c.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
-#include "esp_lcd_panel_io_interface.h"
+#include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_ops.h"
 #include "unity.h"
 #include "unity_test_runner.h"

diff --git a/components/display/lcd/esp_lcd_gc9b71/test_apps/main/test_esp_lcd_gc9b71.c b/components/display/lcd/esp_lcd_gc9b71/test_apps/main/test_esp_lcd_gc9b71.c
@@ -13,7 +13,7 @@
 #include "driver/gpio.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
-#include "esp_lcd_panel_io_interface.h"
+#include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_ops.h"
 #include "unity.h"
 #include "unity_test_runner.h"

diff --git a/components/display/lcd/esp_lcd_nv3022b/test_apps/main/test_esp_lcd_nv3022b.c b/components/display/lcd/esp_lcd_nv3022b/test_apps/main/test_esp_lcd_nv3022b.c
@@ -14,7 +14,6 @@
 #include "esp_heap_caps.h"
 #include "esp_log.h"
 #include "esp_lcd_panel_io.h"
-#include "esp_lcd_panel_io_interface.h"
 #include "esp_lcd_panel_ops.h"
 #include "unity.h"
 #include "unity_test_runner.h"

diff --git a/...s/display/lcd/esp_lcd_panel_io_additions/test_apps/main/test_esp_lcd_panel_io_additions.c b/...s/display/lcd/esp_lcd_panel_io_additions/test_apps/main/test_esp_lcd_panel_io_additions.c
@@ -11,7 +11,7 @@
 #include "freertos/task.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
-#include "esp_lcd_panel_io_interface.h"
+#include "esp_lcd_panel_io.h"
 #include "unity.h"
 #include "unity_test_runner.h"
 

diff --git a/components/display/lcd/esp_lcd_sh8601/test_apps/main/test_esp_lcd_sh8601.c b/components/display/lcd/esp_lcd_sh8601/test_apps/main/test_esp_lcd_sh8601.c
@@ -13,7 +13,7 @@
 #include "driver/gpio.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
-#include "esp_lcd_panel_io_interface.h"
+#include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_ops.h"
 #include "unity.h"
 #include "unity_test_runner.h"

diff --git a/components/display/lcd/esp_lcd_spd2010/test_apps/main/test_esp_lcd_spd2010.c b/components/display/lcd/esp_lcd_spd2010/test_apps/main/test_esp_lcd_spd2010.c
@@ -13,7 +13,7 @@
 #include "driver/gpio.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
-#include "esp_lcd_panel_io_interface.h"
+#include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_ops.h"
 #include "unity.h"
 #include "unity_test_runner.h"

diff --git a/components/display/lcd/esp_lcd_st77903_qspi/test_apps/main/test_esp_lcd_st77903_qspi.c b/components/display/lcd/esp_lcd_st77903_qspi/test_apps/main/test_esp_lcd_st77903_qspi.c
@@ -13,7 +13,7 @@
 #include "esp_heap_caps.h"
 #include "esp_log.h"
 #include "esp_timer.h"
-#include "esp_lcd_panel_io_interface.h"
+#include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_ops.h"
 #include "unity.h"
 #include "unity_test_runner.h"

diff --git a/components/display/lcd/esp_lcd_st77903_rgb/test_apps/main/test_esp_lcd_st77903_rgb.c b/components/display/lcd/esp_lcd_st77903_rgb/test_apps/main/test_esp_lcd_st77903_rgb.c
@@ -15,7 +15,7 @@
 #include "esp_log.h"
 #include "esp_timer.h"
 #include "esp_lcd_panel_io_additions.h"
-#include "esp_lcd_panel_io_interface.h"
+#include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_ops.h"
 #include "unity.h"
 #include "unity_test_runner.h"

diff --git a/components/display/lcd/esp_lcd_st77916/test_apps/main/test_esp_lcd_st77916.c b/components/display/lcd/esp_lcd_st77916/test_apps/main/test_esp_lcd_st77916.c
@@ -13,7 +13,7 @@
 #include "driver/gpio.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
-#include "esp_lcd_panel_io_interface.h"
+#include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_ops.h"
 #include "unity.h"
 #include "unity_test_runner.h"

diff --git a/components/display/lcd/esp_lcd_st77922/test_apps/main/test_esp_lcd_st77922_general.c b/components/display/lcd/esp_lcd_st77922/test_apps/main/test_esp_lcd_st77922_general.c
@@ -14,7 +14,7 @@
 #include "esp_heap_caps.h"
 #include "esp_log.h"
 #include "esp_timer.h"
-#include "esp_lcd_panel_io_interface.h"
+#include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_ops.h"
 #include "esp_lcd_panel_io_additions.h"
 #include "unity.h"

diff --git a/components/display/lcd/esp_lcd_st77922/test_apps/main/test_esp_lcd_st77922_rgb.c b/components/display/lcd/esp_lcd_st77922/test_apps/main/test_esp_lcd_st77922_rgb.c
@@ -16,7 +16,7 @@
 #include "esp_heap_caps.h"
 #include "esp_log.h"
 #include "esp_timer.h"
-#include "esp_lcd_panel_io_interface.h"
+#include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_ops.h"
 #include "esp_lcd_panel_io_additions.h"
 #include "unity.h"

diff --git a/...nents/display/lcd_touch/esp_lcd_touch_spd2010/test_apps/main/test_esp_lcd_touch_spd2010.c b/...nents/display/lcd_touch/esp_lcd_touch_spd2010/test_apps/main/test_esp_lcd_touch_spd2010.c
@@ -11,7 +11,7 @@
 #include "freertos/task.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
-#include "esp_lcd_panel_io_interface.h"
+#include "esp_lcd_panel_io.h"
 #include "unity.h"
 #include "unity_test_runner.h"
 

diff --git a/components/display/lcd_touch/esp_lcd_touch_st7123/test_apps/main/test_esp_lcd_touch_st7123.c b/components/display/lcd_touch/esp_lcd_touch_st7123/test_apps/main/test_esp_lcd_touch_st7123.c
@@ -14,7 +14,7 @@
 #include "driver/i2c.h"
 #include "unity.h"
 #include "unity_test_runner.h"
-#include "esp_lcd_panel_io_interface.h"
+#include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_ops.h"
 #include "driver/spi_master.h"
 #include "esp_lcd_st77922.h"