feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'refactor/gpio_reset_pin' into 'master'

Browse Source 
refactor(gpio): simplified gpio_reset_pin function to not call gpio_configure

Closes IDFGH-14846 and IDFGH-14880

See merge request espressif/esp-idf!37814
This commit is contained in:
Song Ruo Jing
2025-03-26 16:56:27 +08:00
parent 465ff85d2b cbf7a66030
commit f3625b0fb0
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/esp_driver_gpio/include/driver/gpio.h
View File

@@ -71,15 +71,13 @@ typedef struct {
esp_err_t gpio_config(const gpio_config_t *pGPIOConfig); esp_err_t gpio_config(const gpio_config_t *pGPIOConfig);
/** /**
* @brief Reset an gpio to default state (select gpio function, enable pullup and disable input and output). * @brief Reset a GPIO to a certain state (select gpio function, enable pullup and disable input and output).
* *
* @param gpio_num GPIO number. * @param gpio_num GPIO number.
* *
* @note This function also configures the IOMUX for this pin to the GPIO * @return
* function, and disconnects any other peripheral output configured via GPIO * - ESP_OK Success
* Matrix. * - ESP_ERR_INVALID_ARG Parameter error
*
* @return Always return ESP_OK.
*/ */
esp_err_t gpio_reset_pin(gpio_num_t gpio_num); esp_err_t gpio_reset_pin(gpio_num_t gpio_num);

4
components/esp_driver_gpio/include/esp_private/gpio.h
View File

@@ -83,7 +83,7 @@ esp_err_t gpio_output_disable(gpio_num_t gpio_num);
* - ESP_OK Success * - ESP_OK Success
* - ESP_ERR_INVALID_ARG GPIO number error * - ESP_ERR_INVALID_ARG GPIO number error
*/ */
esp_err_t gpio_od_disable(gpio_num_t gpio_num); esp_err_t gpio_od_enable(gpio_num_t gpio_num);
/** /**
* @brief Disable open-drain for an IO * @brief Disable open-drain for an IO
@@ -94,7 +94,7 @@ esp_err_t gpio_od_disable(gpio_num_t gpio_num);
* - ESP_OK Success * - ESP_OK Success
* - ESP_ERR_INVALID_ARG GPIO number error * - ESP_ERR_INVALID_ARG GPIO number error
*/ */
esp_err_t gpio_od_enable(gpio_num_t gpio_num); esp_err_t gpio_od_disable(gpio_num_t gpio_num);
/** /**
* @brief Configure the pin to be used for analog purpose (such as ADC, touch, etc.) * @brief Configure the pin to be used for analog purpose (such as ADC, touch, etc.)

26
components/esp_driver_gpio/src/gpio.c
View File

@@ -401,7 +401,7 @@ esp_err_t gpio_config(const gpio_config_t *pGPIOConfig)
gpio_pulldown_dis(io_num); gpio_pulldown_dis(io_num);
} }
ESP_LOGI(GPIO_TAG, "GPIO[%"PRIu32"]| InputEn: %d| OutputEn: %d| OpenDrain: %d| Pullup: %d| Pulldown: %d| Intr:%d ", io_num, input_en, output_en, od_en, pu_en, pd_en, pGPIOConfig->intr_type); ESP_LOGD(GPIO_TAG, "GPIO[%"PRIu32"]| InputEn: %d| OutputEn: %d| OpenDrain: %d| Pullup: %d| Pulldown: %d| Intr:%d ", io_num, input_en, output_en, od_en, pu_en, pd_en, pGPIOConfig->intr_type);
gpio_set_intr_type(io_num, pGPIOConfig->intr_type); gpio_set_intr_type(io_num, pGPIOConfig->intr_type);
if (pGPIOConfig->intr_type) { if (pGPIOConfig->intr_type) {
@@ -455,16 +455,20 @@ esp_err_t gpio_config_as_analog(gpio_num_t gpio_num)
esp_err_t gpio_reset_pin(gpio_num_t gpio_num) esp_err_t gpio_reset_pin(gpio_num_t gpio_num)
{ {
assert(GPIO_IS_VALID_GPIO(gpio_num)); GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
gpio_config_t cfg = { gpio_intr_disable(gpio_num);
.pin_bit_mask = BIT64(gpio_num), // for powersave reasons, the GPIO should not be floating, select pullup
.mode = GPIO_MODE_DISABLE, gpio_pullup_en(gpio_num);
//for powersave reasons, the GPIO should not be floating, select pullup gpio_pulldown_dis(gpio_num);
.pull_up_en = true, gpio_input_disable(gpio_num);
.pull_down_en = false, gpio_output_disable(gpio_num);
.intr_type = GPIO_INTR_DISABLE, #if SOC_RTCIO_PIN_COUNT > 0
}; if (rtc_gpio_is_valid_gpio(gpio_num)) {
gpio_config(&cfg); rtc_gpio_deinit(gpio_num);
}
#endif
gpio_hal_func_sel(gpio_context.gpio_hal, gpio_num, PIN_FUNC_GPIO);
esp_gpio_revoke(BIT64(gpio_num));
return ESP_OK; return ESP_OK;
} }