diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-27 14:39:36 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-27 14:39:36 +0200 |
| commit | cc8f7f4c97de923f60f9469aa2847e6e1474d52d (patch) | |
| tree | 4a5895a4421fbd66a2159de08c3ad70506b55051 /src/modules/uORB | |
| parent | 3aab37e0e04ce98ddacd99e238e626ab5c3d4445 (diff) | |
| parent | f3a77705a701a92ae510e18280136b3b7f204b3e (diff) | |
| download | px4-firmware-cc8f7f4c97de923f60f9469aa2847e6e1474d52d.tar.gz px4-firmware-cc8f7f4c97de923f60f9469aa2847e6e1474d52d.tar.bz2 px4-firmware-cc8f7f4c97de923f60f9469aa2847e6e1474d52d.zip | |
Merge branch 'master' into navigator_rewrite
Conflicts:
src/modules/commander/commander.cpp
src/modules/commander/state_machine_helper.h
src/modules/mavlink/mavlink_messages.cpp
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_attitude_setpoint.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/vehicle_attitude_setpoint.h b/src/modules/uORB/topics/vehicle_attitude_setpoint.h index d526a8ff2..8446e9c6e 100644 --- a/src/modules/uORB/topics/vehicle_attitude_setpoint.h +++ b/src/modules/uORB/topics/vehicle_attitude_setpoint.h @@ -72,6 +72,8 @@ struct vehicle_attitude_setpoint_s { float thrust; /**< Thrust in Newton the power system should generate */ bool roll_reset_integral; /**< Reset roll integral part (navigation logic change) */ + bool pitch_reset_integral; /**< Reset pitch integral part (navigation logic change) */ + bool yaw_reset_integral; /**< Reset yaw integral part (navigation logic change) */ }; |