diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-20 18:18:39 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-20 18:18:39 +0200 |
| commit | 4e08457afec89e41bb14fb09293c885f988bfd0c (patch) | |
| tree | 9ad5c352c75efcdabc4a0f3c9c6325cbda5f074a /src/modules/uORB/topics/vehicle_status.h | |
| parent | e0c78e51e3a5768014c73bed5cd087830d602227 (diff) | |
| parent | 9d18da4433773cfa02bec1d33fdb34e4d03d1442 (diff) | |
| download | px4-firmware-4e08457afec89e41bb14fb09293c885f988bfd0c.tar.gz px4-firmware-4e08457afec89e41bb14fb09293c885f988bfd0c.tar.bz2 px4-firmware-4e08457afec89e41bb14fb09293c885f988bfd0c.zip | |
Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboard
Conflicts:
src/modules/commander/commander.cpp
src/modules/commander/state_machine_helper.cpp
src/modules/mavlink/mavlink_receiver.cpp
src/modules/mavlink/mavlink_receiver.h
src/modules/uORB/topics/vehicle_status.h
Diffstat (limited to 'src/modules/uORB/topics/vehicle_status.h')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index 5dc46dacb..e9e0fa841 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -70,7 +70,8 @@ typedef enum { MAIN_STATE_AUTO_LOITER, MAIN_STATE_AUTO_RTL, MAIN_STATE_ACRO, - MAIN_STATE_MAX, + MAIN_STATE_OFFBOARD, + MAIN_STATE_MAX } main_state_t; // If you change the order, add or remove arming_state_t states make sure to update the arrays @@ -106,6 +107,7 @@ typedef enum { NAVIGATION_STATE_LAND, /**< Land mode */ NAVIGATION_STATE_DESCEND, /**< Descend mode (no position control) */ NAVIGATION_STATE_TERMINATION, /**< Termination mode */ + NAVIGATION_STATE_OFFBOARD, NAVIGATION_STATE_MAX, } navigation_state_t; |