blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 17:49:10 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/mcpwm_reset_generator_gpio_v5.1' into 'release/v5.1'

Browse Source 
fix(mcpwm): reset GPIO used by generator after delete (v5.1)

See merge request espressif/esp-idf!28832
This commit is contained in:
morris 2024-02-28 11:39:02 +08:00
commit 6e44d4ebfc
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/driver/Kconfig
View File

@ -397,7 +397,7 @@ menu "Driver Configurations"
Enabling this option can improve driver performance as well. Enabling this option can improve driver performance as well.
config MCPWM_SUPPRESS_DEPRECATE_WARN config MCPWM_SUPPRESS_DEPRECATE_WARN
bool "Suppress leagcy driver deprecated warning" bool "Suppress legacy driver deprecated warning"
default n default n
help help
Wether to suppress the deprecation warnings when using legacy MCPWM driver (driver/mcpwm.h). Wether to suppress the deprecation warnings when using legacy MCPWM driver (driver/mcpwm.h).

4
components/driver/mcpwm/mcpwm_gen.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -118,6 +118,8 @@ esp_err_t mcpwm_del_generator(mcpwm_gen_handle_t gen)
mcpwm_group_t *group = oper->group; mcpwm_group_t *group = oper->group;
ESP_LOGD(TAG, "del generator (%d,%d,%d)", group->group_id, oper->oper_id, gen->gen_id); ESP_LOGD(TAG, "del generator (%d,%d,%d)", group->group_id, oper->oper_id, gen->gen_id);
// reset GPIO
gpio_reset_pin(gen->gen_gpio_num);
// recycle memory resource // recycle memory resource
ESP_RETURN_ON_ERROR(mcpwm_generator_destroy(gen), TAG, "destroy generator failed"); ESP_RETURN_ON_ERROR(mcpwm_generator_destroy(gen), TAG, "destroy generator failed");
return ESP_OK; return ESP_OK;