From 78a3c6dec8d21b481b7e14b7d5cda47a87e76e27 Mon Sep 17 00:00:00 2001 From: Liu Zhongwei Date: Thu, 9 Nov 2023 09:19:58 +0800 Subject: [PATCH] lcd: fix breaking change version --- components/lcd/esp_lcd_gc9a01/CMakeLists.txt | 3 ++- components/lcd/esp_lcd_gc9a01/README.md | 4 ++-- components/lcd/esp_lcd_gc9a01/idf_component.yml | 2 +- components/lcd/esp_lcd_gc9a01/include/esp_lcd_gc9a01.h | 1 - components/lcd/esp_lcd_ili9341/CMakeLists.txt | 3 ++- components/lcd/esp_lcd_ili9341/README.md | 4 ++-- components/lcd/esp_lcd_ili9341/idf_component.yml | 2 +- components/lcd/esp_lcd_ili9341/include/esp_lcd_ili9341.h | 1 - components/lcd/esp_lcd_st7796/README.md | 4 ++-- components/lcd/esp_lcd_st7796/idf_component.yml | 2 +- components/lcd/esp_lcd_st7796/include/esp_lcd_st7796.h | 8 ++++---- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/components/lcd/esp_lcd_gc9a01/CMakeLists.txt b/components/lcd/esp_lcd_gc9a01/CMakeLists.txt index 8b59c0e1..09ea41e1 100644 --- 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/README.md b/components/lcd/esp_lcd_gc9a01/README.md index 0d30e6fb..20ad1281 100644 --- a/components/lcd/esp_lcd_gc9a01/README.md +++ b/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), // }; diff --git a/components/lcd/esp_lcd_gc9a01/idf_component.yml b/components/lcd/esp_lcd_gc9a01/idf_component.yml index 2251787c..06b2f4e1 100644 --- 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 index 2d40c889..abd87091 100644 --- 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 index 31ba41d6..801ed2b6 100644 --- 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/README.md b/components/lcd/esp_lcd_ili9341/README.md index 636baa87..33418e54 100644 --- a/components/lcd/esp_lcd_ili9341/README.md +++ b/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), // }; diff --git a/components/lcd/esp_lcd_ili9341/idf_component.yml b/components/lcd/esp_lcd_ili9341/idf_component.yml index 65ef6b54..2880d24c 100644 --- 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 index 51325e55..cb48508b 100644 --- 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/README.md b/components/lcd/esp_lcd_st7796/README.md index 55dfdd81..88ae070b 100644 --- a/components/lcd/esp_lcd_st7796/README.md +++ b/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), // }; diff --git a/components/lcd/esp_lcd_st7796/idf_component.yml b/components/lcd/esp_lcd_st7796/idf_component.yml index 8f6e0be3..a3453e90 100644 --- 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 index fce41eec..9040454e 100644 --- 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; /*