diff options
| author | Julian Oes <julian@oes.ch> | 2013-07-15 22:15:15 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-07-15 22:15:15 +0200 |
| commit | 1b38cf715d85b15f2200d49b64fbe22a05b71937 (patch) | |
| tree | 1df1db43a7ac8dad47d96059eef8efff65b6248d /src/modules/uORB/topics/vehicle_control_mode.h | |
| parent | bf2ff98856b7e6b107a7ec5bbde3b00e38713804 (diff) | |
| download | px4-firmware-1b38cf715d85b15f2200d49b64fbe22a05b71937.tar.gz px4-firmware-1b38cf715d85b15f2200d49b64fbe22a05b71937.tar.bz2 px4-firmware-1b38cf715d85b15f2200d49b64fbe22a05b71937.zip | |
Renamed actuator_safety back to actuator_armed, compiling but untested
Diffstat (limited to 'src/modules/uORB/topics/vehicle_control_mode.h')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_control_mode.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/modules/uORB/topics/vehicle_control_mode.h b/src/modules/uORB/topics/vehicle_control_mode.h index 177e30898..02bf5568a 100644 --- a/src/modules/uORB/topics/vehicle_control_mode.h +++ b/src/modules/uORB/topics/vehicle_control_mode.h @@ -69,9 +69,13 @@ struct vehicle_control_mode_s bool flag_system_emergency; bool flag_preflight_calibration; + // XXX needs yet to be set by state machine helper + bool flag_system_hil_enabled; + bool flag_control_manual_enabled; /**< true if manual input is mixed in */ bool flag_control_offboard_enabled; /**< true if offboard control input is on */ - bool flag_auto_enabled; + // XXX shouldn't be necessairy + //bool flag_auto_enabled; 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 speed (implies direction) is controlled */ |