diff options
| author | Julian Oes <julian@oes.ch> | 2014-05-27 21:56:32 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-05-27 21:56:32 +0200 |
| commit | ed6c2a5168ca891f20594687acfd3c6bbf7e1cf9 (patch) | |
| tree | b71c7b12719a3d4535615aee2cf95a034bc87b13 /src/modules/uORB/topics/position_setpoint_triplet.h | |
| parent | 063caba36bd2fe26eb4bfa8e546e9551ccc05519 (diff) | |
| download | px4-firmware-ed6c2a5168ca891f20594687acfd3c6bbf7e1cf9.tar.gz px4-firmware-ed6c2a5168ca891f20594687acfd3c6bbf7e1cf9.tar.bz2 px4-firmware-ed6c2a5168ca891f20594687acfd3c6bbf7e1cf9.zip | |
commander and navigator: lot's of changes, failsafe handling in commander, navigator only for execution (WIP)
Diffstat (limited to 'src/modules/uORB/topics/position_setpoint_triplet.h')
| -rw-r--r-- | src/modules/uORB/topics/position_setpoint_triplet.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/modules/uORB/topics/position_setpoint_triplet.h b/src/modules/uORB/topics/position_setpoint_triplet.h index 85e8ef8a5..c2741a05b 100644 --- a/src/modules/uORB/topics/position_setpoint_triplet.h +++ b/src/modules/uORB/topics/position_setpoint_triplet.h @@ -74,14 +74,13 @@ struct position_setpoint_s }; typedef enum { - NAV_STATE_NONE_ON_GROUND = 0, - NAV_STATE_NONE_IN_AIR, - NAV_STATE_AUTO_ON_GROUND, - NAV_STATE_LOITER, - NAV_STATE_MISSION, - NAV_STATE_RTL, - NAV_STATE_LAND, - NAV_STATE_MAX + NAV_STATE_MANUAL = 0, + NAV_STATE_POSCTL, + NAV_STATE_AUTO, + NAV_STATE_RC_LOSS, + NAV_STATE_DL_LOSS, + NAV_STATE_TERMINATION, + MAX_NAV_STATE } nav_state_t; /** |