diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-13 15:11:06 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-13 15:11:06 +0200 |
| commit | d84cbd008c80aab8057fbdef94f57073e437ec56 (patch) | |
| tree | 770235aa6a24568d3261e4e74f1c26ccda5ed6b7 /src/modules/mavlink | |
| parent | 842e7c3df92f5004578f4ae5a7a26300d8a1a419 (diff) | |
| parent | e14d4751423e21a9ce052e1f6760f929d3694515 (diff) | |
| download | px4-firmware-d84cbd008c80aab8057fbdef94f57073e437ec56.tar.gz px4-firmware-d84cbd008c80aab8057fbdef94f57073e437ec56.tar.bz2 px4-firmware-d84cbd008c80aab8057fbdef94f57073e437ec56.zip | |
Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/mavlink_messages.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index 86e1ef548..f1cffb986 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -163,8 +163,8 @@ void get_mavlink_mode_state(struct vehicle_status_s *status, struct position_set break; case NAVIGATION_STATE_AUTO_RTL: - case NAVIGATION_STATE_AUTO_RTL_RC: - case NAVIGATION_STATE_AUTO_RTL_DL: + case NAVIGATION_STATE_AUTO_FAILSAFE_RC_LOSS: + case NAVIGATION_STATE_AUTO_FAILSAFE_DL_LOSS: *mavlink_base_mode |= MAV_MODE_FLAG_AUTO_ENABLED | MAV_MODE_FLAG_STABILIZE_ENABLED | MAV_MODE_FLAG_GUIDED_ENABLED; |