espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02: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

22
components/driver/mcpwm.c
View File

@@ -502,15 +502,12 @@ esp_err_t mcpwm_fault_set_cyc_mode(mcpwm_unit_t mcpwm_num, mcpwm_timer_t timer_n
const int op = timer_num; const int op = timer_num;
MCPWM_TIMER_CHECK(mcpwm_num, op); MCPWM_TIMER_CHECK(mcpwm_num, op);
mcpwm_hal_context_t *hal = &context[mcpwm_num].hal; mcpwm_hal_context_t *hal = &context[mcpwm_num].hal;
mcpwm_hal_fault_conf_t fault_conf = {
.cbc_enabled_mask = BIT(fault_sig),
.ost_enabled_mask = 0,
.action_on_fault[0] = action_on_pwmxa,
.action_on_fault[1] = action_on_pwmxb,
};
mcpwm_critical_enter(mcpwm_num); mcpwm_critical_enter(mcpwm_num);
mcpwm_hal_operator_update_fault(hal, op, &fault_conf); mcpwm_ll_fault_cbc_enable_signal(hal->dev, op, fault_sig, true);
mcpwm_ll_fault_oneshot_enable_signal(hal->dev, op, fault_sig, false);
mcpwm_ll_fault_set_cyc_action(hal->dev, op, 0, action_on_pwmxa, action_on_pwmxa);
mcpwm_ll_fault_set_cyc_action(hal->dev, op, 1, action_on_pwmxb, action_on_pwmxb);
mcpwm_critical_exit(mcpwm_num); mcpwm_critical_exit(mcpwm_num);
return ESP_OK; return ESP_OK;
} }
@@ -522,16 +519,13 @@ esp_err_t mcpwm_fault_set_oneshot_mode(mcpwm_unit_t mcpwm_num, mcpwm_timer_t tim
const int op = timer_num; const int op = timer_num;
MCPWM_TIMER_CHECK(mcpwm_num, op); MCPWM_TIMER_CHECK(mcpwm_num, op);
mcpwm_hal_context_t *hal = &context[mcpwm_num].hal; mcpwm_hal_context_t *hal = &context[mcpwm_num].hal;
mcpwm_hal_fault_conf_t fault_conf = {
.cbc_enabled_mask = 0,
.ost_enabled_mask = BIT(fault_sig),
.action_on_fault[0] = action_on_pwmxa,
.action_on_fault[1] = action_on_pwmxb,
};
mcpwm_critical_enter(mcpwm_num); mcpwm_critical_enter(mcpwm_num);
mcpwm_hal_fault_oneshot_clear(hal, op); mcpwm_hal_fault_oneshot_clear(hal, op);
mcpwm_hal_operator_update_fault(hal, op, &fault_conf); mcpwm_ll_fault_cbc_enable_signal(hal->dev, op, fault_sig, false);
mcpwm_ll_fault_oneshot_enable_signal(hal->dev, op, fault_sig, true);
mcpwm_ll_fault_set_oneshot_action(hal->dev, op, 0, action_on_pwmxa, action_on_pwmxa);
mcpwm_ll_fault_set_oneshot_action(hal->dev, op, 1, action_on_pwmxb, action_on_pwmxb);
mcpwm_critical_exit(mcpwm_num); mcpwm_critical_exit(mcpwm_num);
return ESP_OK; return ESP_OK;
} }

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) { if (cap_sig == 0) {
edge = mcpwm->cap_status.cap0_edge; edge = mcpwm->cap_status.cap0_edge;
} else if (cap_sig == 1) { } else if (cap_sig == 1) {
edge = mcpwm->cap_status.cap0_edge; edge = mcpwm->cap_status.cap1_edge;
} else { //2 } else { //2
edge = mcpwm->cap_status.cap0_edge; edge = mcpwm->cap_status.cap2_edge;
} }
return (edge? MCPWM_NEG_EDGE: MCPWM_POS_EDGE); return (edge? MCPWM_NEG_EDGE: MCPWM_POS_EDGE);
} }