diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-12-31 19:31:16 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-12-31 19:31:16 +0400 |
| commit | 549fd4f0e8012550bb7dc6794d386a3a3afdeb74 (patch) | |
| tree | 1318104f956a3ea1bf11acbd3faed081b00ba889 /src/modules/mavlink | |
| parent | 5c84479ce93792d7fa7b777387be3bf8d50cebae (diff) | |
| parent | 7f9a7ffe82372d311a7947284871d794a8934493 (diff) | |
| download | px4-firmware-549fd4f0e8012550bb7dc6794d386a3a3afdeb74.tar.gz px4-firmware-549fd4f0e8012550bb7dc6794d386a3a3afdeb74.tar.bz2 px4-firmware-549fd4f0e8012550bb7dc6794d386a3a3afdeb74.zip | |
Merge branch 'navigator_new' into navigator_new_vector
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/mavlink.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/modules/mavlink/mavlink.c b/src/modules/mavlink/mavlink.c index bc191f30d..d4e4c027b 100644 --- a/src/modules/mavlink/mavlink.c +++ b/src/modules/mavlink/mavlink.c @@ -220,17 +220,14 @@ get_mavlink_mode_and_state(uint8_t *mavlink_state, uint8_t *mavlink_base_mode, u } else if (v_status.main_state == MAIN_STATE_AUTO) { *mavlink_base_mode |= MAV_MODE_FLAG_AUTO_ENABLED | MAV_MODE_FLAG_STABILIZE_ENABLED | MAV_MODE_FLAG_GUIDED_ENABLED; custom_mode.main_mode = PX4_CUSTOM_MAIN_MODE_AUTO; - // TODO review if (control_mode.nav_state == NAV_STATE_NONE) { custom_mode.sub_mode = PX4_CUSTOM_SUB_MODE_AUTO_READY; } else if (control_mode.nav_state == NAV_STATE_LOITER) { custom_mode.sub_mode = PX4_CUSTOM_SUB_MODE_AUTO_LOITER; - } else if (control_mode.nav_state == NAV_STATE_MISSION_LOITER) { - custom_mode.sub_mode = PX4_CUSTOM_SUB_MODE_AUTO_LOITER; - } else if (control_mode.nav_state == NAV_STATE_RTL_LOITER) { - custom_mode.sub_mode = PX4_CUSTOM_SUB_MODE_AUTO_LOITER; } else if (control_mode.nav_state == NAV_STATE_MISSION) { custom_mode.sub_mode = PX4_CUSTOM_SUB_MODE_AUTO_MISSION; + } else if (control_mode.nav_state == NAV_STATE_RTL) { + custom_mode.sub_mode = PX4_CUSTOM_SUB_MODE_AUTO_RTL; } } *mavlink_custom_mode = custom_mode.data; |