diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2013-12-30 14:42:00 +0400 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2013-12-30 14:42:00 +0400 |
commit | 6c30eebeb873fec7b573ac14d36936bb6c355243 (patch) | |
tree | afec7fc5601b7f9ffd4236e6bfa66122472db539 /src/modules/uORB | |
parent | 35e62a13f8b34447ed9abddd9fa349d392674a95 (diff) | |
parent | c35c0a90d32e6a8003a136516b33056c9021ff32 (diff) | |
download | px4-firmware-6c30eebeb873fec7b573ac14d36936bb6c355243.tar.gz px4-firmware-6c30eebeb873fec7b573ac14d36936bb6c355243.tar.bz2 px4-firmware-6c30eebeb873fec7b573ac14d36936bb6c355243.zip |
Merge branch 'navigator_new' into navigator_new_vector
Diffstat (limited to 'src/modules/uORB')
-rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index ae3a24a1b..1a9dec5f5 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -99,11 +99,13 @@ typedef enum { typedef enum { RETURN_SWITCH_NONE = 0, + RETURN_SWITCH_NORMAL, RETURN_SWITCH_RETURN } return_switch_pos_t; typedef enum { MISSION_SWITCH_NONE = 0, + MISSION_SWITCH_LOITER, MISSION_SWITCH_MISSION } mission_switch_pos_t; |