aboutsummaryrefslogtreecommitdiff
path: root/src/modules/uORB
diff options
context:
space:
mode:
authorJulian Oes <julian@oes.ch>2014-06-27 14:41:38 +0200
committerJulian Oes <julian@oes.ch>2014-06-27 14:41:38 +0200
commitfaebf1751426a51068196d731eaed5699d328f0d (patch)
tree0d2f614a9fbf6069c77933c64a0e114df2628ca0 /src/modules/uORB
parentee6e0000980f2127913dfec73b1981b559f85877 (diff)
parentcc8f7f4c97de923f60f9469aa2847e6e1474d52d (diff)
downloadpx4-firmware-faebf1751426a51068196d731eaed5699d328f0d.tar.gz
px4-firmware-faebf1751426a51068196d731eaed5699d328f0d.tar.bz2
px4-firmware-faebf1751426a51068196d731eaed5699d328f0d.zip
Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge
Diffstat (limited to 'src/modules/uORB')
-rw-r--r--src/modules/uORB/topics/vehicle_attitude_setpoint.h2
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) */
};