diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2013-08-19 08:43:16 +0200 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2013-08-19 08:43:16 +0200 |
commit | 3370ceceaf706dda0856888b09c1086e8bf79c8d (patch) | |
tree | 7a273bfa22e722ee150719560d653452320c839e /src/modules/uORB/topics/vehicle_control_mode.h | |
parent | ffc2a8b7a358a2003e5ed548c41878b33e7aa726 (diff) | |
download | px4-firmware-3370ceceaf706dda0856888b09c1086e8bf79c8d.tar.gz px4-firmware-3370ceceaf706dda0856888b09c1086e8bf79c8d.tar.bz2 px4-firmware-3370ceceaf706dda0856888b09c1086e8bf79c8d.zip |
vehicle_control_mode.flag_armed added, reset integrals in multirotor_att_control when disarmed
Diffstat (limited to 'src/modules/uORB/topics/vehicle_control_mode.h')
-rw-r--r-- | src/modules/uORB/topics/vehicle_control_mode.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/vehicle_control_mode.h b/src/modules/uORB/topics/vehicle_control_mode.h index fe169c6e6..67aeac372 100644 --- a/src/modules/uORB/topics/vehicle_control_mode.h +++ b/src/modules/uORB/topics/vehicle_control_mode.h @@ -64,6 +64,8 @@ struct vehicle_control_mode_s uint16_t counter; /**< incremented by the writing thread everytime new data is stored */ uint64_t timestamp; /**< in microseconds since system start, is set whenever the writing thread stores new data */ + bool flag_armed; + bool flag_external_manual_override_ok; /**< external override non-fatal for system. Only true for fixed wing */ // XXX needs yet to be set by state machine helper |