diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-07 13:50:38 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-07 13:50:38 +0200 |
commit | 056fe1c0b93094e86fa80de4102b12f2d406de5a (patch) | |
tree | bd93d3bf16fe93cd73deccc911a467f49cdf4969 /src/lib/ecl/attitude_fw/ecl_roll_controller.h | |
parent | 8398de7515671b52df19a032162ff2064d68772a (diff) | |
download | px4-firmware-056fe1c0b93094e86fa80de4102b12f2d406de5a.tar.gz px4-firmware-056fe1c0b93094e86fa80de4102b12f2d406de5a.tar.bz2 px4-firmware-056fe1c0b93094e86fa80de4102b12f2d406de5a.zip |
WIP
Diffstat (limited to 'src/lib/ecl/attitude_fw/ecl_roll_controller.h')
-rw-r--r-- | src/lib/ecl/attitude_fw/ecl_roll_controller.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/ecl/attitude_fw/ecl_roll_controller.h b/src/lib/ecl/attitude_fw/ecl_roll_controller.h index bba9ae163..011820765 100644 --- a/src/lib/ecl/attitude_fw/ecl_roll_controller.h +++ b/src/lib/ecl/attitude_fw/ecl_roll_controller.h @@ -49,7 +49,7 @@ public: ECL_RollController(); float control(float roll_setpoint, float roll, float roll_rate, - float scaler = 1.0f, bool lock_integrator = false, float airspeed_min = 0.0f, float airspeed_max = 0.0f, float aspeed = (0.0f / 0.0f)); + float scaler = 1.0f, bool lock_integrator = false, float airspeed_min = 0.0f, float airspeed_max = 0.0f, float airspeed = (0.0f / 0.0f)); void reset_integrator(); @@ -93,7 +93,8 @@ private: float _last_output; float _integrator; float _rate_error; - float _desired_rate; + float _rate_setpoint; + float _max_deflection_rad; }; #endif // ECL_ROLL_CONTROLLER_H |