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

Merge branch 'bugfix/mcpwm_can_set_two_falut_signal' into 'master'

Browse Source 
mcpwm: fix second fault line broken issue

Closes IDFGH-4194

See merge request espressif/esp-idf!12119
This commit is contained in:
Michael (XIAO Xufeng)
2021-01-27 11:36:30 +08:00
parent 1d52a0a459 d4b9198f05
commit da4b4fc565
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/hal/esp32/include/hal/mcpwm_ll.h
View File

@@ -684,9 +684,9 @@ static inline mcpwm_capture_on_edge_t mcpwm_ll_get_captured_edge(mcpwm_dev_t *mc
if (cap_sig == 0) {
edge = mcpwm->cap_status.cap0_edge;
} else if (cap_sig == 1) {
edge = mcpwm->cap_status.cap0_edge;
edge = mcpwm->cap_status.cap1_edge;
} else { //2
edge = mcpwm->cap_status.cap0_edge;
edge = mcpwm->cap_status.cap2_edge;
}
return (edge? MCPWM_NEG_EDGE: MCPWM_POS_EDGE);
}