diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-05-16 12:12:43 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-05-16 12:12:43 +0200 |
| commit | 8c4b35cc23ddf1eaef0dfc90f8fbb066b5b845af (patch) | |
| tree | ea6f3edcfa749eb5b0dcc7f307b0fa490d579617 /src/modules/commander/px4_custom_mode.h | |
| parent | d2553bfd2930eb02664d564559fa361b80c63f61 (diff) | |
| parent | f892a7278a4f452c12678fe00c6ff28c2354d548 (diff) | |
| download | px4-firmware-8c4b35cc23ddf1eaef0dfc90f8fbb066b5b845af.tar.gz px4-firmware-8c4b35cc23ddf1eaef0dfc90f8fbb066b5b845af.tar.bz2 px4-firmware-8c4b35cc23ddf1eaef0dfc90f8fbb066b5b845af.zip | |
Merge branch 'master' into offboard2
Diffstat (limited to 'src/modules/commander/px4_custom_mode.h')
| -rw-r--r-- | src/modules/commander/px4_custom_mode.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/commander/px4_custom_mode.h b/src/modules/commander/px4_custom_mode.h index 65c8e8947..9589c9acb 100644 --- a/src/modules/commander/px4_custom_mode.h +++ b/src/modules/commander/px4_custom_mode.h @@ -12,8 +12,8 @@ enum PX4_CUSTOM_MAIN_MODE { PX4_CUSTOM_MAIN_MODE_MANUAL = 1, - PX4_CUSTOM_MAIN_MODE_SEATBELT, - PX4_CUSTOM_MAIN_MODE_EASY, + PX4_CUSTOM_MAIN_MODE_ALTCTL, + PX4_CUSTOM_MAIN_MODE_POSCTL, PX4_CUSTOM_MAIN_MODE_AUTO, PX4_CUSTOM_MAIN_MODE_OFFBOARD, }; |