From 13f6d90249364bb28242eb3d4e61fbeada515da2 Mon Sep 17 00:00:00 2001 From: Valeriy Kucherenko Date: Sat, 28 Oct 2023 21:51:35 +0300 Subject: [PATCH 1/3] Fix compilation error on ESP-IDF 5.0.4 (error: unknown type name 'adc_cali_handle_t') --- bsp/esp32_s3_korvo_2/esp32_s3_korvo_2_idf5.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2_idf5.c b/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2_idf5.c index 08fb1acf..5089b9ff 100644 --- a/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2_idf5.c +++ b/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2_idf5.c @@ -5,6 +5,7 @@ */ #include "esp_err.h" +#include "esp_adc/adc_cali_scheme.h" #include "esp_adc/adc_oneshot.h" #include "bsp/esp32_s3_korvo_2.h" #include "bsp_err_check.h" From 7ca06b222e2c3692b612b43fd1b33813da329065 Mon Sep 17 00:00:00 2001 From: Valeriy Kucherenko Date: Sat, 28 Oct 2023 21:52:36 +0300 Subject: [PATCH 2/3] Fix compilation on ESP IDF 5.0.4 --- components/lcd/esp_lcd_gc9a01/README.md | 2 +- components/lcd/esp_lcd_gc9a01/esp_lcd_gc9a01.c | 2 +- .../lcd/esp_lcd_gc9a01/test_apps/main/test_esp_lcd_gc9a01.c | 2 +- components/lcd/esp_lcd_ili9341/README.md | 2 +- components/lcd/esp_lcd_ili9341/esp_lcd_ili9341.c | 2 +- .../lcd/esp_lcd_ili9341/test_apps/main/test_esp_lcd_ili9341.c | 2 +- components/lcd/esp_lcd_st7796/README.md | 2 +- components/lcd/esp_lcd_st7796/esp_lcd_st7796.c | 2 +- .../lcd/esp_lcd_st7796/test_apps/main/test_esp_lcd_st7796.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/lcd/esp_lcd_gc9a01/README.md b/components/lcd/esp_lcd_gc9a01/README.md index afa0ca15..5df22893 100644 --- a/components/lcd/esp_lcd_gc9a01/README.md +++ b/components/lcd/esp_lcd_gc9a01/README.md @@ -51,7 +51,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum // }; const esp_lcd_panel_dev_config_t panel_config = { .reset_gpio_num = EXAMPLE_PIN_NUM_LCD_RST, // Set to -1 if not use -#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 4) // Implemented by LCD command `36h` +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) // Implemented by LCD command `36h` .color_space = ESP_LCD_COLOR_SPACE_BGR, #else .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_BGR, diff --git a/components/lcd/esp_lcd_gc9a01/esp_lcd_gc9a01.c b/components/lcd/esp_lcd_gc9a01/esp_lcd_gc9a01.c index 0d304006..979c0092 100644 --- a/components/lcd/esp_lcd_gc9a01/esp_lcd_gc9a01.c +++ b/components/lcd/esp_lcd_gc9a01/esp_lcd_gc9a01.c @@ -61,7 +61,7 @@ esp_err_t esp_lcd_new_panel_gc9a01(const esp_lcd_panel_io_handle_t io, const esp ESP_GOTO_ON_ERROR(gpio_config(&io_conf), err, TAG, "configure GPIO for RST line failed"); } -#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 4) +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) switch (panel_dev_config->color_space) { case ESP_LCD_COLOR_SPACE_RGB: gc9a01->madctl_val = 0; diff --git a/components/lcd/esp_lcd_gc9a01/test_apps/main/test_esp_lcd_gc9a01.c b/components/lcd/esp_lcd_gc9a01/test_apps/main/test_esp_lcd_gc9a01.c index 84089092..441fd58c 100644 --- a/components/lcd/esp_lcd_gc9a01/test_apps/main/test_esp_lcd_gc9a01.c +++ b/components/lcd/esp_lcd_gc9a01/test_apps/main/test_esp_lcd_gc9a01.c @@ -84,7 +84,7 @@ TEST_CASE("test gc9a01 to draw color bar with SPI interface", "[gc9a01][spi]") esp_lcd_panel_handle_t panel_handle = NULL; const esp_lcd_panel_dev_config_t panel_config = { .reset_gpio_num = TEST_PIN_NUM_LCD_RST, -#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 4) +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) .color_space = ESP_LCD_COLOR_SPACE_BGR, #else .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_BGR, diff --git a/components/lcd/esp_lcd_ili9341/README.md b/components/lcd/esp_lcd_ili9341/README.md index 0ac578d5..2e2c323f 100644 --- a/components/lcd/esp_lcd_ili9341/README.md +++ b/components/lcd/esp_lcd_ili9341/README.md @@ -51,7 +51,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum // }; const esp_lcd_panel_dev_config_t panel_config = { .reset_gpio_num = EXAMPLE_PIN_NUM_LCD_RST, // Set to -1 if not use -#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 4) // Implemented by LCD command `36h` +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) // Implemented by LCD command `36h` .color_space = ESP_LCD_COLOR_SPACE_BGR, #else .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_BGR, diff --git a/components/lcd/esp_lcd_ili9341/esp_lcd_ili9341.c b/components/lcd/esp_lcd_ili9341/esp_lcd_ili9341.c index 27fc439b..22374d89 100644 --- a/components/lcd/esp_lcd_ili9341/esp_lcd_ili9341.c +++ b/components/lcd/esp_lcd_ili9341/esp_lcd_ili9341.c @@ -61,7 +61,7 @@ esp_err_t esp_lcd_new_panel_ili9341(const esp_lcd_panel_io_handle_t io, const es ESP_GOTO_ON_ERROR(gpio_config(&io_conf), err, TAG, "configure GPIO for RST line failed"); } -#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 4) +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) switch (panel_dev_config->color_space) { case ESP_LCD_COLOR_SPACE_RGB: ili9341->madctl_val = 0; diff --git a/components/lcd/esp_lcd_ili9341/test_apps/main/test_esp_lcd_ili9341.c b/components/lcd/esp_lcd_ili9341/test_apps/main/test_esp_lcd_ili9341.c index 45f4e6ad..1b8ff67c 100644 --- a/components/lcd/esp_lcd_ili9341/test_apps/main/test_esp_lcd_ili9341.c +++ b/components/lcd/esp_lcd_ili9341/test_apps/main/test_esp_lcd_ili9341.c @@ -96,7 +96,7 @@ TEST_CASE("test ili9341 to draw color bar with SPI interface", "[ili9341][spi]") esp_lcd_panel_handle_t panel_handle = NULL; const esp_lcd_panel_dev_config_t panel_config = { .reset_gpio_num = TEST_PIN_NUM_LCD_RST, // Shared with Touch reset -#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 4) +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) .color_space = ESP_LCD_COLOR_SPACE_BGR, #else .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_BGR, diff --git a/components/lcd/esp_lcd_st7796/README.md b/components/lcd/esp_lcd_st7796/README.md index 9fafa292..ae28059e 100644 --- a/components/lcd/esp_lcd_st7796/README.md +++ b/components/lcd/esp_lcd_st7796/README.md @@ -60,7 +60,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum // }; const esp_lcd_panel_dev_config_t panel_config = { .reset_gpio_num = EXAMPLE_PIN_NUM_LCD_RST, // Set to -1 if not use -#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 4) // Implemented by LCD command `36h` +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) // Implemented by LCD command `36h` .color_space = ESP_LCD_COLOR_SPACE_BGR, #else .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_BGR, diff --git a/components/lcd/esp_lcd_st7796/esp_lcd_st7796.c b/components/lcd/esp_lcd_st7796/esp_lcd_st7796.c index fa85994d..51b775aa 100644 --- a/components/lcd/esp_lcd_st7796/esp_lcd_st7796.c +++ b/components/lcd/esp_lcd_st7796/esp_lcd_st7796.c @@ -61,7 +61,7 @@ esp_err_t esp_lcd_new_panel_st7796(const esp_lcd_panel_io_handle_t io, const esp ESP_GOTO_ON_ERROR(gpio_config(&io_conf), err, TAG, "configure GPIO for RST line failed"); } -#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 4) +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) switch (panel_dev_config->color_space) { case ESP_LCD_COLOR_SPACE_RGB: st7796->madctl_val = 0; diff --git a/components/lcd/esp_lcd_st7796/test_apps/main/test_esp_lcd_st7796.c b/components/lcd/esp_lcd_st7796/test_apps/main/test_esp_lcd_st7796.c index 8d5898ab..5e7f5acc 100644 --- a/components/lcd/esp_lcd_st7796/test_apps/main/test_esp_lcd_st7796.c +++ b/components/lcd/esp_lcd_st7796/test_apps/main/test_esp_lcd_st7796.c @@ -104,7 +104,7 @@ TEST_CASE("test st7796 to draw color bar with I80 interface", "[st7796][i80]") ESP_LOGI(TAG, "Install ST7796 panel driver"); const esp_lcd_panel_dev_config_t panel_config = { .reset_gpio_num = TEST_PIN_NUM_LCD_RST, -#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 4) +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) .color_space = ESP_LCD_COLOR_SPACE_BGR, #else .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_BGR, From bedf4d56cda92c14800de89a22ad711610c2eb55 Mon Sep 17 00:00:00 2001 From: Valeriy Kucherenko Date: Sat, 28 Oct 2023 22:07:58 +0300 Subject: [PATCH 3/3] Bump version to 1.1.1 (nice digits :-) ) --- components/lcd/esp_lcd_gc9a01/idf_component.yml | 2 +- components/lcd/esp_lcd_ili9341/idf_component.yml | 2 +- components/lcd/esp_lcd_sh1107/idf_component.yml | 2 +- components/lcd/esp_lcd_st7796/idf_component.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/lcd/esp_lcd_gc9a01/idf_component.yml b/components/lcd/esp_lcd_gc9a01/idf_component.yml index 920a5ca3..5142889e 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.1.0" +version: "1.1.1" 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_ili9341/idf_component.yml b/components/lcd/esp_lcd_ili9341/idf_component.yml index 6058e26b..7fd9f3db 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.1.0" +version: "1.1.1" 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_sh1107/idf_component.yml b/components/lcd/esp_lcd_sh1107/idf_component.yml index 0ed73bf7..8cc8a71a 100644 --- a/components/lcd/esp_lcd_sh1107/idf_component.yml +++ b/components/lcd/esp_lcd_sh1107/idf_component.yml @@ -1,4 +1,4 @@ -version: "1.1.0" +version: "1.1.1" description: ESP LCD SH1107 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd/esp_lcd_sh1107 dependencies: diff --git a/components/lcd/esp_lcd_st7796/idf_component.yml b/components/lcd/esp_lcd_st7796/idf_component.yml index 0789e403..e2c16876 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.1.0" +version: "1.1.1" targets: - esp32s2 - esp32s3