diff --git a/src/modules/fw_pos_control/FixedwingPositionControl.cpp b/src/modules/fw_pos_control/FixedwingPositionControl.cpp index 4b0a391fc5bc..b9dc214f3412 100644 --- a/src/modules/fw_pos_control/FixedwingPositionControl.cpp +++ b/src/modules/fw_pos_control/FixedwingPositionControl.cpp @@ -129,8 +129,8 @@ FixedwingPositionControl::parameters_update() _tecs.set_speed_weight(_param_fw_t_spdweight.get()); _tecs.set_equivalent_airspeed_trim(_performance_model.getCalibratedTrimAirspeed()); _tecs.set_equivalent_airspeed_min(_performance_model.getMinimumCalibratedAirspeed()); - _tecs.set_throttle_damp(_param_fw_t_thr_damp.get()); - _tecs.set_integrator_gain_throttle(_param_fw_t_I_gain_thr.get()); + _tecs.set_throttle_damp(_param_fw_t_thr_damping.get()); + _tecs.set_integrator_gain_throttle(_param_fw_t_thr_integ.get()); _tecs.set_integrator_gain_pitch(_param_fw_t_I_gain_pit.get()); _tecs.set_throttle_slewrate(_param_fw_thr_slew_max.get()); _tecs.set_vertical_accel_limit(_param_fw_t_vert_acc.get()); diff --git a/src/modules/fw_pos_control/FixedwingPositionControl.hpp b/src/modules/fw_pos_control/FixedwingPositionControl.hpp index 9f672ef2eeec..751904590b53 100644 --- a/src/modules/fw_pos_control/FixedwingPositionControl.hpp +++ b/src/modules/fw_pos_control/FixedwingPositionControl.hpp @@ -934,14 +934,14 @@ class FixedwingPositionControl final : public ModuleBase) _param_fw_t_hrate_ff, (ParamFloat) _param_fw_t_h_error_tc, - (ParamFloat) _param_fw_t_I_gain_thr, + (ParamFloat) _param_fw_t_thr_integ, (ParamFloat) _param_fw_t_I_gain_pit, (ParamFloat) _param_fw_t_ptch_damp, (ParamFloat) _param_fw_t_rll2thr, (ParamFloat) _param_fw_t_sink_max, (ParamFloat) _param_fw_t_spdweight, (ParamFloat) _param_fw_t_tas_error_tc, - (ParamFloat) _param_fw_t_thr_damp, + (ParamFloat) _param_fw_t_thr_damping, (ParamFloat) _param_fw_t_vert_acc, (ParamFloat) _param_ste_rate_time_const, (ParamFloat) _param_seb_rate_ff, diff --git a/src/modules/fw_pos_control/fw_path_navigation_params.c b/src/modules/fw_pos_control/fw_path_navigation_params.c index 07518de71087..a636d8d75768 100644 --- a/src/modules/fw_pos_control/fw_path_navigation_params.c +++ b/src/modules/fw_pos_control/fw_path_navigation_params.c @@ -465,38 +465,34 @@ PARAM_DEFINE_FLOAT(FW_T_SINK_MAX, 5.0f); * Increase to add damping to correct for oscillations in speed and height. * * @min 0.0 - * @max 2.0 - * @decimal 2 - * @increment 0.1 + * @max 1.0 + * @decimal 3 + * @increment 0.01 * @group FW TECS */ -PARAM_DEFINE_FLOAT(FW_T_THR_DAMP, 0.1f); +PARAM_DEFINE_FLOAT(FW_T_THR_DAMPING, 0.05f); /** * Integrator gain throttle * - * This is the integrator gain on the throttle part of the control loop. - * Increasing this gain increases the speed at which speed - * and height offsets are trimmed out, but reduces damping and - * increases overshoot. Set this value to zero to completely - * disable all integrator action. + * Integrator gain on the throttle part of the control loop. + * Increase it to trim out speed and height offsets faster, + * with the downside of possible overshoots and oscillations. * * @min 0.0 - * @max 2.0 - * @decimal 2 - * @increment 0.05 + * @max 1.0 + * @decimal 3 + * @increment 0.005 * @group FW TECS */ -PARAM_DEFINE_FLOAT(FW_T_I_GAIN_THR, 0.05f); +PARAM_DEFINE_FLOAT(FW_T_THR_INTEG, 0.02f); /** * Integrator gain pitch * - * This is the integrator gain on the pitch part of the control loop. - * Increasing this gain increases the speed at which speed - * and height offsets are trimmed out, but reduces damping and - * increases overshoot. Set this value to zero to completely - * disable all integrator action. + * Integrator gain on the pitch part of the control loop. + * Increase it to trim out speed and height offsets faster, + * with the downside of possible overshoots and oscillations. * * @min 0.0 * @max 2.0