lcd: fix breaking change version

espressif · Nov 21, 2023 · 8f6fb58 · 8f6fb58
1 parent af5df95
commit 8f6fb58
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/components/lcd/esp_lcd_gc9a01/CMakeLists.txt b/components/lcd/esp_lcd_gc9a01/CMakeLists.txt
@@ -1,6 +1,7 @@
 idf_component_register(SRCS "esp_lcd_gc9a01.c"
                        INCLUDE_DIRS "include"
-                       REQUIRES "driver" "esp_lcd")
+                       REQUIRES "esp_lcd"
+                       PRIV_REQUIRES "driver")
 
 include(package_manager)
 cu_pkg_define_version(${CMAKE_CURRENT_LIST_DIR})
diff --git a/components/lcd/esp_lcd_gc9a01/idf_component.yml b/components/lcd/esp_lcd_gc9a01/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.2.0"
+version: "2.0.0"
 description: ESP LCD GC9A01
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd/esp_lcd_gc9a01
 dependencies:

diff --git a/components/lcd/esp_lcd_gc9a01/include/esp_lcd_gc9a01.h b/components/lcd/esp_lcd_gc9a01/include/esp_lcd_gc9a01.h
@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include "hal/spi_ll.h"
 #include "esp_lcd_panel_vendor.h"
 
 #ifdef __cplusplus

diff --git a/components/lcd/esp_lcd_ili9341/CMakeLists.txt b/components/lcd/esp_lcd_ili9341/CMakeLists.txt
@@ -1,6 +1,7 @@
 idf_component_register(SRCS "esp_lcd_ili9341.c"
                        INCLUDE_DIRS "include"
-                       REQUIRES "driver" "esp_lcd")
+                       REQUIRES "esp_lcd"
+                       PRIV_REQUIRES "driver")
 
 include(package_manager)
 cu_pkg_define_version(${CMAKE_CURRENT_LIST_DIR})
diff --git a/components/lcd/esp_lcd_ili9341/idf_component.yml b/components/lcd/esp_lcd_ili9341/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.2.0"
+version: "2.0.0"
 description: ESP LCD ILI9341
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd/esp_lcd_ili9341
 dependencies:

diff --git a/components/lcd/esp_lcd_ili9341/include/esp_lcd_ili9341.h b/components/lcd/esp_lcd_ili9341/include/esp_lcd_ili9341.h
@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include "hal/spi_ll.h"
 #include "esp_lcd_panel_vendor.h"
 
 #ifdef __cplusplus

diff --git a/components/lcd/esp_lcd_st7796/idf_component.yml b/components/lcd/esp_lcd_st7796/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.2.0"
+version: "1.2.1"
 targets:
   - esp32s2
   - esp32s3

diff --git a/components/lcd/esp_lcd_st7796/include/esp_lcd_st7796.h b/components/lcd/esp_lcd_st7796/include/esp_lcd_st7796.h
@@ -13,6 +13,10 @@
 #include "hal/lcd_types.h"
 #include "esp_lcd_panel_vendor.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief LCD panel initialization commands.
  *
@@ -38,10 +42,6 @@ typedef struct {
     uint16_t init_cmds_size;                    /*<! Number of commands in above array */
 } st7796_vendor_config_t;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * @brief Create LCD panel for model ST7796
  *