Merge pull request espressif#248 from Lzw655/bugfix/lcd_breaking_chan…

…ge_version

lcd: fix breaking change version

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})

components/lcd/esp_lcd_gc9a01/README.md

@@ -34,7 +34,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
 
 /**
  * Uncomment these lines if use custom initialization commands.
- * The array should be declared as static const and positioned outside the function.
+ * The array should be declared as "static const" and positioned outside the function.
  */
 // static const gc9a01_lcd_init_cmd_t lcd_init_cmds[] = {
 // //  {cmd, { data }, data_size, delay_ms}
@@ -46,7 +46,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
 
     ESP_LOGI(TAG, "Install GC9A01 panel driver");
     esp_lcd_panel_handle_t panel_handle = NULL;
-    // const gc9a01_vendor_config_t vendor_config = {  // Uncomment these lines if use custom initialization commands
+    // gc9a01_vendor_config_t vendor_config = {  // Uncomment these lines if use custom initialization commands
     //     .init_cmds = lcd_init_cmds,
     //     .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(gc9a01_lcd_init_cmd_t),
     // };

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:

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

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})

components/lcd/esp_lcd_ili9341/README.md

@@ -34,7 +34,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
 
 /**
  * Uncomment these lines if use custom initialization commands.
- * The array should be declared as static const and positioned outside the function.
+ * The array should be declared as "static const" and positioned outside the function.
  */
 // static const ili9341_lcd_init_cmd_t lcd_init_cmds[] = {
 // // {cmd, { data }, data_size, delay_ms}
@@ -46,7 +46,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
 
     ESP_LOGI(TAG, "Install ILI9341 panel driver");
     esp_lcd_panel_handle_t panel_handle = NULL;
-    // const ili9341_vendor_config_t vendor_config = {  // Uncomment these lines if use custom initialization commands
+    // ili9341_vendor_config_t vendor_config = {  // Uncomment these lines if use custom initialization commands
     //     .init_cmds = lcd_init_cmds,
     //     .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(ili9341_lcd_init_cmd_t),
     // };

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:

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

components/lcd/esp_lcd_st7796/README.md

@@ -42,7 +42,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
 
 /**
  * Uncomment these lines if use custom initialization commands.
- * The array should be declared as static const and positioned outside the function.
+ * The array should be declared as "static const" and positioned outside the function.
  */
 // static const st7796_lcd_init_cmd_t lcd_init_cmds[] = {
 // // {cmd, { data }, data_size, delay_ms}
@@ -54,7 +54,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
 
     ESP_LOGI(TAG, "Install ST7796 panel driver");
     esp_lcd_panel_handle_t panel_handle = NULL;
-    // const st7796_vendor_config_t vendor_config = {  // Uncomment these lines if use custom initialization commands
+    // st7796_vendor_config_t vendor_config = {  // Uncomment these lines if use custom initialization commands
     //     .init_cmds = lcd_init_cmds,
     //     .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(st7796_lcd_init_cmd_t),
     // };

components/lcd/esp_lcd_st7796/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.2.0"
+version: "1.2.1"
 targets:
   - esp32s2
   - esp32s3

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
  *