diff options
| author | philipoe <philipp.oettershagen@mavt.ethz.ch> | 2014-11-20 17:26:27 +0100 |
|---|---|---|
| committer | philipoe <philipp.oettershagen@mavt.ethz.ch> | 2014-11-20 17:26:27 +0100 |
| commit | ec165b3f7ec5ca1d47fa1f8fcba72e8c1c72654f (patch) | |
| tree | b5c5f7d4781281a8209a5580a5bb3e1268a7e6b5 /src/modules/uORB/topics/vehicle_status.h | |
| parent | 5c34f03c4ef1d0b928c8ad32f8038bb15dba7c11 (diff) | |
| parent | 97a1410ec99e880207e4ee6d2a03451c2e11f4cf (diff) | |
| download | px4-firmware-ec165b3f7ec5ca1d47fa1f8fcba72e8c1c72654f.tar.gz px4-firmware-ec165b3f7ec5ca1d47fa1f8fcba72e8c1c72654f.tar.bz2 px4-firmware-ec165b3f7ec5ca1d47fa1f8fcba72e8c1c72654f.zip | |
Merge remote-tracking branch 'upstream/master' into PR_RCLossDur2
Diffstat (limited to 'src/modules/uORB/topics/vehicle_status.h')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index 8d797e21a..8ec9d98d6 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -108,7 +108,7 @@ typedef enum { NAVIGATION_STATE_AUTO_LANDGPSFAIL, /**< Auto land on gps failure (e.g. open loop loiter down) */ NAVIGATION_STATE_ACRO, /**< Acro mode */ NAVIGATION_STATE_LAND, /**< Land mode */ - NAVIGATION_STATE_DESCEND, /**< Descend mode (no position control) */ + NAVIGATION_STATE_DESCEND, /**< Descend mode (no position control) */ NAVIGATION_STATE_TERMINATION, /**< Termination mode */ NAVIGATION_STATE_OFFBOARD, NAVIGATION_STATE_MAX, |