diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-20 18:18:39 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-20 18:18:39 +0200 |
| commit | 4e08457afec89e41bb14fb09293c885f988bfd0c (patch) | |
| tree | 9ad5c352c75efcdabc4a0f3c9c6325cbda5f074a /src/modules/uORB/topics/vehicle_control_mode.h | |
| parent | e0c78e51e3a5768014c73bed5cd087830d602227 (diff) | |
| parent | 9d18da4433773cfa02bec1d33fdb34e4d03d1442 (diff) | |
| download | px4-firmware-4e08457afec89e41bb14fb09293c885f988bfd0c.tar.gz px4-firmware-4e08457afec89e41bb14fb09293c885f988bfd0c.tar.bz2 px4-firmware-4e08457afec89e41bb14fb09293c885f988bfd0c.zip | |
Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboard
Conflicts:
src/modules/commander/commander.cpp
src/modules/commander/state_machine_helper.cpp
src/modules/mavlink/mavlink_receiver.cpp
src/modules/mavlink/mavlink_receiver.h
src/modules/uORB/topics/vehicle_status.h
Diffstat (limited to 'src/modules/uORB/topics/vehicle_control_mode.h')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_control_mode.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/vehicle_control_mode.h b/src/modules/uORB/topics/vehicle_control_mode.h index ea554006f..49e2ba4b5 100644 --- a/src/modules/uORB/topics/vehicle_control_mode.h +++ b/src/modules/uORB/topics/vehicle_control_mode.h @@ -74,6 +74,7 @@ struct vehicle_control_mode_s { bool flag_control_manual_enabled; /**< true if manual input is mixed in */ bool flag_control_auto_enabled; /**< true if onboard autopilot should act */ + bool flag_control_offboard_enabled; /**< true if offboard control should be used */ bool flag_control_rates_enabled; /**< true if rates are stabilized */ bool flag_control_attitude_enabled; /**< true if attitude stabilization is mixed in */ bool flag_control_velocity_enabled; /**< true if horizontal velocity (implies direction) is controlled */ |