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

fix(gpio): add esp_gpio_reserve check to gpio_config

Browse Source
This commit is contained in:
Song Ruo Jing
2026-02-26 16:26:58 +08:00
parent e5ff2747aa
commit 476004e4b8
28 changed files with 278 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_gpio/test_apps/gpio/main/test_gpio.c
+8 -22
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -50,6 +50,7 @@ static volatile int edge_intr_times = 0; // use this to get how many times the
static gpio_config_t test_init_io(gpio_num_t num)
{
TEST_ASSERT(GPIO_IS_VALID_OUTPUT_GPIO(num));
TEST_ESP_OK(gpio_reset_pin(num));
gpio_config_t io_conf = {
.intr_type = GPIO_INTR_DISABLE,
.mode = GPIO_MODE_OUTPUT,
@@ -808,13 +809,8 @@ TEST_CASE("GPIO_input_and_output_of_USB_pins_test", "[gpio]")
for (int i = 0; i < sizeof(test_pins) / sizeof(int); i++) {
int pin = test_pins[i];
gpio_config_t io_conf = {
.intr_type = GPIO_INTR_DISABLE,
.mode = GPIO_MODE_INPUT_OUTPUT,
.pin_bit_mask = BIT64(pin),
.pull_down_en = GPIO_PULLDOWN_DISABLE,
.pull_up_en = GPIO_PULLUP_DISABLE,
};
gpio_config_t io_conf = test_init_io(pin);
io_conf.mode = GPIO_MODE_INPUT_OUTPUT;
gpio_config(&io_conf);
// test pin
@@ -893,13 +889,8 @@ static void gpio_deep_sleep_hold_test_first_stage(void)
TEST_ESP_OK(esp_sleep_enable_timer_wakeup(2000000));
gpio_config_t io_conf = {
.intr_type = GPIO_INTR_DISABLE,
.mode = GPIO_MODE_INPUT_OUTPUT,
.pin_bit_mask = (1ULL << io_num),
.pull_down_en = GPIO_PULLDOWN_DISABLE,
.pull_up_en = GPIO_PULLUP_DISABLE,
};
gpio_config_t io_conf = test_init_io(io_num);
io_conf.mode = GPIO_MODE_INPUT_OUTPUT;
TEST_ESP_OK(gpio_config(&io_conf));
const bool initial_level = gpio_get_level(io_num);
@@ -938,13 +929,8 @@ static void gpio_deep_sleep_hold_test_second_stage(void)
#endif
TEST_ESP_OK(gpio_hold_dis(io_num));
gpio_config_t io_conf = {
.intr_type = GPIO_INTR_DISABLE,
.mode = GPIO_MODE_INPUT_OUTPUT,
.pin_bit_mask = (1ULL << io_num),
.pull_down_en = GPIO_PULLDOWN_DISABLE,
.pull_up_en = GPIO_PULLUP_DISABLE,
};
gpio_config_t io_conf = test_init_io(io_num);
io_conf.mode = GPIO_MODE_INPUT_OUTPUT;
TEST_ESP_OK(gpio_config(&io_conf));
#if !CONFIG_ESP32P4_SELECTS_REV_LESS_V3 // DIG-399
components/esp_driver_gpio/test_apps/gpio/main/test_rtcio.c
+1
View File
@@ -290,6 +290,7 @@ static void rtcio_deep_sleep_hold_test_first_stage(void)
TEST_ESP_OK(esp_sleep_enable_timer_wakeup(2000000));
gpio_reset_pin(io_num);
gpio_config_t io_conf = {
.intr_type = GPIO_INTR_DISABLE,
.mode = GPIO_MODE_INPUT_OUTPUT,
components/esp_driver_gpio/test_apps/gpio_extensions/main/test_gpio_etm.c
+8 -1
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -89,6 +89,9 @@ TEST_CASE("gpio_etm_self_trigger", "[gpio_etm]")
TEST_ESP_OK(esp_etm_del_task(gpio_task));
TEST_ESP_OK(esp_etm_del_event(gpio_event));
TEST_ESP_OK(esp_etm_del_channel(etm_channel_a));
TEST_ESP_OK(gpio_reset_pin(output_gpio));
TEST_ESP_OK(gpio_reset_pin(input_gpio));
}
TEST_CASE("gpio_etm_self_trigger_multi_action", "[gpio_etm]")
@@ -204,4 +207,8 @@ TEST_CASE("gpio_etm_self_trigger_multi_action", "[gpio_etm]")
TEST_ESP_OK(esp_etm_del_event(gpio_event_b));
TEST_ESP_OK(esp_etm_del_channel(etm_channel_a));
TEST_ESP_OK(esp_etm_del_channel(etm_channel_b));
TEST_ESP_OK(gpio_reset_pin(output_gpio));
TEST_ESP_OK(gpio_reset_pin(input_gpio1));
TEST_ESP_OK(gpio_reset_pin(input_gpio2));
}
components/esp_driver_gpio/test_apps/gpio_extensions/main/test_gpio_filter.c
+1
View File
@@ -180,6 +180,7 @@ TEST_CASE("GPIO flex glitch filter enable/disable", "[gpio_filter]")
TEST_ESP_OK(gpio_del_glitch_filter(filter));
TEST_ESP_OK(dedic_gpio_del_bundle(bundle));
vSemaphoreDelete(sem);
TEST_ESP_OK(gpio_reset_pin(test_gpio));
}
#endif // SOC_HAS(DEDICATED_GPIO)
components/esp_driver_gpio/test_apps/gpio_extensions/main/test_hysteresis.c
+2
View File
@@ -69,6 +69,8 @@ TEST_CASE("GPIO Input hysteresis filter", "[gpio_filter][timeout=50][ignore]")
gpio_isr_handler_remove(TEST_GPIO_HYS_IO);
gpio_uninstall_isr_service();
TEST_ESP_OK(gpio_reset_pin(TEST_GPIO_HYS_IO));
TEST_ESP_OK(gpio_reset_pin(TEST_GPIO_WAVE_IO));
// should shot ISR exactly 10 times
TEST_ASSERT_UINT32_WITHIN(1, 10, intr_cnt);
}