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

Merge branch 'refactor/i2c_driver_use_gpio_num_t' into 'master'

Browse Source 
refactor(i2c): use gpio_num_t to declare GPIO number

See merge request espressif/esp-idf!41061
This commit is contained in:
morris
2025-08-06 18:04:19 +08:00
parent d9241bf545 db9bee20b6
commit 949296e4bd
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/driver/i2c/i2c.c
View File

@@ -981,7 +981,7 @@ esp_err_t i2c_get_timeout(i2c_port_t i2c_num, int *timeout)
return ESP_OK; return ESP_OK;
} }
esp_err_t i2c_set_pin(i2c_port_t i2c_num, int sda_io_num, int scl_io_num, bool sda_pullup_en, bool scl_pullup_en, i2c_mode_t mode) esp_err_t i2c_set_pin(i2c_port_t i2c_num, gpio_num_t sda_io_num, gpio_num_t scl_io_num, bool sda_pullup_en, bool scl_pullup_en, i2c_mode_t mode)
{ {
ESP_RETURN_ON_FALSE((i2c_num < I2C_NUM_MAX), ESP_ERR_INVALID_ARG, I2C_TAG, I2C_NUM_ERROR_STR); ESP_RETURN_ON_FALSE((i2c_num < I2C_NUM_MAX), ESP_ERR_INVALID_ARG, I2C_TAG, I2C_NUM_ERROR_STR);
ESP_RETURN_ON_FALSE(((sda_io_num < 0) || ((GPIO_IS_VALID_OUTPUT_GPIO(sda_io_num)))), ESP_ERR_INVALID_ARG, I2C_TAG, I2C_SDA_IO_ERR_STR); ESP_RETURN_ON_FALSE(((sda_io_num < 0) || ((GPIO_IS_VALID_OUTPUT_GPIO(sda_io_num)))), ESP_ERR_INVALID_ARG, I2C_TAG, I2C_SDA_IO_ERR_STR);

7
components/driver/i2c/include/driver/i2c.h
View File

@@ -12,6 +12,7 @@
#include "esp_intr_alloc.h" // for intr_alloc_flags #include "esp_intr_alloc.h" // for intr_alloc_flags
#include "soc/soc_caps.h" #include "soc/soc_caps.h"
#include "hal/i2c_types.h" #include "hal/i2c_types.h"
#include "hal/gpio_types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -53,8 +54,8 @@ extern "C" {
*/ */
typedef struct { typedef struct {
i2c_mode_t mode; /*!< I2C mode */ i2c_mode_t mode; /*!< I2C mode */
int sda_io_num; /*!< GPIO number for I2C sda signal */ gpio_num_t sda_io_num; /*!< GPIO number for I2C sda signal */
int scl_io_num; /*!< GPIO number for I2C scl signal */ gpio_num_t scl_io_num; /*!< GPIO number for I2C scl signal */
bool sda_pullup_en; /*!< Internal GPIO pull mode for I2C sda signal*/ bool sda_pullup_en; /*!< Internal GPIO pull mode for I2C sda signal*/
bool scl_pullup_en; /*!< Internal GPIO pull mode for I2C scl signal*/ bool scl_pullup_en; /*!< Internal GPIO pull mode for I2C scl signal*/
@@ -159,7 +160,7 @@ esp_err_t i2c_reset_rx_fifo(i2c_port_t i2c_num);
* - ESP_OK Success * - ESP_OK Success
* - ESP_ERR_INVALID_ARG Parameter error * - ESP_ERR_INVALID_ARG Parameter error
*/ */
esp_err_t i2c_set_pin(i2c_port_t i2c_num, int sda_io_num, int scl_io_num, esp_err_t i2c_set_pin(i2c_port_t i2c_num, gpio_num_t sda_io_num, gpio_num_t scl_io_num,
bool sda_pullup_en, bool scl_pullup_en, i2c_mode_t mode); bool sda_pullup_en, bool scl_pullup_en, i2c_mode_t mode);
/** /**