diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-19 09:44:42 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-19 09:44:42 +0200 |
commit | c57b345e70612b7083cc2b3e65ee010477e3e0a4 (patch) | |
tree | 6e21f9e3a0e29c2287a488768fc091907109bd2f /src/modules/uORB/topics/vehicle_status.h | |
parent | 3465ee7f90399d7db17303b42fc3cc58d8ab47ca (diff) | |
parent | f96bb824d4fc6f6d36ddf24e8879d3025af39d70 (diff) | |
download | px4-firmware-c57b345e70612b7083cc2b3e65ee010477e3e0a4.tar.gz px4-firmware-c57b345e70612b7083cc2b3e65ee010477e3e0a4.tar.bz2 px4-firmware-c57b345e70612b7083cc2b3e65ee010477e3e0a4.zip |
merged
Diffstat (limited to 'src/modules/uORB/topics/vehicle_status.h')
-rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index a7eb8e6bf..9f55bb874 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -68,8 +68,7 @@ typedef enum { /* navigation state machine */ typedef enum { - NAVIGATION_STATE_STANDBY = 0, // standby state, disarmed - NAVIGATION_STATE_DIRECT, // true manual control, no any stabilization + NAVIGATION_STATE_DIRECT = 0, // true manual control, no any stabilization NAVIGATION_STATE_STABILIZE, // attitude stabilization NAVIGATION_STATE_ALTHOLD, // attitude + altitude stabilization NAVIGATION_STATE_VECTOR, // attitude + altitude + position stabilization @@ -203,6 +202,7 @@ struct vehicle_status_s bool condition_launch_position_valid; /**< indicates a valid launch position */ bool condition_home_position_valid; /**< indicates a valid home position (a valid home position is not always a valid launch) */ bool condition_local_position_valid; + bool condition_local_altitude_valid; bool condition_airspeed_valid; /**< set to true by the commander app if there is a valid airspeed measurement available */ bool condition_landed; /**< true if vehicle is landed, always true if disarmed */ |