diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-29 11:26:18 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-29 11:26:18 +0200 |
| commit | 6341737384b5bf39ee664c924ee930b875aa19ab (patch) | |
| tree | d3ab6db7962a5d7f5c3eda4f5319df7060477d8d /src/modules/uORB/topics/vehicle_status.h | |
| parent | af1af1e22ddd4bcd55fe9eaaf98f4a640329a4c7 (diff) | |
| parent | 83edab4d593b2cb92dae713d705255aeca4b3040 (diff) | |
| download | px4-firmware-6341737384b5bf39ee664c924ee930b875aa19ab.tar.gz px4-firmware-6341737384b5bf39ee664c924ee930b875aa19ab.tar.bz2 px4-firmware-6341737384b5bf39ee664c924ee930b875aa19ab.zip | |
Merge branch 'master' of github.com:PX4/Firmware into pca8574
Diffstat (limited to 'src/modules/uORB/topics/vehicle_status.h')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index 435230432..ea20a317a 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -63,9 +63,10 @@ /* main state machine */ typedef enum { MAIN_STATE_MANUAL = 0, - MAIN_STATE_SEATBELT, - MAIN_STATE_EASY, + MAIN_STATE_ALTCTL, + MAIN_STATE_POSCTL, MAIN_STATE_AUTO, + MAIN_STATE_ACRO, MAIN_STATE_MAX } main_state_t; |