mirror of https://github.com/rusefi/bldc.git
Cleanup
This commit is contained in:
parent
9a00234346
commit
3d57ed2f06
14
mcpwm_foc.c
14
mcpwm_foc.c
|
@ -3626,10 +3626,13 @@ static void control_current(volatile motor_all_state_t *motor, float dt) {
|
|||
float dec_bemf = 0.0;
|
||||
|
||||
if (motor->m_control_mode < CONTROL_MODE_HANDBRAKE && conf_now->foc_cc_decoupling != FOC_CC_DECOUPLING_DISABLED) {
|
||||
float lq = conf_now->foc_motor_l + conf_now->foc_motor_ld_lq_diff / 2.0;
|
||||
float ld = conf_now->foc_motor_l - conf_now->foc_motor_ld_lq_diff / 2.0;
|
||||
|
||||
switch (conf_now->foc_cc_decoupling) {
|
||||
case FOC_CC_DECOUPLING_CROSS:
|
||||
dec_vd = state_m->iq_filter * state_m->speed_rad_s * conf_now->foc_motor_l * (3.0 / 2.0);
|
||||
dec_vq = state_m->id_filter * state_m->speed_rad_s * conf_now->foc_motor_l * (3.0 / 2.0);
|
||||
dec_vd = state_m->iq_filter * state_m->speed_rad_s * lq * (3.0 / 2.0);
|
||||
dec_vq = state_m->id_filter * state_m->speed_rad_s * ld * (3.0 / 2.0);
|
||||
break;
|
||||
|
||||
case FOC_CC_DECOUPLING_BEMF:
|
||||
|
@ -3637,15 +3640,8 @@ static void control_current(volatile motor_all_state_t *motor, float dt) {
|
|||
break;
|
||||
|
||||
case FOC_CC_DECOUPLING_CROSS_BEMF:
|
||||
if(conf_now->foc_motor_ld_lq_diff > 0.0){
|
||||
float lq = conf_now->foc_motor_l + conf_now->foc_motor_ld_lq_diff /2;
|
||||
float ld = conf_now->foc_motor_l - conf_now->foc_motor_ld_lq_diff /2;
|
||||
dec_vd = state_m->iq_filter * state_m->speed_rad_s * lq * (3.0 / 2.0);
|
||||
dec_vq = state_m->id_filter * state_m->speed_rad_s * ld * (3.0 / 2.0);
|
||||
}else{
|
||||
dec_vd = state_m->iq_filter * state_m->speed_rad_s * conf_now->foc_motor_l * (3.0 / 2.0);
|
||||
dec_vq = state_m->id_filter * state_m->speed_rad_s * conf_now->foc_motor_l * (3.0 / 2.0);
|
||||
}
|
||||
dec_bemf = state_m->speed_rad_s * conf_now->foc_motor_flux_linkage;
|
||||
break;
|
||||
|
||||
|
|
Loading…
Reference in New Issue