espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/wrong_return_type_v5.3' into 'release/v5.3'

Browse Source 
fix(i2c_lcd): wrong return type for esp_lcd_new_panel_io_i2c (v5.3)

See merge request espressif/esp-idf!34654
This commit is contained in:
Jiang Jiang Jian
2024-11-14 19:01:30 +08:00
parent 8b6ef89ade c0bc1046c8
commit d9cbadebdd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_lcd/include/esp_lcd_io_i2c.h
View File

@ -83,9 +83,9 @@ esp_err_t esp_lcd_new_panel_io_i2c_v2(i2c_master_bus_handle_t bus, const esp_lcd
* - ESP_ERR_NO_MEM if out of memory
* - ESP_OK on success
*/
static inline void esp_lcd_new_panel_io_i2c(uint32_t bus, const esp_lcd_panel_io_i2c_config_t *io_config, esp_lcd_panel_io_handle_t *ret_io)
static inline esp_err_t esp_lcd_new_panel_io_i2c(uint32_t bus, const esp_lcd_panel_io_i2c_config_t *io_config, esp_lcd_panel_io_handle_t *ret_io)
{
esp_lcd_new_panel_io_i2c_v1(bus, io_config, ret_io);
return esp_lcd_new_panel_io_i2c_v1(bus, io_config, ret_io);
}
/**
@ -99,9 +99,9 @@ static inline void esp_lcd_new_panel_io_i2c(uint32_t bus, const esp_lcd_panel_io
* - ESP_ERR_NO_MEM if out of memory
* - ESP_OK on success
*/
static inline void esp_lcd_new_panel_io_i2c(i2c_master_bus_handle_t bus, const esp_lcd_panel_io_i2c_config_t *io_config, esp_lcd_panel_io_handle_t *ret_io)
static inline esp_err_t esp_lcd_new_panel_io_i2c(i2c_master_bus_handle_t bus, const esp_lcd_panel_io_i2c_config_t *io_config, esp_lcd_panel_io_handle_t *ret_io)
{
esp_lcd_new_panel_io_i2c_v2(bus, io_config, ret_io);
return esp_lcd_new_panel_io_i2c_v2(bus, io_config, ret_io);
}
#else
/**