mirror of https://github.com/rusefi/bldc.git
Revert "Add ramp input to the speed PID loop."
This reverts commit 55dc8fd548
.
This commit is contained in:
parent
69781fc0d5
commit
9bc9239ec4
|
@ -413,8 +413,6 @@ bool confgenerator_deserialize_mcconf(const uint8_t *buffer, mc_configuration *c
|
|||
conf->s_pid_kd_filter = buffer_get_float32_auto(buffer, &ind);
|
||||
conf->s_pid_min_erpm = buffer_get_float32_auto(buffer, &ind);
|
||||
conf->s_pid_allow_braking = buffer[ind++];
|
||||
conf->s_pid_apply_input_ramp = buffer[ind++];
|
||||
conf->s_pid_ramp_erpms_ms = buffer_get_float32_auto(buffer, &ind);
|
||||
conf->s_pid_ramp_erpms_s = buffer_get_float32_auto(buffer, &ind);
|
||||
conf->p_pid_kp = buffer_get_float32_auto(buffer, &ind);
|
||||
conf->p_pid_ki = buffer_get_float32_auto(buffer, &ind);
|
||||
|
@ -705,8 +703,6 @@ void confgenerator_set_defaults_mcconf(mc_configuration *conf) {
|
|||
conf->s_pid_kd_filter = MCCONF_S_PID_KD_FILTER;
|
||||
conf->s_pid_min_erpm = MCCONF_S_PID_MIN_RPM;
|
||||
conf->s_pid_allow_braking = MCCONF_S_PID_ALLOW_BRAKING;
|
||||
conf->s_pid_apply_input_ramp = MCCONF_S_PID_APPLY_INPUT_RAMP;
|
||||
conf->s_pid_ramp_erpms_ms = MCCONF_S_PID_RAMP_ERPMS_MS;
|
||||
conf->s_pid_ramp_erpms_s = MCCONF_S_PID_RAMP_ERPMS_S;
|
||||
conf->p_pid_kp = MCCONF_P_PID_KP;
|
||||
conf->p_pid_ki = MCCONF_P_PID_KI;
|
||||
|
|
|
@ -166,7 +166,6 @@ typedef struct {
|
|||
float m_hall_dt_diff_now;
|
||||
} motor_all_state_t;
|
||||
|
||||
|
||||
// Private variables
|
||||
static volatile bool m_dccal_done = false;
|
||||
static volatile float m_last_adc_isr_duration;
|
||||
|
@ -813,6 +812,7 @@ void mcpwm_foc_set_pid_speed(float rpm) {
|
|||
}
|
||||
|
||||
motor_now()->m_control_mode = CONTROL_MODE_SPEED;
|
||||
motor_now()->m_speed_pid_set_rpm = rpm;
|
||||
|
||||
if (motor_now()->m_state != MC_STATE_RUNNING) {
|
||||
motor_now()->m_state = MC_STATE_RUNNING;
|
||||
|
|
Loading…
Reference in New Issue