diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-28 08:14:13 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-28 08:14:13 +0200 |
| commit | 5fe3c49ba0e7e3f64f5b6c9b64ced675c01b14fe (patch) | |
| tree | 5f024477d370d92edacead7412f60f6757cbf082 /src/modules/multirotor_att_control/multirotor_attitude_control.h | |
| parent | e44d134c6c64535f67e26f9633206aba50a10613 (diff) | |
| parent | 66c61fbe96e11ee7099431a8370d84f862543810 (diff) | |
| download | px4-firmware-5fe3c49ba0e7e3f64f5b6c9b64ced675c01b14fe.tar.gz px4-firmware-5fe3c49ba0e7e3f64f5b6c9b64ced675c01b14fe.tar.bz2 px4-firmware-5fe3c49ba0e7e3f64f5b6c9b64ced675c01b14fe.zip | |
Merged multirotor branch
Diffstat (limited to 'src/modules/multirotor_att_control/multirotor_attitude_control.h')
| -rw-r--r-- | src/modules/multirotor_att_control/multirotor_attitude_control.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/multirotor_att_control/multirotor_attitude_control.h b/src/modules/multirotor_att_control/multirotor_attitude_control.h index e78f45c47..431a435f7 100644 --- a/src/modules/multirotor_att_control/multirotor_attitude_control.h +++ b/src/modules/multirotor_att_control/multirotor_attitude_control.h @@ -60,6 +60,6 @@ #include <uORB/topics/actuator_controls.h> void multirotor_control_attitude(const struct vehicle_attitude_setpoint_s *att_sp, - const struct vehicle_attitude_s *att, struct vehicle_rates_setpoint_s *rates_sp, bool control_yaw_position); + const struct vehicle_attitude_s *att, struct vehicle_rates_setpoint_s *rates_sp, bool control_yaw_position, bool reset_integral); #endif /* MULTIROTOR_ATTITUDE_CONTROL_H_ */ |