fix initialization of attitude controllers

This commit is contained in:
Thomas Gubler
2013-11-03 22:04:32 +01:00
parent 4db049144f
commit 89b8acd7a8
4 changed files with 22 additions and 8 deletions
@@ -49,10 +49,19 @@
ECL_PitchController::ECL_PitchController() : ECL_PitchController::ECL_PitchController() :
_last_run(0), _last_run(0),
_tc(0.1f),
_k_p(0.0f),
_k_i(0.0f),
_k_d(0.0f),
_integrator_max(0.0f),
_max_rate_pos(0.0f),
_max_rate_neg(0.0f),
_roll_ff(0.0f),
_last_output(0.0f), _last_output(0.0f),
_integrator(0.0f), _integrator(0.0f),
_rate_error(0.0f), _rate_error(0.0f),
_rate_setpoint(0.0f) _rate_setpoint(0.0f),
_bodyrate_setpoint(0.0f)
{ {
} }
@@ -50,13 +50,17 @@
ECL_RollController::ECL_RollController() : ECL_RollController::ECL_RollController() :
_last_run(0), _last_run(0),
_tc(0.1f), _tc(0.1f),
_k_p(0.0f),
_k_i(0.0f),
_k_d(0.0f),
_integrator_max(0.0f),
_max_rate(0.0f),
_last_output(0.0f), _last_output(0.0f),
_integrator(0.0f), _integrator(0.0f),
_rate_error(0.0f), _rate_error(0.0f),
_rate_setpoint(0.0f), _rate_setpoint(0.0f),
_bodyrate_setpoint(0.0f) _bodyrate_setpoint(0.0f)
{ {
} }
float ECL_RollController::control_attitude(float roll_setpoint, float roll) float ECL_RollController::control_attitude(float roll_setpoint, float roll)
@@ -48,16 +48,19 @@
ECL_YawController::ECL_YawController() : ECL_YawController::ECL_YawController() :
_last_run(0), _last_run(0),
_tc(0.1f), _k_p(0.0f),
_k_i(0.0f),
_k_d(0.0f),
_integrator_max(0.0f),
_max_rate(0.0f),
_roll_ff(0.0f),
_last_output(0.0f), _last_output(0.0f),
_integrator(0.0f), _integrator(0.0f),
_rate_error(0.0f), _rate_error(0.0f),
_rate_setpoint(0.0f), _rate_setpoint(0.0f),
_bodyrate_setpoint(0.0f), _bodyrate_setpoint(0.0f),
_coordinated(1.0f) _coordinated(0.0f)
{ {
} }
float ECL_YawController::control_attitude(float roll, float pitch, float ECL_YawController::control_attitude(float roll, float pitch,
@@ -104,8 +104,6 @@ public:
private: private:
uint64_t _last_run; uint64_t _last_run;
float _tc;
float _k_p; float _k_p;
float _k_i; float _k_i;
float _k_d; float _k_d;