mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-10 04:43:33 +00:00
fix(i2c_lcd): using function overloading to keep esp_lcd_new_panel_io_i2c
becuase _Generic is not available in C++ Closes https://github.com/espressif/esp-idf/issues/14037
This commit is contained in:
@@ -67,6 +67,43 @@ esp_err_t esp_lcd_new_panel_io_i2c_v1(uint32_t bus, const esp_lcd_panel_io_i2c_c
|
||||
*/
|
||||
esp_err_t esp_lcd_new_panel_io_i2c_v2(i2c_master_bus_handle_t bus, const esp_lcd_panel_io_i2c_config_t *io_config, esp_lcd_panel_io_handle_t *ret_io);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
/**
|
||||
* @brief Create LCD panel IO handle
|
||||
*
|
||||
* @param[in] bus I2C bus ID, indicates which I2C port to use
|
||||
* @param[in] io_config IO configuration, for I2C interface
|
||||
* @param[out] ret_io Returned IO handle
|
||||
* @return
|
||||
* - ESP_ERR_INVALID_ARG if parameter is invalid
|
||||
* - 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)
|
||||
{
|
||||
esp_lcd_new_panel_io_i2c_v1(bus, io_config, ret_io);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Create LCD panel IO handle
|
||||
*
|
||||
* @param[in] bus I2C bus handle, returned from `i2c_new_master_bus`
|
||||
* @param[in] io_config IO configuration, for I2C interface
|
||||
* @param[out] ret_io Returned IO handle
|
||||
* @return
|
||||
* - ESP_ERR_INVALID_ARG if parameter is invalid
|
||||
* - 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)
|
||||
{
|
||||
esp_lcd_new_panel_io_i2c_v2(bus, io_config, ret_io);
|
||||
}
|
||||
#else
|
||||
/**
|
||||
* @brief Create LCD panel IO handle
|
||||
*
|
||||
@@ -80,8 +117,6 @@ esp_err_t esp_lcd_new_panel_io_i2c_v2(i2c_master_bus_handle_t bus, const esp_lcd
|
||||
*/
|
||||
#define esp_lcd_new_panel_io_i2c(bus, io_config, ret_io) _Generic((bus), \
|
||||
i2c_master_bus_handle_t : esp_lcd_new_panel_io_i2c_v2, \
|
||||
default : esp_lcd_new_panel_io_i2c_v1) (bus, io_config, ret_io) \
|
||||
default : esp_lcd_new_panel_io_i2c_v1) (bus, io_config, ret_io)
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user