Merge branch 'bugfix/fix_gpio_wake_up_disable_invalid_for_rtc_io_v3.3' into 'release/v3.3'

bugfix (GPIO): fixed gpio_wake_up_disable not working for RTC IO (release/3.3)

See merge request espressif/esp-idf!7997
This commit is contained in:
Michael (XIAO Xufeng) 2020-06-02 11:16:59 +08:00
commit 13154fe5c6

View file

@ -491,8 +491,13 @@ esp_err_t gpio_wakeup_enable(gpio_num_t gpio_num, gpio_int_type_t intr_type)
esp_err_t gpio_wakeup_disable(gpio_num_t gpio_num)
{
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
GPIO.pin[gpio_num].wakeup_enable = 0;
return ESP_OK;
esp_err_t ret = ESP_OK;
if (RTC_GPIO_IS_VALID_GPIO(gpio_num)) {
ret = rtc_gpio_wakeup_disable(gpio_num);
} else {
GPIO.pin[gpio_num].wakeup_enable = 0;
}
return ret;
}
esp_err_t gpio_set_drive_capability(gpio_num_t gpio_num, gpio_drive_cap_t strength)