|
@@ -770,10 +770,18 @@ void PMSM_FOC_idqCalc(void) {
|
|
|
#else
|
|
#else
|
|
|
if (maxSpeed >= 0) {
|
|
if (maxSpeed >= 0) {
|
|
|
gFoc_Ctrl.pi_vel.max = eRamp_get_intepolation(&gFoc_Ctrl.rtLim.torqueLimRamp);
|
|
gFoc_Ctrl.pi_vel.max = eRamp_get_intepolation(&gFoc_Ctrl.rtLim.torqueLimRamp);
|
|
|
|
|
+#ifdef CONFIG_SERVO_MOTOR
|
|
|
|
|
+ gFoc_Ctrl.pi_vel.min = -eRamp_get_intepolation(&gFoc_Ctrl.rtLim.torqueLimRamp);
|
|
|
|
|
+#else
|
|
|
gFoc_Ctrl.pi_vel.min = -CONFIG_MAX_NEG_TORQUE;
|
|
gFoc_Ctrl.pi_vel.min = -CONFIG_MAX_NEG_TORQUE;
|
|
|
|
|
+#endif
|
|
|
}else if (maxSpeed < 0) {
|
|
}else if (maxSpeed < 0) {
|
|
|
gFoc_Ctrl.pi_vel.min = -eRamp_get_intepolation(&gFoc_Ctrl.rtLim.torqueLimRamp);
|
|
gFoc_Ctrl.pi_vel.min = -eRamp_get_intepolation(&gFoc_Ctrl.rtLim.torqueLimRamp);
|
|
|
|
|
+#ifdef CONFIG_SERVO_MOTOR
|
|
|
|
|
+ gFoc_Ctrl.pi_vel.max = eRamp_get_intepolation(&gFoc_Ctrl.rtLim.torqueLimRamp);
|
|
|
|
|
+#else
|
|
|
gFoc_Ctrl.pi_vel.max = CONFIG_MAX_NEG_TORQUE;
|
|
gFoc_Ctrl.pi_vel.max = CONFIG_MAX_NEG_TORQUE;
|
|
|
|
|
+#endif
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if ((maxSpeed == 0) && (gFoc_Ctrl.in.s_motVelocity < CONFIG_MIN_RPM_EXIT_EBRAKE)) {
|
|
if ((maxSpeed == 0) && (gFoc_Ctrl.in.s_motVelocity < CONFIG_MIN_RPM_EXIT_EBRAKE)) {
|