diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-17 13:19:50 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-17 13:19:50 +0200 |
| commit | 55e5f747de013fb386727b41cc67bd019c129c31 (patch) | |
| tree | 75155ee59d4ed11c9a65d82e1c1a14f77f80b765 /src/modules/uORB/topics | |
| parent | e0ed0625f81841194b4bd9b26c7e047a1f68a1fc (diff) | |
| download | px4-firmware-55e5f747de013fb386727b41cc67bd019c129c31.tar.gz px4-firmware-55e5f747de013fb386727b41cc67bd019c129c31.tar.bz2 px4-firmware-55e5f747de013fb386727b41cc67bd019c129c31.zip | |
commander: modes display fixes, don't activate failsafe while disarmed
Diffstat (limited to 'src/modules/uORB/topics')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index 898c176fb..851938795 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -96,15 +96,16 @@ typedef enum { */ typedef enum { NAVIGATION_STATE_MANUAL = 0, /**< Manual mode */ - NAVIGATION_STATE_ACRO, /**< Acro mode */ NAVIGATION_STATE_ALTCTL, /**< Altitude control mode */ NAVIGATION_STATE_POSCTL, /**< Position control mode */ NAVIGATION_STATE_AUTO_MISSION, /**< Auto mission mode */ NAVIGATION_STATE_AUTO_LOITER, /**< Auto loiter mode */ NAVIGATION_STATE_AUTO_RTL, /**< Auto RTL mode */ + NAVIGATION_STATE_ACRO, /**< Acro mode */ NAVIGATION_STATE_LAND, /**< Land mode */ NAVIGATION_STATE_DESCEND, /**< Descend mode (no position control) */ NAVIGATION_STATE_TERMINATION, /**< Termination mode */ + NAVIGATION_STATE_MAX, } navigation_state_t; enum VEHICLE_MODE_FLAG { |