|
|
@@ -194,7 +194,7 @@ bool mc_start(u8 mode) {
|
|
|
PMSM_FOC_SetErrCode(FOC_Param_Err);
|
|
|
return false;
|
|
|
}
|
|
|
- if (motor_encoder_get_speed() > 10.0f) {
|
|
|
+ if (motor_encoder_get_speed() > CONFIG_ZERO_SPEED_RPM) {
|
|
|
PMSM_FOC_SetErrCode(FOC_NowAllowed_With_Speed);
|
|
|
return false;
|
|
|
}
|
|
|
@@ -246,7 +246,7 @@ bool mc_stop(void) {
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- if (motor_encoder_get_speed() > 10.0f) {
|
|
|
+ if (motor_encoder_get_speed() > CONFIG_ZERO_SPEED_RPM) {
|
|
|
PMSM_FOC_SetErrCode(FOC_NowAllowed_With_Speed);
|
|
|
return false;
|
|
|
}
|
|
|
@@ -317,7 +317,7 @@ bool mc_start_epm(bool epm) {
|
|
|
PMSM_FOC_SetErrCode(FOC_NotAllowed);
|
|
|
return false;
|
|
|
}
|
|
|
- if (PMSM_FOC_GetSpeed() != 0.0f) {
|
|
|
+ if (motor_encoder_get_speed() > CONFIG_ZERO_SPEED_RPM) {
|
|
|
PMSM_FOC_SetErrCode(FOC_NowAllowed_With_Speed);
|
|
|
return false;
|
|
|
}
|
|
|
@@ -536,7 +536,7 @@ bool mc_lock_motor(bool lock) {
|
|
|
ret = false;
|
|
|
goto ml_ex_cri;
|
|
|
}
|
|
|
- if (lock && (PMSM_FOC_GetSpeed() > 10)) {
|
|
|
+ if (lock && (motor_encoder_get_speed() > CONFIG_ZERO_SPEED_RPM)) {
|
|
|
PMSM_FOC_SetErrCode(FOC_NowAllowed_With_Speed);
|
|
|
ret = false;
|
|
|
goto ml_ex_cri;
|
|
|
@@ -799,7 +799,7 @@ static void mc_autohold_process(void) {
|
|
|
mc_auto_hold(false);
|
|
|
}
|
|
|
}
|
|
|
- if (!PMSM_FOC_AutoHoldding() && motor.b_break && (encoder_get_speed() == 0.0f)) {
|
|
|
+ if (!PMSM_FOC_AutoHoldding() && motor.b_break && (motor_encoder_get_speed() < CONFIG_ZERO_SPEED_RPM)) {
|
|
|
if (motor.n_autohold_time == 0) {
|
|
|
motor.n_autohold_time = get_tick_ms();
|
|
|
}else {
|