Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for https://github.com/espressif/esp-bsp/issues/240 (BSP-412) #243

Closed
wants to merge 3 commits into from
Closed

Fix for https://github.com/espressif/esp-bsp/issues/240 (BSP-412) #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13f6d90
Fix compilation error on ESP-IDF 5.0.4 (error: unknown type name 'adc…
valkuc Oct 28, 2023
7ca06b2
Fix compilation on ESP IDF 5.0.4
valkuc Oct 28, 2023
bedf4d5
Bump version to 1.1.1 (nice digits :-) )
valkuc Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bsp/esp32_s3_korvo_2/esp32_s3_korvo_2_idf5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_gc9a01/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_gc9a01/esp_lcd_gc9a01.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_gc9a01/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_gc9a01/test_apps/main/test_esp_lcd_gc9a01.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_ili9341/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_ili9341/esp_lcd_ili9341.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_ili9341/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_ili9341/test_apps/main/test_esp_lcd_ili9341.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_sh1107/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_st7796/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_st7796/esp_lcd_st7796.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_st7796/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "1.1.0"
version: "1.1.1"
targets:
- esp32s2
- esp32s3
Expand Down
2 changes: 1 addition & 1 deletion components/lcd/esp_lcd_st7796/test_apps/main/test_esp_lcd_st7796.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down